aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-09-27 13:11:46 +0200
committerMartin Fietz <Martin.Fietz@gmail.com>2015-09-27 13:11:46 +0200
commit724bc98230dce1ce06690bbe628576e0fced57ec (patch)
tree4f20c872311f601226188e3eb8204c9fd0e7b130
parentedb5d72705ad70f021553161b0381209578eef31 (diff)
downloadAudioPlayer-724bc98230dce1ce06690bbe628576e0fced57ec.tar.gz
Sonic: No error when in prepared state and pause() is called
-rw-r--r--build.gradle2
-rw-r--r--library/build.gradle2
-rw-r--r--library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java5
3 files changed, 6 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index 1b7886d..c6371d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:1.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/library/build.gradle b/library/build.gradle
index acb5248..54df7f1 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -7,7 +7,7 @@ android {
minSdkVersion 3
targetSdkVersion 22
versionCode 1
- versionName "1.0"
+ versionName "1.0.1"
}
buildTypes {
release {
diff --git a/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java b/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
index 44b2ae6..e0ca67e 100644
--- a/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
+++ b/library/src/main/java/org/antennapod/audio/SonicAudioPlayer.java
@@ -63,7 +63,7 @@ public class SonicAudioPlayer extends AbstractAudioPlayer {
private PowerManager.WakeLock mWakeLock = null;
private final static int TRACK_NUM = 0;
- private final static String TAG_TRACK = "PrestissimoTrack";
+ private final static String TAG_TRACK = "SonicTrack";
private final static int STATE_IDLE = 0;
private final static int STATE_INITIALIZED = 1;
@@ -164,6 +164,9 @@ public class SonicAudioPlayer extends AbstractAudioPlayer {
public void pause() {
Log.d(TAG, "pause(), current state: " + mCurrentState);
switch (mCurrentState) {
+ case STATE_PREPARED:
+ Log.d(TAG_TRACK, "Prepared, ignore pause()");
+ break;
case STATE_STARTED:
case STATE_PAUSED:
mTrack.pause();