Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Martin Fietz 2016-03-24 16:42:57 +01:00
parent 04026ca48c
commit 0564988357
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -178,7 +178,7 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
} }
protected void onPlaybackSpeedChange() { protected void onPlaybackSpeedChange() {
updateButPlaybackSpeed(); updatePlaybackSpeedButtonText();
} }
protected void onServiceQueried() { protected void onServiceQueried() {
@ -647,6 +647,22 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
} }
} }
private void updatePlaybackSpeedButtonText() {
if (controller != null && butPlaybackSpeed != null) {
float speed = 1.0f;
try {
speed = Float.parseFloat(UserPreferences.getPlaybackSpeed());
} catch(NumberFormatException e) {
Log.e(TAG, Log.getStackTraceString(e));
UserPreferences.setPlaybackSpeed(String.valueOf(speed));
}
String speedStr = String.format("%.2fx", speed);
butPlaybackSpeed.setText(speedStr);
}
}
protected void setupGUI() { protected void setupGUI() {
setContentView(getContentViewResourceId()); setContentView(getContentViewResourceId());
sbPosition = (SeekBar) findViewById(R.id.sbPosition); sbPosition = (SeekBar) findViewById(R.id.sbPosition);
@ -874,20 +890,6 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
} }
} }
private void updateButPlaybackSpeed() {
if (controller != null && butPlaybackSpeed != null) {
float speed = 1.0f;
try {
speed = Float.parseFloat(UserPreferences.getPlaybackSpeed());
} catch(NumberFormatException e) {
Log.e(TAG, Log.getStackTraceString(e));
UserPreferences.setPlaybackSpeed(String.valueOf(speed));
}
String speedStr = String.format("%.2fx", speed);
butPlaybackSpeed.setText(speedStr);
}
}
@Override @Override
public void onStartTrackingTouch(SeekBar seekBar) { public void onStartTrackingTouch(SeekBar seekBar) {
if (controller != null) { if (controller != null) {

3
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -512,8 +512,7 @@ public class PlaybackService extends Service {
@Override @Override
public void playbackSpeedChanged(float s) { public void playbackSpeedChanged(float s) {
sendNotificationBroadcast( sendNotificationBroadcast(NOTIFICATION_TYPE_PLAYBACK_SPEED_CHANGE, 0);
NOTIFICATION_TYPE_PLAYBACK_SPEED_CHANGE, 0);
} }
@Override @Override

12
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
View File

@ -25,6 +25,8 @@ import android.view.WindowManager;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import org.antennapod.audio.MediaPlayer;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingDeque;
@ -1050,7 +1052,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
return mp; return mp;
} }
private final org.antennapod.audio.MediaPlayer.OnCompletionListener audioCompletionListener = private final MediaPlayer.OnCompletionListener audioCompletionListener =
mp -> genericOnCompletion(); mp -> genericOnCompletion();
private final android.media.MediaPlayer.OnCompletionListener videoCompletionListener = private final android.media.MediaPlayer.OnCompletionListener videoCompletionListener =
@ -1060,7 +1062,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
endPlayback(false); endPlayback(false);
} }
private final org.antennapod.audio.MediaPlayer.OnBufferingUpdateListener audioBufferingUpdateListener = private final MediaPlayer.OnBufferingUpdateListener audioBufferingUpdateListener =
(mp, percent) -> genericOnBufferingUpdate(percent); (mp, percent) -> genericOnBufferingUpdate(percent);
private final android.media.MediaPlayer.OnBufferingUpdateListener videoBufferingUpdateListener = private final android.media.MediaPlayer.OnBufferingUpdateListener videoBufferingUpdateListener =
@ -1070,7 +1072,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
callback.onBufferingUpdate(percent); callback.onBufferingUpdate(percent);
} }
private final org.antennapod.audio.MediaPlayer.OnInfoListener audioInfoListener = private final MediaPlayer.OnInfoListener audioInfoListener =
(mp, what, extra) -> genericInfoListener(what); (mp, what, extra) -> genericInfoListener(what);
private final android.media.MediaPlayer.OnInfoListener videoInfoListener = private final android.media.MediaPlayer.OnInfoListener videoInfoListener =
@ -1080,7 +1082,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
return callback.onMediaPlayerInfo(what); return callback.onMediaPlayerInfo(what);
} }
private final org.antennapod.audio.MediaPlayer.OnErrorListener audioErrorListener = private final MediaPlayer.OnErrorListener audioErrorListener =
(mp, what, extra) -> { (mp, what, extra) -> {
if(mp.canFallback()) { if(mp.canFallback()) {
mp.fallback(); mp.fallback();
@ -1096,7 +1098,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
return callback.onMediaPlayerError(inObj, what, extra); return callback.onMediaPlayerError(inObj, what, extra);
} }
private final org.antennapod.audio.MediaPlayer.OnSeekCompleteListener audioSeekCompleteListener = private final MediaPlayer.OnSeekCompleteListener audioSeekCompleteListener =
mp -> genericSeekCompleteListener(); mp -> genericSeekCompleteListener();
private final android.media.MediaPlayer.OnSeekCompleteListener videoSeekCompleteListener = private final android.media.MediaPlayer.OnSeekCompleteListener videoSeekCompleteListener =