summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/mediacapture
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 16:58:59 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 13:36:08 +0200
commitb2b92dad82db4ed07a7eeb10f8e225d22d54a6c1 (patch)
tree7b3eaaabcd21c917d06f284e7ba95a5d91d7190a /src/plugins/gstreamer/mediacapture
parent025f4d2ee1cdc4a68e880854584f9bef0980b630 (diff)
Change uses of {to,from}Ascii to {to,from}Latin1
This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ic591779a3431999c007fb0ff362c7e25ce54097e Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture')
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp8
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp8
-rw-r--r--src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp10
3 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
index 02e45617b..5e17ba1e5 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -261,16 +261,16 @@ GstElement *QGstreamerAudioEncode::createEncoder()
switch (value.type()) {
case QVariant::Int:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toInt(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toInt(), NULL);
break;
case QVariant::Bool:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toBool(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toBool(), NULL);
break;
case QVariant::Double:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toDouble(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toDouble(), NULL);
break;
case QVariant::String:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toString().toUtf8().constData(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toString().toUtf8().constData(), NULL);
break;
default:
qWarning() << "unsupported option type:" << option << value;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
index 56174c4c0..38a45a262 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -220,7 +220,7 @@ GstElement *QGstreamerCaptureSession::buildAudioSrc()
elementName = "autoaudiosrc";
}
- audioSrc = gst_element_factory_make(elementName.toAscii().constData(), "audio_src");
+ audioSrc = gst_element_factory_make(elementName.toLatin1().constData(), "audio_src");
if (audioSrc && !device.isEmpty())
g_object_set(G_OBJECT(audioSrc), "device", device.toLocal8Bit().constData(), NULL);
}
@@ -309,7 +309,7 @@ GstElement *QGstreamerCaptureSession::buildVideoPreview()
structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb";
foreach(const QString &structureType, structureTypes) {
- GstStructure *structure = gst_structure_new(structureType.toAscii().constData(), NULL);
+ GstStructure *structure = gst_structure_new(structureType.toLatin1().constData(), NULL);
if (!resolution.isEmpty()) {
gst_structure_set(structure, "width", G_TYPE_INT, resolution.width(), NULL);
@@ -667,7 +667,7 @@ bool QGstreamerCaptureSession::rebuildGraph(QGstreamerCaptureSession::PipelineMo
if (m_encodeBin) {
QString fileName = QString("rebuild_graph_encode_%1_%2").arg(m_pipelineMode).arg(newMode);
#if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
- _gst_debug_bin_to_dot_file(GST_BIN(m_encodeBin), GST_DEBUG_GRAPH_SHOW_ALL, fileName.toAscii());
+ _gst_debug_bin_to_dot_file(GST_BIN(m_encodeBin), GST_DEBUG_GRAPH_SHOW_ALL, fileName.toLatin1());
#endif
}
@@ -696,7 +696,7 @@ void QGstreamerCaptureSession::dumpGraph(const QString &fileName)
#if !(GST_DISABLE_GST_DEBUG) && (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
_gst_debug_bin_to_dot_file(GST_BIN(m_pipeline),
GstDebugGraphDetails(/*GST_DEBUG_GRAPH_SHOW_ALL |*/ GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE | GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS | GST_DEBUG_GRAPH_SHOW_STATES),
- fileName.toAscii());
+ fileName.toLatin1());
#endif
}
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
index fa84b81d2..67cfd38d8 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -240,16 +240,16 @@ GstElement *QGstreamerVideoEncode::createEncoder()
switch (value.type()) {
case QVariant::Int:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toInt(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toInt(), NULL);
break;
case QVariant::Bool:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toBool(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toBool(), NULL);
break;
case QVariant::Double:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toDouble(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toDouble(), NULL);
break;
case QVariant::String:
- g_object_set(G_OBJECT(encoderElement), option.toAscii(), value.toString().toUtf8().constData(), NULL);
+ g_object_set(G_OBJECT(encoderElement), option.toLatin1(), value.toString().toUtf8().constData(), NULL);
break;
default:
qWarning() << "unsupported option type:" << option << value;
@@ -265,7 +265,7 @@ GstElement *QGstreamerVideoEncode::createEncoder()
structureTypes << "video/x-raw-yuv" << "video/x-raw-rgb";
foreach(const QString &structureType, structureTypes) {
- GstStructure *structure = gst_structure_new(structureType.toAscii().constData(), NULL);
+ GstStructure *structure = gst_structure_new(structureType.toLatin1().constData(), NULL);
if (!m_videoSettings.resolution().isEmpty()) {
gst_structure_set(structure, "width", G_TYPE_INT, m_videoSettings.resolution().width(), NULL);