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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80
This commit is contained in:
Frederik Gladhorn
2013-06-27 13:00:02 +02:00
parent 6d40540fce 18a8381ab3
commit 0a3f1aacd3
30 changed files with 119 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
View File

@@ -469,20 +469,22 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
{
QList<QByteArray> list = availableDevices(QAudio::AudioOutput);
if (list.size() > 0)
return list.at(0);
else
return QByteArray();
QByteArray defaultDevice;
QDataStream ds(&defaultDevice, QIODevice::WriteOnly);
ds << quint32(WAVE_MAPPER) // device ID for default device
<< QStringLiteral("Default Output Device");
return defaultDevice;
}
QByteArray QAudioDeviceInfoInternal::defaultInputDevice()
{
QList<QByteArray> list = availableDevices(QAudio::AudioInput);
if (list.size() > 0)
return list.at(0);
else
return QByteArray();
QByteArray defaultDevice;
QDataStream ds(&defaultDevice, QIODevice::WriteOnly);
ds << quint32(WAVE_MAPPER) // device ID for default device
<< QStringLiteral("Default Input Device");
return defaultDevice;
}
QT_END_NAMESPACE

7
src/multimedia/qmediapluginloader.cpp
View File

@@ -127,7 +127,12 @@ void QMediaPluginLoader::loadMetadata()
qDebug() << "QMediaPluginLoader: Inserted index " << i << " into metadata: " << jsonobj;
#endif
QJsonArray arr = jsonobj.value(QStringLiteral("Keys")).toArray();
QJsonArray arr = jsonobj.value(QStringLiteral("Services")).toArray();
// Preserve compatibility with older plugins (made before 5.1) in which
// services were declared in the 'Keys' property
if (arr.isEmpty())
arr = jsonobj.value(QStringLiteral("Keys")).toArray();
foreach (QJsonValue value, arr) {
QString key = value.toString();

28
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
View File

@@ -82,7 +82,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
try {
mApplicationContext = activity.getApplicationContext();
} catch(final Exception e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}
@@ -101,7 +101,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
currentPosition = getCurrentPosition();
}
} catch (final InterruptedException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
return;
}
}
@@ -262,7 +262,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
progressThread.start();
} catch (final IllegalStateException e) {
reset();
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}
@@ -276,7 +276,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
super.pause();
} catch (final IllegalStateException e) {
reset();
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}
@@ -289,7 +289,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
try {
super.stop();
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
} finally {
reset();
}
@@ -305,7 +305,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
super.seekTo(msec);
onMediaPlayerInfoNative(MEDIA_PLAYER_PROGRESS, msec, mID);
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}
@@ -320,7 +320,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
try {
playing = super.isPlaying();
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
return playing;
@@ -345,13 +345,13 @@ public class QtAndroidMediaPlayer extends MediaPlayer
/* MEDIA_ERROR_UNSUPPORTED= */ -1010,
mID);
} catch (final IllegalArgumentException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
} catch (final SecurityException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
} catch (final NullPointerException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}
@@ -366,7 +366,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
try {
currentPosition = super.getCurrentPosition();
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
return currentPosition;
@@ -383,7 +383,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
try {
duration = super.getDuration();
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
return duration;
@@ -415,7 +415,7 @@ public class QtAndroidMediaPlayer extends MediaPlayer
if (!mMuted)
mVolume = volume;
} catch (final IllegalStateException e) {
Log.d(TAG, e.getMessage());
Log.d(TAG, "" + e.getMessage());
}
}

3
src/plugins/android/mediaplayer/mediaplayer.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer"]
"Keys": ["androidmultimedia"],
"Services": ["org.qt-project.qt.mediaplayer"]
}

3
src/plugins/audiocapture/audiocapture.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.audiosource"]
"Keys": ["audiocapture"],
"Services": ["org.qt-project.qt.audiosource"]
}

3
src/plugins/avfoundation/camera/avfcamera.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.camera"]
"Keys": ["avfoundationcamera"],
"Services": ["org.qt-project.qt.camera"]
}

3
src/plugins/avfoundation/mediaplayer/avfmediaplayer.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer"]
"Keys": ["avfoundationmediaplayer"],
"Services": ["org.qt-project.qt.mediaplayer"]
}

3
src/plugins/blackberry/blackberry_mediaservice.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
"Keys": ["blackberrymultimedia"],
"Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
}

3
src/plugins/directshow/directshow.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
"Keys": ["directshow"],
"Services": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"]
}

3
src/plugins/directshow/directshow_camera.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.camera"]
"Keys": ["directshow"],
"Services": ["org.qt-project.qt.camera"]
}

3
src/plugins/gstreamer/audiodecoder/audiodecoder.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.audiodecode"]
"Keys": ["gstreameraudiodecode"],
"Services": ["org.qt-project.qt.audiodecode"]
}

3
src/plugins/gstreamer/camerabin/camerabin.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.camera"]
"Keys": ["gstreamercamerabin"],
"Services": ["org.qt-project.qt.camera"]
}

3
src/plugins/gstreamer/gstreamer.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource", "org.qt-project.qt.camera", "org.qt-project.qt.audiodecode"]
"Keys": ["gstreamer"],
"Services": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource", "org.qt-project.qt.camera", "org.qt-project.qt.audiodecode"]
}

3
src/plugins/gstreamer/mediacapture/mediacapture.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.audiosource"]
"Keys": ["gstreamermediacapture"],
"Services": ["org.qt-project.qt.audiosource"]
}

3
src/plugins/gstreamer/mediacapture/mediacapturecamera.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.audiosource", "org.qt-project.qt.camera"]
"Keys": ["gstreamermediacapture"]
"Services": ["org.qt-project.qt.audiosource", "org.qt-project.qt.camera"]
}

3
src/plugins/gstreamer/mediaplayer/mediaplayer.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer"]
"Keys": ["gstreamermediaplayer"],
"Services": ["org.qt-project.qt.mediaplayer"]
}

3
src/plugins/qt7/qt7.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer"]
"Keys": ["qt7"],
"Services": ["org.qt-project.qt.mediaplayer"]
}

3
src/plugins/v4l/v4l.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.radio"]
"Keys": ["v4l"],
"Services": ["org.qt-project.qt.radio"]
}

3
src/plugins/wmf/wmf.json
View File

@@ -1,3 +1,4 @@
{
"Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiodecode"]
"Keys": ["windowsmediafoundation"],
"Services": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiodecode"]
}