player: master volume refactor

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/VideoStateManager.java

@@ -405,7 +405,7 @@ public class VideoStateManager extends PlayerEventListenerHelper {
     //}
 
     private void restoreVolume() {
-        getController().setVolume(mPlayerData.getMasterVolume());
+        getController().setVolume(mPlayerData.getPlayerVolume());
     }
 
     private void restoreFormats() {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/PlayerSettingsPresenter.java

@@ -120,11 +120,11 @@ public class PlayerSettingsPresenter extends BasePresenter<Void> {
         for (int scalePercent : Helpers.range(0, 100, 5)) {
             float scale = scalePercent / 100f;
             options.add(UiOptionItem.from(String.format("%sx", scale),
-                    optionItem -> mPlayerData.setMasterVolume(scale),
-                    Helpers.floatEquals(scale, mPlayerData.getMasterVolume())));
+                    optionItem -> mPlayerData.setPlayerVolume(scale),
+                    Helpers.floatEquals(scale, mPlayerData.getPlayerVolume())));
         }
 
-        settingsPresenter.appendRadioCategory(getContext().getString(R.string.master_volume), options);
+        settingsPresenter.appendRadioCategory(getContext().getString(R.string.volume_limit), options);
     }
 
     private void appendSeekingPreviewCategory(AppDialogPresenter settingsPresenter) {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java

@@ -67,7 +67,7 @@ public class PlayerData {
     private boolean mIsSeekConfirmPlayEnabled;
     private int mStartSeekIncrementMs;
     private float mSubtitleScale;
-    private float mMasterVolume;
+    private float mPlayerVolume;
 
     private PlayerData(Context context) {
         mPrefs = AppPrefs.instance(context);
@@ -353,12 +353,12 @@ public class PlayerData {
         persistData();
     }
 
-    public float getMasterVolume() {
-        return mMasterVolume;
+    public float getPlayerVolume() {
+        return mPlayerVolume;
     }
 
-    public void setMasterVolume(float scale) {
-        mMasterVolume = scale;
+    public void setPlayerVolume(float scale) {
+        mPlayerVolume = scale;
         persistData();
     }
 
@@ -506,7 +506,7 @@ public class PlayerData {
         mStartSeekIncrementMs = Helpers.parseInt(split, 37, 10_000);
         // old subs size px
         mSubtitleScale = Helpers.parseFloat(split, 39, 1.0f);
-        mMasterVolume = Helpers.parseFloat(split, 40, 1.0f);
+        mPlayerVolume = Helpers.parseFloat(split, 40, 1.0f);
 
         if (!mIsRememberSpeedEnabled) {
             mSpeed = 1.0f;
@@ -523,6 +523,6 @@ public class PlayerData {
                 mIsLegacyCodecsForced, mIsSonyTimerFixEnabled, null, null, // old player tweaks
                 mIsQualityInfoEnabled, mIsRememberSpeedEachEnabled, mVideoAspectRatio, mIsGlobalClockEnabled, mIsTimeCorrectionEnabled,
                 mIsGlobalEndingTimeEnabled, mIsEndingTimeEnabled, mIsDoubleRefreshRateEnabled, mIsSeekConfirmPlayEnabled,
-                mStartSeekIncrementMs, null, mSubtitleScale, mMasterVolume));
+                mStartSeekIncrementMs, null, mSubtitleScale, mPlayerVolume));
     }
 }

common/src/main/res/values-ru/strings.xml

@@ -370,4 +370,5 @@
     <string name="tunneled_video_playback_desc">Туннельное воспроизведение обещает лучшую синхронизацию аудио/видео и более плавное воспроизведение. Требуется Андроид 5+</string>
     <string name="tunneled_video_playback">Туннельное воспроизведение (Android 5+)</string>
     <string name="master_volume">Основная громкость</string>
+    <string name="volume_limit">Ограничение громкости</string>
 </resources>

common/src/main/res/values-uk/strings.xml

@@ -370,4 +370,5 @@
     <string name="tunneled_video_playback_desc">Тунельне відтворення обіцяє кращу синхронізацію аудіо/відео та більш плавне відтворення. Потрібен Андроїд 5+</string>
     <string name="tunneled_video_playback">Тунельне відтворення (Android 5+)</string>
     <string name="master_volume">Основна гучність</string>
+    <string name="volume_limit">Обмеження гучності</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -374,4 +374,5 @@
     <string name="tunneled_video_playback_desc">Tunneled video playback promises benefits such as better audio/video synchronization (AV sync) and smoother playback. Required Android 5+</string>
     <string name="tunneled_video_playback">Tunneled video playback (Android 5+)</string>
     <string name="master_volume">Master volume</string>
+    <string name="volume_limit">Volume limit</string>
 </resources>