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

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

Browse Source 
Change-Id: I0361cbb4f5398bb13e675c3de04519c414daea43
This commit is contained in:
Frederik Gladhorn
2013-06-20 16:23:34 +02:00
parent 09fea23419 16a775d47a
commit 17053a450b
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/video/qmlvideo/main.cpp
View File

@@ -132,10 +132,10 @@ int main(int argc, char *argv[])
QUrl videoPath; QUrl videoPath;
const QStringList moviesLocation = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation); const QStringList moviesLocation = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
if (moviesLocation.isEmpty()) { if (moviesLocation.isEmpty()) {
QUrl appPath(QString("file:///%1").arg(app.applicationDirPath())); QUrl appPath(QString("file://%1").arg(app.applicationDirPath()));
videoPath = appPath.resolved(QUrl("./")); videoPath = appPath.resolved(QUrl("./"));
} else } else
videoPath = QString("file:///%1").arg(moviesLocation.first()); videoPath = QString("file://%1").arg(moviesLocation.first());
viewer.rootContext()->setContextProperty("videoPath", videoPath); viewer.rootContext()->setContextProperty("videoPath", videoPath);
QMetaObject::invokeMethod(rootObject, "init"); QMetaObject::invokeMethod(rootObject, "init");

2
examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
View File

@@ -101,7 +101,7 @@ Rectangle {
Rectangle { Rectangle {
id: wrapper id: wrapper
function launch() { function launch() {
var path = "file:///" + filePath; var path = "file://" + filePath;
if (folders.isFolder(index)) if (folders.isFolder(index))
down(path); down(path);
else else

2
examples/multimedia/video/qmlvideo/qmlvideo.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = qmlvideo TARGET = qmlvideo
QT += quick QT += quick multimedia
LOCAL_SOURCES = main.cpp LOCAL_SOURCES = main.cpp
LOCAL_HEADERS = trace.h LOCAL_HEADERS = trace.h

6
examples/multimedia/video/qmlvideofx/main.cpp
View File

@@ -116,13 +116,13 @@ int main(int argc, char *argv[])
FileReader fileReader; FileReader fileReader;
viewer.rootContext()->setContextProperty("fileReader", &fileReader); viewer.rootContext()->setContextProperty("fileReader", &fileReader);
QUrl appPath(QString("file:///%1").arg(app.applicationDirPath())); QUrl appPath(QString("file://%1").arg(app.applicationDirPath()));
QUrl imagePath; QUrl imagePath;
const QStringList picturesLocation = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation); const QStringList picturesLocation = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
if (picturesLocation.isEmpty()) if (picturesLocation.isEmpty())
imagePath = appPath.resolved(QUrl("images")); imagePath = appPath.resolved(QUrl("images"));
else else
imagePath = QString("file:///%1").arg(picturesLocation.first()); imagePath = QString("file://%1").arg(picturesLocation.first());
viewer.rootContext()->setContextProperty("imagePath", imagePath); viewer.rootContext()->setContextProperty("imagePath", imagePath);
QUrl videoPath; QUrl videoPath;
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
if (moviesLocation.isEmpty()) if (moviesLocation.isEmpty())
videoPath = appPath.resolved(QUrl("./")); videoPath = appPath.resolved(QUrl("./"));
else else
videoPath = QString("file:///%1").arg(moviesLocation.first()); videoPath = QString("file://%1").arg(moviesLocation.first());
viewer.rootContext()->setContextProperty("videoPath", videoPath); viewer.rootContext()->setContextProperty("videoPath", videoPath);
viewer.setTitle("qmlvideofx"); viewer.setTitle("qmlvideofx");

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
View File

@@ -102,7 +102,7 @@ Rectangle {
Rectangle { Rectangle {
id: wrapper id: wrapper
function launch() { function launch() {
var path = "file:///" + filePath var path = "file://" + filePath
if (folders.isFolder(index)) if (folders.isFolder(index))
down(path); down(path);
else else

2
examples/multimedia/video/qmlvideofx/qmlvideofx.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = qmlvideofx TARGET = qmlvideofx
QT += quick QT += quick multimedia
SOURCES += filereader.cpp main.cpp SOURCES += filereader.cpp main.cpp
HEADERS += filereader.h trace.h HEADERS += filereader.h trace.h

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