diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-15 09:38:19 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-04-28 14:24:55 +0000 |
| commit | 0a73b2e63a5cec80edc89cfefd7d86064d393c46 (patch) | |
| tree | 5e87330f468a13f5469cfbea43f97e1b6c610fd1 /src/plugins/windowsaudio | |
| parent | c3ea9be0d49ec1eecda9d07e933d5426ed52670a (diff) | |
Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses.
Task-number: QTBUG-51673
Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/windowsaudio')
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp | 30 | ||||
| -rw-r--r-- | src/plugins/windowsaudio/windowsaudio.pro | 3 |
2 files changed, 1 insertions, 32 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp index 9aa4487ab..ca79ebbec 100644 --- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp +++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp @@ -400,7 +400,6 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode) Q_UNUSED(mode) QList<QByteArray> devices; -#ifndef Q_OS_WINCE //enumerate device fullnames through directshow api CoInitialize(NULL); ICreateDevEnum *pDevEnum = NULL; @@ -454,35 +453,6 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode) pDevEnum->Release(); } CoUninitialize(); -#else // Q_OS_WINCE - if (mode == QAudio::AudioOutput) { - WAVEOUTCAPS woc; - unsigned long iNumDevs,i; - iNumDevs = waveOutGetNumDevs(); - for (i=0;i<iNumDevs;i++) { - if (waveOutGetDevCaps(i, &woc, sizeof(WAVEOUTCAPS)) - == MMSYSERR_NOERROR) { - QByteArray device; - QDataStream ds(&device, QIODevice::WriteOnly); - ds << quint32(i) << QString::fromWCharArray(woc.szPname); - devices.append(device); - } - } - } else { - WAVEINCAPS woc; - unsigned long iNumDevs,i; - iNumDevs = waveInGetNumDevs(); - for (i=0;i<iNumDevs;i++) { - if (waveInGetDevCaps(i, &woc, sizeof(WAVEINCAPS)) - == MMSYSERR_NOERROR) { - QByteArray device; - QDataStream ds(&device, QIODevice::WriteOnly); - ds << quint32(i) << QString::fromWCharArray(woc.szPname); - devices.append(device); - } - } - } -#endif // !Q_OS_WINCE return devices; } diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro index ce64847dc..6d5fe9495 100644 --- a/src/plugins/windowsaudio/windowsaudio.pro +++ b/src/plugins/windowsaudio/windowsaudio.pro @@ -1,8 +1,7 @@ TARGET = qtaudio_windows QT += multimedia-private -LIBS += -lstrmiids -lole32 -loleaut32 -!wince*:LIBS += -lwinmm +LIBS += -lstrmiids -lole32 -loleaut32 -lwinmm HEADERS += \ qwindowsaudioplugin.h \ |