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

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());
}
}