From eccb43d73c08b85bab89d8f632d423b63592e14f Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Tue, 19 Jul 2011 10:40:05 +1000 Subject: Remove a few more obsolete parts. Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d Reviewed-on: http://codereview.qt.nokia.com/1797 Reviewed-by: Qt Sanity Bot Reviewed-by: Jonas Rabbe --- src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp | 2 +- src/multimediakit/audio/qaudiopluginloader.cpp | 3 --- src/multimediakit/effects/qsoundeffect_pulse_p.cpp | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp index bce7039ab..25e5889bd 100644 --- a/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp +++ b/src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp @@ -465,7 +465,7 @@ QList 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 diff --git a/src/multimediakit/audio/qaudiopluginloader.cpp b/src/multimediakit/audio/qaudiopluginloader.cpp index fc83f7a63..72cfb1804 100644 --- a/src/multimediakit/audio/qaudiopluginloader.cpp +++ b/src/multimediakit/audio/qaudiopluginloader.cpp @@ -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); } } diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp b/src/multimediakit/effects/qsoundeffect_pulse_p.cpp index f6abf140e..cb86b8bf3 100644 --- a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimediakit/effects/qsoundeffect_pulse_p.cpp @@ -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 #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) { -- cgit v1.2.3