Changeset 769 for trunk/src/multimedia/audio/qaudiodevicefactory.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/multimedia/audio/qaudiodevicefactory.cpp
r651 r769 59 59 #include "qaudiooutput_alsa_p.h" 60 60 #include "qaudioinput_alsa_p.h" 61 #elif defined(Q_OS_SYMBIAN) 62 #include "qaudiodeviceinfo_symbian_p.h" 63 #include "qaudiooutput_symbian_p.h" 64 #include "qaudioinput_symbian_p.h" 61 65 #endif 62 66 #endif … … 129 133 QList<QAudioDeviceInfo> devices; 130 134 #ifndef QT_NO_AUDIO_BACKEND 131 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )135 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 132 136 foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode)) 133 137 devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode); … … 159 163 } 160 164 #ifndef QT_NO_AUDIO_BACKEND 161 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )165 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 162 166 return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput); 163 167 #endif … … 176 180 } 177 181 #ifndef QT_NO_AUDIO_BACKEND 178 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )182 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 179 183 return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput); 180 184 #endif … … 188 192 189 193 #ifndef QT_NO_AUDIO_BACKEND 190 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )194 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 191 195 if (realm == QLatin1String("builtin")) 192 196 return new QAudioDeviceInfoInternal(handle, mode); … … 217 221 return new QNullInputDevice(); 218 222 #ifndef QT_NO_AUDIO_BACKEND 219 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )223 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 220 224 if (deviceInfo.realm() == QLatin1String("builtin")) 221 225 return new QAudioInputPrivate(deviceInfo.handle(), format); … … 236 240 return new QNullOutputDevice(); 237 241 #ifndef QT_NO_AUDIO_BACKEND 238 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) )242 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN)) 239 243 if (deviceInfo.realm() == QLatin1String("builtin")) 240 244 return new QAudioOutputPrivate(deviceInfo.handle(), format);
Note:
See TracChangeset
for help on using the changeset viewer.