Remove some obsolete bits.

They can be updated again later when things are more stable, if needed.

Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

4 files changed, 3 insertions, 15 deletions

diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
index dc6ce9894..81557ba0c 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -52,9 +52,7 @@ QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent)
 {
     QList<QByteArray> codecCandidates;
 
-#if defined(Q_WS_MAEMO_5)
-    codecCandidates << "audio/PCM"; //<< "audio/AMR" << "audio/AMR-WB" << "audio/speex";
-#elif defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6)
     codecCandidates << "audio/AAC" << "audio/mpeg" << "audio/vorbis" << "audio/speex" << "audio/GSM"
                     << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC";
 #else
@@ -62,7 +60,7 @@ QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent)
                     << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC";
 #endif
 
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6)
     m_elementNames["audio/AMR"] = "nokiaamrnbenc";
     m_elementNames["audio/AMR-WB"] = "nokiaamrwbenc";
     m_elementNames["audio/AAC"] = "nokiaaacenc";
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
index d03db36e1..100995d62 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -202,12 +202,7 @@ GstElement *QGstreamerCaptureSession::buildAudioSrc()
     if (m_audioInputFactory)
         audioSrc = m_audioInputFactory->buildElement();
     else {
-
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
         audioSrc = gst_element_factory_make("pulsesrc", "audio_src");
-#elif defined(QT_QWS_N810)
-        audioSrc = gst_element_factory_make("dsppcmsrc", "audio_src");
-#else
         QString elementName = "alsasrc";
         QString device;
 
@@ -225,7 +220,6 @@ GstElement *QGstreamerCaptureSession::buildAudioSrc()
         audioSrc = gst_element_factory_make(elementName.toAscii().constData(), "audio_src");
         if (audioSrc && !device.isEmpty())
             g_object_set(G_OBJECT(audioSrc), "device", device.toLocal8Bit().constData(), NULL);
-#endif
     }
 
     if (!audioSrc) {
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index 6e2c7f83f..01e9c6b4f 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -252,7 +252,7 @@ QDir QGstreamerRecorderControl::defaultDir() const
 {
     QStringList dirCandidates;
 
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6)
     dirCandidates << QLatin1String("/home/user/MyDocs");
 #endif
 
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
index fb7707a97..918890596 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp
@@ -76,11 +76,7 @@ QGstreamerV4L2Input::~QGstreamerV4L2Input()
 
 GstElement *QGstreamerV4L2Input::buildElement()
 {
-#ifndef Q_WS_MAEMO_5
     GstElement *camera = gst_element_factory_make("v4l2src", "camera_source");
-#else
-    GstElement *camera = gst_element_factory_make("v4l2camsrc", "camera_source");
-#endif
     if (camera && !m_device.isEmpty() )
         g_object_set(G_OBJECT(camera), "device", m_device.constData(), NULL);