slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a few more obsolete parts.

Browse Source 
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-07-19 10:40:05 +10:00
committed by Qt by Nokia
parent 1403a1c7be
commit eccb43d73c
100 changed files with 50 additions and 8051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp
View File

@@ -465,7 +465,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
if (idx > 0)
devices.append("default");
#endif
#if (!defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6))
#if !defined(Q_WS_MAEMO_6)
if (devices.size() == 0 && allDevices.size() > 0)
return allDevices;
#endif

3
src/multimediakit/audio/qaudiopluginloader.cpp
View File

@@ -102,9 +102,6 @@ QStringList QAudioPluginLoader::pluginList() const
#endif
for (int j=0; j < files.count(); j++) {
const QString &file = files.at(j);
#if defined(Q_WS_MAEMO_5)
if (!file.contains(QLatin1String("n900audio")))
#endif
plugins << pluginsDir.absoluteFilePath(file);
}
}

6
src/multimediakit/effects/qsoundeffect_pulse_p.cpp
View File

@@ -57,7 +57,7 @@
#include "qsoundeffect_pulse_p.h"
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
#if defined(Q_WS_MAEMO_6)
#include <pulse/ext-stream-restore.h>
#endif
@@ -204,7 +204,7 @@ private:
case PA_CONTEXT_SETTING_NAME:
break;
case PA_CONTEXT_READY:
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
#if defined(Q_WS_MAEMO_6)
pa_ext_stream_restore_read(c, &stream_restore_info_callback, self);
pa_ext_stream_restore_set_subscribe_cb(c, &stream_restore_monitor_callback, self);
pa_ext_stream_restore_subscribe(c, 1, 0, self);
@@ -216,7 +216,7 @@ private:
}
}
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
#if defined(Q_WS_MAEMO_6)
static void stream_restore_monitor_callback(pa_context *c, void *userdata)
{