slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,927 Commits 1 Branch 0 Tags
443ed0be093b2d8e78d111a59eca97f2eba5b0fe
Commit Graph

18 Commits

Author SHA1 Message Date
Oswald Buddenhagen
c82402e158 consistently put {qt,qml}_{module,plugin} at the end of project files 
this fixes static builds by ensuring that all dependencies are exported.

Task-number: QTBUG-51071
Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2016-02-25 16:50:09 +00:00
Yoann Lopes
f97c4aaa86 WindowsAudio: fix QAudioOutput state after resume(). 
In push mode, the state must be IdleState after resume(), and only
change to ActiveState once it receives some data.

Task-number: QTBUG-50390
Change-Id: I0e12f4eaff350b9423e44779f229e0e1061cf576
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
 2016-01-19 15:30:36 +00:00
Sergio Martins
0521766417 Fix usage of QMutexLocker, destroy it only at end of scope 
Change-Id: I8b47d49f7a83a71a1b90ab57ee7bc3791ef59667
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2016-01-12 13:44:45 +00:00
Friedemann Kleint
5f11c33fd5 WindowsAudio: Fix compiler warnings by g++/MinGW. 
Replace NULL by 0 for parameters of type DWORD_PTR.

qwindowsaudiodeviceinfo.cpp: In member function 'bool QWindowsAudioDeviceInfo::testSettings(const QAudioFormat&) const':
qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]
                                 WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR);                                                  ^
qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]
qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]
                                 WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR);                                                  ^
qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]# ==[ Please wrap at 72 characters ]===================================|

Change-Id: Ie8f65e0e1f4f1274a1b634f3701ae0103e716d97
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-07-13 13:42:41 +00:00
Liang Qi
51d6b5c811 Update copyright headers 
Just do bbfccc7135 for new added files.

Change-Id: Ibbcd515d5e7577a8a3b33163094f9153072c8846
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-04-15 08:52:27 +00:00
Liang Qi
1925bb404e Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
 2015-04-15 09:26:14 +02:00
Yoann Lopes
07606dde9a WindowsAudio: improve supported formats detection. 
QAudioDeviceInfo::isFormatSupported() now tries to open the device with
that format to theck if it is supported. We were before simply checking
that its parameters were included in the list of supported values,
which might be incomplete.

In addition, since the Windows API to check device capabilities is quite
limited, we now test additional common formats and add them to the
supported formats if the device can open them.

Task-number: QTBUG-42648
Change-Id: Idd0affbd6d91d4fd027a6a4c86c2f3fe008a118f
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
 2015-04-14 14:42:21 +00:00
Frederik Gladhorn
f9014d136f Merge remote-tracking branch 'origin/5.4' into dev 
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
 2015-02-13 13:10:48 +01:00
Antti Kokko
bbfccc7135 Update copyright headers 
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-02-12 10:27:47 +00:00
Sergio Ahumada
4ce9d89d7a Fix some typos 
Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-02-11 09:37:28 +00:00
Friedemann Kleint
456944f855 Fix memory leak in QWindowsAudioDeviceInfo::availableDevices(). 
Task-number: QTBUG-44305
Change-Id: I8c5afd6d5c77ef1ef81c3b752c6246dc50406794
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-02-05 13:39:28 +00:00
Friedemann Kleint
4459561dd5 Add missing includes for QDataStream/QIODevice. 
After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3,
QStringList no longer includes QDataStream.

Change-Id: Ibe3e1e6542e1b592adaabe3f8ffd3268efaf289b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2015-01-07 23:11:16 +01:00
Sergio Ahumada
41a1c16340 Merge remote-tracking branch 'origin/5.3' into 5.4 
Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
 2014-09-26 15:28:44 +02:00
Yoann Lopes
18d6560db1 Fix integer overflow in several audio plugins. 
Task-number: QTBUG-40804
Change-Id: If006cb7db319bb6fda4ce7eb4f907e897b5d9efa
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
 2014-09-09 13:46:19 +02:00
Frederik Gladhorn
659f238bbb Merge remote-tracking branch 'origin/5.3' into 5.4 
Conflicts:
	src/gsttools/qgstreamervideoinputdevicecontrol.cpp
	src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
	src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp

Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
 2014-09-01 12:52:51 +02:00
Bjoern Breitmeyer
b3c2dca466 Restore QWindowsAudio support on wince. 
Enabled Audio playback with wave device on WindowsCE again.

Change-Id: Ic7749821ef8f991a909cbeb29083219ea988f5dc
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
 2014-08-27 13:54:59 +02:00
Antti Kokko
2732e23887 Update license headers and add new license files 
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-08-24 17:30:13 +02:00
Christian Strømme
2d54da2d39 Move win32 and Alsa audio backends into plugins. 
Change-Id: I9835cf5ee97900569f26421a19543b485e933051
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
 2014-01-30 18:15:36 +01:00