<div dir="ltr">Merged.<br><br><div class="gmail_quote"><div dir="ltr">Le lun. 5 juin 2017 à 12:02, habib kazemi <<a href="mailto:kazemihabib1996@gmail.com">kazemihabib1996@gmail.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Currently speed settings use dialogFragment<br>
---<br>
.../videolan/vlc/gui/dialogs/AdvOptionsDialog.java | 4 ----<br>
.../vlc/gui/video/VideoPlayerActivity.java | 27 ----------------------<br>
.../interfaces/IPlaybackSettingsController.java | 1 -<br>
3 files changed, 32 deletions(-)<br>
<br>
diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java<br>
index 573d6e76e..9498342e1 100644<br>
--- a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java<br>
+++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java<br>
@@ -251,10 +251,6 @@ public class AdvOptionsDialog extends DialogFragment implements View.OnClickList<br>
if (mPlaybackController != null)<br>
mPlaybackController.showSubsDelaySetting();<br>
break;<br>
- case ACTION_PLAYBACK_SPEED:<br>
- if (mPlaybackController != null)<br>
- mPlaybackController.showPlaybackSpeedSetting();<br>
- break;<br>
default:<br>
return;<br>
}<br>
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
index a01aad539..4064a104e 100644<br>
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java<br>
@@ -1351,12 +1351,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C<br>
showDelayControls();<br>
}<br>
<br>
- @Override<br>
- public void showPlaybackSpeedSetting() {<br>
- mPlaybackSetting = DelayState.SPEED;<br>
- showDelayControls();<br>
- }<br>
-<br>
public void showDelayControls(){<br>
mTouchAction = TOUCH_NONE;<br>
if (mPresentation != null)<br>
@@ -1391,10 +1385,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C<br>
text += getString(R.string.spu_delay)+"\n";<br>
text += mService.getSpuDelay() / 1000l;<br>
text += " ms";<br>
- } else if (mPlaybackSetting == DelayState.SPEED) {<br>
- text += getString(R.string.playback_speed)+"\n";<br>
- text += mService.getRate();<br>
- text += " x";<br>
} else<br>
text += "0";<br>
mInfo.setText(text);<br>
@@ -1452,19 +1442,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C<br>
}<br>
}<br>
<br>
- public void changeSpeed(float delta){<br>
- initInfoOverlay();<br>
- float rate = Math.round((mService.getRate()+delta)*100f)/100f;<br>
- if (rate < 0.25f || rate > 4f)<br>
- return;<br>
- mService.setRate(rate, false);<br>
- mInfo.setText(getString(R.string.playback_speed) + "\n" +rate + " x");<br>
- if (mPlaybackSetting == DelayState.OFF) {<br>
- mPlaybackSetting = DelayState.SPEED;<br>
- initPlaybackSettingInfo();<br>
- }<br>
- }<br>
-<br>
/**<br>
* Lock screen rotation<br>
*/<br>
@@ -2479,16 +2456,12 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C<br>
delayAudio(-50000);<br>
else if (mPlaybackSetting == DelayState.SUBS)<br>
delaySubs(-50000);<br>
- else if (mPlaybackSetting == DelayState.SPEED)<br>
- changeSpeed(-0.05f);<br>
break;<br>
case R.id.player_delay_plus:<br>
if (mPlaybackSetting == DelayState.AUDIO)<br>
delayAudio(50000);<br>
else if (mPlaybackSetting == DelayState.SUBS)<br>
delaySubs(50000);<br>
- else if (mPlaybackSetting == DelayState.SPEED)<br>
- changeSpeed(0.05f);<br>
break;<br>
case R.id.player_overlay_adv_function:<br>
showAdvancedOptions();<br>
diff --git a/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java b/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java<br>
index cd83aa709..22fd1ee3a 100644<br>
--- a/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java<br>
+++ b/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java<br>
@@ -27,6 +27,5 @@ public interface IPlaybackSettingsController {<br>
<br>
void showAudioDelaySetting();<br>
void showSubsDelaySetting();<br>
- void showPlaybackSpeedSetting();<br>
void endPlaybackSetting();<br>
}<br>
--<br>
2.13.0<br>
<br>
_______________________________________________<br>
Android mailing list<br>
<a href="mailto:Android@videolan.org" target="_blank">Android@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/android" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/android</a><br>
</blockquote></div></div>