[Android] [PATCH] Remove dead code

[Geoffrey Métais]

Merged.

Le lun. 5 juin 2017 à 12:02, habib kazemi <kazemihabib1996 at gmail.com> a
écrit :

> Currently speed settings use dialogFragment
> ---
>  .../videolan/vlc/gui/dialogs/AdvOptionsDialog.java |  4 ----
>  .../vlc/gui/video/VideoPlayerActivity.java         | 27
> ----------------------
>  .../interfaces/IPlaybackSettingsController.java    |  1 -
>  3 files changed, 32 deletions(-)
>
> diff --git
> a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
> b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
> index 573d6e76e..9498342e1 100644
> --- a/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
> +++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
> @@ -251,10 +251,6 @@ public class AdvOptionsDialog extends DialogFragment
> implements View.OnClickList
>                  if (mPlaybackController != null)
>                      mPlaybackController.showSubsDelaySetting();
>                  break;
> -            case ACTION_PLAYBACK_SPEED:
> -                if (mPlaybackController != null)
> -                    mPlaybackController.showPlaybackSpeedSetting();
> -                break;
>              default:
>                  return;
>          }
> diff --git
> a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
> b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
> index a01aad539..4064a104e 100644
> --- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
> +++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
> @@ -1351,12 +1351,6 @@ public class VideoPlayerActivity extends
> AppCompatActivity implements IVLCVout.C
>          showDelayControls();
>      }
>
> -    @Override
> -    public void showPlaybackSpeedSetting() {
> -        mPlaybackSetting = DelayState.SPEED;
> -        showDelayControls();
> -    }
> -
>      public void showDelayControls(){
>          mTouchAction = TOUCH_NONE;
>          if (mPresentation != null)
> @@ -1391,10 +1385,6 @@ public class VideoPlayerActivity extends
> AppCompatActivity implements IVLCVout.C
>              text += getString(R.string.spu_delay)+"\n";
>              text += mService.getSpuDelay() / 1000l;
>              text += " ms";
> -        } else if (mPlaybackSetting == DelayState.SPEED) {
> -            text += getString(R.string.playback_speed)+"\n";
> -            text += mService.getRate();
> -            text += " x";
>          } else
>              text += "0";
>          mInfo.setText(text);
> @@ -1452,19 +1442,6 @@ public class VideoPlayerActivity extends
> AppCompatActivity implements IVLCVout.C
>          }
>      }
>
> -    public void changeSpeed(float delta){
> -        initInfoOverlay();
> -        float rate = Math.round((mService.getRate()+delta)*100f)/100f;
> -        if (rate < 0.25f || rate > 4f)
> -            return;
> -        mService.setRate(rate, false);
> -        mInfo.setText(getString(R.string.playback_speed) + "\n" +rate + "
> x");
> -        if (mPlaybackSetting == DelayState.OFF) {
> -            mPlaybackSetting = DelayState.SPEED;
> -            initPlaybackSettingInfo();
> -        }
> -    }
> -
>      /**
>       * Lock screen rotation
>       */
> @@ -2479,16 +2456,12 @@ public class VideoPlayerActivity extends
> AppCompatActivity implements IVLCVout.C
>                      delayAudio(-50000);
>                  else if (mPlaybackSetting == DelayState.SUBS)
>                      delaySubs(-50000);
> -                else if (mPlaybackSetting == DelayState.SPEED)
> -                    changeSpeed(-0.05f);
>                  break;
>              case R.id.player_delay_plus:
>                  if (mPlaybackSetting == DelayState.AUDIO)
>                      delayAudio(50000);
>                  else if (mPlaybackSetting == DelayState.SUBS)
>                      delaySubs(50000);
> -                else if (mPlaybackSetting == DelayState.SPEED)
> -                    changeSpeed(0.05f);
>                  break;
>              case R.id.player_overlay_adv_function:
>                  showAdvancedOptions();
> diff --git
> a/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java
> b/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java
> index cd83aa709..22fd1ee3a 100644
> ---
> a/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java
> +++
> b/vlc-android/src/org/videolan/vlc/interfaces/IPlaybackSettingsController.java
> @@ -27,6 +27,5 @@ public interface IPlaybackSettingsController {
>
>      void showAudioDelaySetting();
>      void showSubsDelaySetting();
> -    void showPlaybackSpeedSetting();
>      void endPlaybackSetting();
>  }
> --
> 2.13.0
>
> _______________________________________________
> Android mailing list
> Android at videolan.org
> https://mailman.videolan.org/listinfo/android
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/android/attachments/20170606/2bc3ba01/attachment.html>