Version 9.0

* Update french 2

* Update strings.xml

app/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
 
-        versionName "8.12"
-        versionCode = 217
+        versionName "9.0"
+        versionCode = 219
     }
 
     flavorDimensions "root"

app/src/main/java/com/limelight/Game.java

@@ -454,9 +454,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .setEnableHdr(willStreamHdr)
                 .setAttachedGamepadMask(gamepadMask)
                 .setClientRefreshRateX100((int)(displayRefreshRate * 100))
-                .setAudioConfiguration(prefConfig.enable51Surround ?
-                        MoonBridge.AUDIO_CONFIGURATION_51_SURROUND :
-                        MoonBridge.AUDIO_CONFIGURATION_STEREO)
+                .setAudioConfiguration(prefConfig.audioConfiguration)
                 .build();
 
         // Initialize the connection

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -64,25 +64,46 @@ public class AndroidAudioRenderer implements AudioRenderer {
     }
 
     @Override
-    public int setup(int audioConfiguration, int sampleRate, int samplesPerFrame) {
+    public int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame) {
         int channelConfig;
         int bytesPerFrame;
 
-        switch (audioConfiguration)
+        switch (audioConfiguration.channelCount)
         {
-            case MoonBridge.AUDIO_CONFIGURATION_STEREO:
+            case 2:
                 channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-                bytesPerFrame = 2 * samplesPerFrame * 2;
                 break;
-            case MoonBridge.AUDIO_CONFIGURATION_51_SURROUND:
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 6:
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
-                bytesPerFrame = 6 * samplesPerFrame * 2;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND isn't available until Android 6.0,
+                    // yet the CHANNEL_OUT_SIDE_LEFT and CHANNEL_OUT_SIDE_RIGHT constants were added
+                    // in 5.0, so just hardcode the constant so we can work on Lollipop.
+                    channelConfig = 0x000018fc; // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND
+                }
+                else {
+                    // On KitKat and lower, creation of the AudioTrack will fail if we specify
+                    // CHANNEL_OUT_SIDE_LEFT or CHANNEL_OUT_SIDE_RIGHT. That leaves us with
+                    // the old CHANNEL_OUT_7POINT1 which uses left-of-center and right-of-center
+                    // speakers instead of side-left and side-right. This non-standard layout
+                    // is probably not what the user wants, but we don't really have a choice.
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1;
+                }
                 break;
             default:
                 LimeLog.severe("Decoder returned unhandled channel count");
                 return -1;
         }
 
+        LimeLog.info("Audio channel config: "+String.format("0x%X", channelConfig));
+
+        bytesPerFrame = audioConfiguration.channelCount * samplesPerFrame * 2;
+
         // We're not supposed to request less than the minimum
         // buffer size for our buffer, but it appears that we can
         // do this on many devices and it lowers audio latency.

app/src/main/java/com/limelight/nvstream/NvConnection.java

@@ -263,7 +263,7 @@ public class NvConnection {
                             context.negotiatedWidth, context.negotiatedHeight,
                             context.streamConfig.getRefreshRate(), context.streamConfig.getBitrate(),
                             context.streamConfig.getMaxPacketSize(),
-                            context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
+                            context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration().toInt(),
                             context.streamConfig.getHevcSupported(),
                             context.negotiatedHdr,
                             context.streamConfig.getHevcBitratePercentageMultiplier(),

app/src/main/java/com/limelight/nvstream/StreamConfiguration.java

@@ -9,12 +9,6 @@ public class StreamConfiguration {
     public static final int STREAM_CFG_LOCAL = 0;
     public static final int STREAM_CFG_REMOTE = 1;
     public static final int STREAM_CFG_AUTO = 2;
-
-    private static final int CHANNEL_COUNT_STEREO = 2;
-    private static final int CHANNEL_COUNT_5_1 = 6;
-    
-    private static final int CHANNEL_MASK_STEREO = 0x3;
-    private static final int CHANNEL_MASK_5_1 = 0xFC;
     
     private NvApp app;
     private int width, height;
@@ -27,9 +21,7 @@ public class StreamConfiguration {
     private boolean playLocalAudio;
     private int maxPacketSize;
     private int remote;
-    private int audioChannelMask;
-    private int audioChannelCount;
-    private int audioConfiguration;
+    private MoonBridge.AudioConfiguration audioConfiguration;
     private boolean supportsHevc;
     private int hevcBitratePercentageMultiplier;
     private boolean enableHdr;
@@ -119,21 +111,8 @@ public class StreamConfiguration {
             return this;
         }
         
-        public StreamConfiguration.Builder setAudioConfiguration(int audioConfig) {
-            if (audioConfig == MoonBridge.AUDIO_CONFIGURATION_STEREO) {
-                config.audioChannelCount = CHANNEL_COUNT_STEREO;
-                config.audioChannelMask = CHANNEL_MASK_STEREO;
-            }
-            else if (audioConfig == MoonBridge.AUDIO_CONFIGURATION_51_SURROUND) {
-                config.audioChannelCount = CHANNEL_COUNT_5_1;
-                config.audioChannelMask = CHANNEL_MASK_5_1;
-            }
-            else {
-                throw new IllegalArgumentException("Invalid audio configuration");
-            }
-
+        public StreamConfiguration.Builder setAudioConfiguration(MoonBridge.AudioConfiguration audioConfig) {
             config.audioConfiguration = audioConfig;
-
             return this;
         }
         
@@ -159,8 +138,7 @@ public class StreamConfiguration {
         this.remote = STREAM_CFG_AUTO;
         this.sops = true;
         this.enableAdaptiveResolution = false;
-        this.audioChannelCount = CHANNEL_COUNT_STEREO;
-        this.audioChannelMask = CHANNEL_MASK_STEREO;
+        this.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
         this.supportsHevc = false;
         this.enableHdr = false;
         this.attachedGamepadMask = 0;
@@ -209,16 +187,8 @@ public class StreamConfiguration {
     public int getRemote() {
         return remote;
     }
-    
-    public int getAudioChannelCount() {
-        return audioChannelCount;
-    }
-    
-    public int getAudioChannelMask() {
-        return audioChannelMask;
-    }
 
-    public int getAudioConfiguration() {
+    public MoonBridge.AudioConfiguration getAudioConfiguration() {
         return audioConfiguration;
     }
     

app/src/main/java/com/limelight/nvstream/av/audio/AudioRenderer.java

@@ -1,7 +1,9 @@
 package com.limelight.nvstream.av.audio;
 
+import com.limelight.nvstream.jni.MoonBridge;
+
 public interface AudioRenderer {
-    int setup(int audioConfiguration, int sampleRate, int samplesPerFrame);
+    int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame);
 
     void start();
 

app/src/main/java/com/limelight/nvstream/http/NvHTTP.java

@@ -648,7 +648,7 @@ public class NvHTTP {
             "&rikeyid="+context.riKeyId +
             (!enableHdr ? "" : "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0") +
             "&localAudioPlayMode=" + (context.streamConfig.getPlayLocalAudio() ? 1 : 0) +
-            "&surroundAudioInfo=" + ((context.streamConfig.getAudioChannelMask() << 16) + context.streamConfig.getAudioChannelCount()) +
+            "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo() +
             (context.streamConfig.getAttachedGamepadMask() != 0 ? "&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() : "") +
             (context.streamConfig.getAttachedGamepadMask() != 0 ? "&gcmap=" + context.streamConfig.getAttachedGamepadMask() : ""),
             false);
@@ -660,7 +660,7 @@ public class NvHTTP {
         String xmlStr = openHttpConnectionToString(baseUrlHttps + "/resume?" + buildUniqueIdUuidString() +
                 "&rikey="+bytesToHex(context.riKey.getEncoded()) +
                 "&rikeyid="+context.riKeyId +
-                "&surroundAudioInfo=" + ((context.streamConfig.getAudioChannelMask() << 16) + context.streamConfig.getAudioChannelCount()),
+                "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo(),
                 false);
         String resume = getXmlString(xmlStr, "resume");
         return Integer.parseInt(resume) != 0;

app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java

@@ -7,8 +7,9 @@ import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 public class MoonBridge {
     /* See documentation in Limelight.h for information about these functions and constants */
 
-    public static final int AUDIO_CONFIGURATION_STEREO = 0;
-    public static final int AUDIO_CONFIGURATION_51_SURROUND = 1;
+    public static final AudioConfiguration AUDIO_CONFIGURATION_STEREO = new AudioConfiguration(2, 0x3);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_51_SURROUND = new AudioConfiguration(6, 0x3F);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_71_SURROUND = new AudioConfiguration(8, 0x63F);
 
     public static final int VIDEO_FORMAT_H264 = 0x0001;
     public static final int VIDEO_FORMAT_H265 = 0x0100;
@@ -45,6 +46,57 @@ public class MoonBridge {
         return slices << 24;
     }
 
+    public static class AudioConfiguration {
+        public final int channelCount;
+        public final int channelMask;
+
+        public AudioConfiguration(int channelCount, int channelMask) {
+            this.channelCount = channelCount;
+            this.channelMask = channelMask;
+        }
+
+        // Creates an AudioConfiguration from the integer value returned by moonlight-common-c
+        // See CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION() and CHANNEL_MASK_FROM_AUDIO_CONFIGURATION()
+        // in Limelight.h
+        private AudioConfiguration(int audioConfiguration) {
+            // Check the magic byte before decoding to make sure we got something that's actually
+            // a MAKE_AUDIO_CONFIGURATION()-based value and not something else like an older version
+            // hardcoded AUDIO_CONFIGURATION value from an earlier version of moonlight-common-c.
+            if ((audioConfiguration & 0xFF) != 0xCA) {
+                throw new IllegalArgumentException("Audio configuration has invalid magic byte!");
+            }
+
+            this.channelCount = (audioConfiguration >> 8) & 0xFF;
+            this.channelMask = (audioConfiguration >> 16) & 0xFFFF;
+        }
+
+        // See SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION() in Limelight.h
+        public int getSurroundAudioInfo() {
+            return channelMask << 16 | channelCount;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof AudioConfiguration) {
+                AudioConfiguration that = (AudioConfiguration)obj;
+                return this.toInt() == that.toInt();
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return toInt();
+        }
+
+        // Returns the integer value expected by moonlight-common-c
+        // See MAKE_AUDIO_CONFIGURATION() in Limelight.h
+        public int toInt() {
+            return ((channelMask) << 16) | (channelCount << 8) | 0xCA;
+        }
+    }
+
     public static int bridgeDrSetup(int videoFormat, int width, int height, int redrawRate) {
         if (videoRenderer != null) {
             return videoRenderer.setup(videoFormat, width, height, redrawRate);
@@ -86,7 +138,7 @@ public class MoonBridge {
 
     public static int bridgeArInit(int audioConfiguration, int sampleRate, int samplesPerFrame) {
         if (audioRenderer != null) {
-            return audioRenderer.setup(audioConfiguration, sampleRate, samplesPerFrame);
+            return audioRenderer.setup(new AudioConfiguration(audioConfiguration), sampleRate, samplesPerFrame);
         }
         else {
             return -1;

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import com.limelight.nvstream.jni.MoonBridge;
+
 public class PreferenceConfiguration {
     private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
 
@@ -24,7 +26,8 @@ public class PreferenceConfiguration {
     private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
     private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
-    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
+    private static final String AUDIO_CONFIG_PREF_STRING = "list_audio_config";
+    private static final String LEGACY_ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
     private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
@@ -51,7 +54,6 @@ public class PreferenceConfiguration {
     public static final String DEFAULT_LANGUAGE = "default";
     private static final boolean DEFAULT_LIST_MODE = false;
     private static final boolean DEFAULT_MULTI_CONTROLLER = true;
-    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
     private static final boolean DEFAULT_USB_DRIVER = true;
     private static final String DEFAULT_VIDEO_FORMAT = "auto";
     private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
@@ -66,6 +68,7 @@ public class PreferenceConfiguration {
     private static final boolean DEFAULT_UNLOCK_FPS = false;
     private static final boolean DEFAULT_VIBRATE_OSC = true;
     private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
+    private static final String DEFAULT_AUDIO_CONFIG = "2"; // Stereo
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -78,7 +81,7 @@ public class PreferenceConfiguration {
     public int oscOpacity;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
+    public boolean listMode, smallIconMode, multiController, usbDriver;
     public boolean onscreenController;
     public boolean onlyL3R3;
     public boolean disableFrameDrop;
@@ -91,6 +94,7 @@ public class PreferenceConfiguration {
     public boolean unlockFps;
     public boolean vibrateOsc;
     public boolean vibrateFallbackToDevice;
+    public MoonBridge.AudioConfiguration audioConfiguration;
 
     private static int getHeightFromResolutionString(String resString) {
         if (resString.equalsIgnoreCase("360p")) {
@@ -247,6 +251,15 @@ public class PreferenceConfiguration {
         PreferenceConfiguration config = new PreferenceConfiguration();
 
         // Migrate legacy preferences to the new locations
+        if (prefs.contains(LEGACY_ENABLE_51_SURROUND_PREF_STRING)) {
+            if (prefs.getBoolean(LEGACY_ENABLE_51_SURROUND_PREF_STRING, false)) {
+                prefs.edit()
+                        .remove(LEGACY_ENABLE_51_SURROUND_PREF_STRING)
+                        .putString(AUDIO_CONFIG_PREF_STRING, "51")
+                        .apply();
+            }
+        }
+
         String str = prefs.getString(LEGACY_RES_FPS_PREF_STRING, null);
         if (str != null) {
             if (str.equals("360p30")) {
@@ -316,6 +329,17 @@ public class PreferenceConfiguration {
             config.bitrate = getDefaultBitrate(context);
         }
 
+        String audioConfig = prefs.getString(AUDIO_CONFIG_PREF_STRING, DEFAULT_AUDIO_CONFIG);
+        if (audioConfig.equals("71")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_71_SURROUND;
+        }
+        else if (audioConfig.equals("51")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_51_SURROUND;
+        }
+        else /* if (audioConfig.equals("2")) */ {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
+        }
+
         config.videoFormat = getVideoFormatValue(context);
 
         config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
@@ -332,7 +356,6 @@ public class PreferenceConfiguration {
         config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
         config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
-        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
         config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
         config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);

app/src/main/jni/moonlight-core/callbacks.c

@@ -304,7 +304,10 @@ void BridgeClConnectionTerminated(int errorCode) {
 void BridgeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {
     JNIEnv* env = GetThreadEnv();
 
-    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, lowFreqMotor, highFreqMotor);
+    // The seemingly redundant short casts are required in order to convert the unsigned short to a signed short.
+    // If we leave it as an unsigned short, CheckJNI will fail when the value exceeds 32767. The cast itself is
+    // fine because the Java code treats the value as unsigned even though it's stored in a signed type.
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, (short)lowFreqMotor, (short)highFreqMotor);
     if ((*env)->ExceptionCheck(env)) {
         // We will crash here
         (*JVM)->DetachCurrentThread(JVM);

app/src/main/res/values-de/strings.xml

@@ -131,8 +131,6 @@
     <string name="summary_checkbox_enable_pip">Stream auch während des Multitaskings anzeigen (ohne Steuerung)</string>
 
     <string name="category_audio_settings">Audio Einstellungen</string>
-    <string name="title_checkbox_51_surround">5.1 Surround Sound aktivieren</string>
-    <string name="summary_checkbox_51_surround">Deaktivieren wenn die Audiowiedergabe fehlerhaft ist. Setzt GFE 2.7 oder neuer voraus.</string>
 
     <string name="category_input_settings">Eingabe Einstellungen</string>
     <string name="title_checkbox_multi_controller">Automatische GamePad-Erkennung</string>

app/src/main/res/values-es/strings.xml

@@ -94,8 +94,6 @@
     <string name="summary_checkbox_disable_warnings">Desactivar mensajes de advertencia en pantalla durante la transmisión</string>
 
     <string name="category_audio_settings">Configuración de audio</string>
-    <string name="title_checkbox_51_surround">Activar sonido 5.1 surround</string>
-    <string name="summary_checkbox_51_surround">Desmarcar si experimentas problemas de audio. Requiere GFE 2.7 o superior.</string>
 
     <string name="title_checkbox_multi_controller">Soporte para múltiples mandos</string>
     <string name="summary_checkbox_multi_controller">Si no está marcado, todos los mandos aparecen como uno solo</string>

app/src/main/res/values-fr/arrays.xml

@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="fps_names">
+        <item>30 IPS</item>
+        <item>60 IPS</item>
+        <item>90 IPS</item>
+        <item>120 IPS</item>
+    </string-array>
+    <string-array name="audio_config_names">
+        <item>Stéréo</item>
+        <item>Son surround 5.1</item>
+        <item>Son surround 7.1</item>
+    </string-array>    
     <string-array name="decoder_names">
         <item>Sélection automatique du décodeur</item>
         <item>Contraindre le décodage logiciel</item>
         <item>Contraindre le décodage matériel</item>
     </string-array>
-
     <string-array name="video_format_names">
         <item>Utiliser H.265 uniquement s\'il est stable</item>
         <item>Utilisez toujours H.265 (mais il peut planter)</item>

app/src/main/res/values-fr/strings.xml

@@ -132,8 +132,8 @@
     <string name="summary_checkbox_enable_pip">Permet de visualiser le flux (sans le contrôleur) tout en multitâche</string>
 
     <string name="category_audio_settings">Paramètres audio</string>
-    <string name="title_checkbox_51_surround">Activer son surround 5.1</string>
-    <string name="summary_checkbox_51_surround">Décochez si vous rencontrez des problèmes audio. Nécessite GFE 2.7 ou supérieur.</string>
+    <string name="title_audio_config_list">Configuration son surround</string>
+    <string name="summary_audio_config_list">Activer le son surround 5.1 ou 7.1 pour les systèmes home cinéma</string>
 
     <string name="category_input_settings">Paramètres d\'entrée</string>
     <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
@@ -163,6 +163,10 @@
     <string name="dialog_title_reset_osc">Réinitialiser la mise en page</string>
     <string name="dialog_text_reset_osc">Êtes-vous sûr de vouloir supprimer la disposition des commandes à l\'écran que vous avez sauvegardée?</string>
     <string name="toast_reset_osc_success">Les contrôles à l\'écran sont réinitialisés</string>
+    <string name="title_osc_opacity">Modifier l\'opacité des contrôles à l\'écran</string>
+    <string name="summary_osc_opacity">Rendre les contrôles à l\'écran plus/moins transparents</string>
+    <string name="dialog_title_osc_opacity">Modifiez l\'opacité</string>
+    <string name="suffix_osc_opacity">%</string>
 
     <string name="category_ui_settings">Paramètres de l\'interface utilisateur</string>
     <string name="title_language_list">Langue</string>
@@ -187,6 +191,5 @@
     <string name="summary_enable_hdr">Diffuser du HDR lorsque le jeu et le processeur graphique du PC le prennent en charge. HDR nécessite un GPU série GTX 1000 ou une version ultérieure.</string>
     <string name="title_enable_perf_overlay">Activer la superposition de performance</string>
     <string name="summary_enable_perf_overlay">Afficher une superposition à l\'écran avec des informations de performance en temps réel pendant la lecture en continu</string>
-    <string name="suffix_osc_opacity">%</string>
 
 </resources>

app/src/main/res/values-it/strings.xml

@@ -113,8 +113,6 @@
     <string name="summary_checkbox_enable_pip">Permette di osservare (ma non di controllare) la stream in multitasking</string>
 
     <string name="category_audio_settings">Impostazioni audio</string>
-    <string name="title_checkbox_51_surround">Abilita l\'audio 5.1 surround</string>
-    <string name="summary_checkbox_51_surround">Se riscontri problemi, disabilitalo. Richiede GFE 2.7 o versioni sucessive.</string>
 
     <string name="title_checkbox_multi_controller">Supporto a più controller</string>
     <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controller appaiono come uno solo</string>

app/src/main/res/values-ja/strings.xml

@@ -90,8 +90,6 @@
     <string name="summary_checkbox_disable_warnings">ストリーミング中に画面に警告メッセージを表示しない</string>
 
     <string name="category_audio_settings">音声</string>
-    <string name="title_checkbox_51_surround">5.1chサラウンド</string>
-    <string name="summary_checkbox_51_surround">音声に問題が生じる場合はチェックを外してください。バージョン2.7以降のGFEが必要です</string>
 
     <string name="title_checkbox_multi_controller">複数のゲームコントローラ</string>
     <string name="summary_checkbox_multi_controller">チェックを外すと、全てのゲームコントローラが単一の物として認識されます</string>

app/src/main/res/values-ko/strings.xml

@@ -105,8 +105,6 @@
     <string name="summary_checkbox_disable_warnings">화면 상의 연결 경고 메세지를 스트리밍 중에 비활성화합니다.</string>
 
     <string name="category_audio_settings">오디오 설정</string>
-    <string name="title_checkbox_51_surround">5.1 서라운드 사운드 활성화</string>
-    <string name="summary_checkbox_51_surround">오디오 문제가 발생한다면 체크를 해제하세요. GFE 2.7이나 그 이상 버전이 필요합니다.</string>
 
     <string name="title_checkbox_multi_controller">다중 컨트롤러 지원</string>
     <string name="summary_checkbox_multi_controller">이 옵션을 선택하지 않으면 모든 컨트롤러가 하나로 표시됩니다</string>

app/src/main/res/values-nl/strings.xml

@@ -94,8 +94,6 @@
   <string name="summary_checkbox_disable_warnings">Verberg on-screen verbindingswaarschuwingen tijdens het streamen</string>
 
   <string name="category_audio_settings">Geluidsinstellingen</string>
-  <string name="title_checkbox_51_surround">Gebruik 5.1 surround sound</string>
-  <string name="summary_checkbox_51_surround">Gebruik dit niet als er problemen zijn met de audio. Vereist GFE 2.7 of hoger.</string>
 
   <string name="title_checkbox_multi_controller">Multi-gamepad support</string>
   <string name="summary_checkbox_multi_controller">Wanneer uitgevinkt, alle controllers verschijnen als één.</string>

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

@@ -96,8 +96,6 @@
     <string name="summary_checkbox_disable_warnings">Выключить экранные предупреждения о соединении во время трансляции</string>
 
     <string name="category_audio_settings">Аудио Настройки</string>
-    <string name="title_checkbox_51_surround">Включить объёмный звук 5.1</string>
-    <string name="summary_checkbox_51_surround">Отключите, если появляются аудио проблемы. Требуется GFE 2.7 или выше.</string>
 
     <string name="title_checkbox_multi_controller">Поддержка нескольких контроллеров</string>
     <string name="summary_checkbox_multi_controller">Когда отключена, все контроллеры определяются как один</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -134,8 +134,6 @@
     <string name="summary_checkbox_enable_pip">允许多任务时观看串流画面（但不操作）</string>																							 																															  
 
     <string name="category_audio_settings"> 音频设置 </string>
-    <string name="title_checkbox_51_surround"> 启用 5.1 环绕音效 </string>
-    <string name="summary_checkbox_51_surround"> 如果你的声音听起来有问题请禁用。 \n 需要GFE 2.7或更高版本 </string>
 
     <string name="category_input_settings">输入设置</string>															  
     <string name="title_checkbox_multi_controller"> 自动检测手柄 </string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -134,8 +134,6 @@
     <string name="summary_checkbox_enable_pip">允許多工時觀看串流畫面（但不操作）</string>																							 																															  
 
     <string name="category_audio_settings"> 音訊設置 </string>
-    <string name="title_checkbox_51_surround"> 啟用 5.1 環繞音效 </string>
-    <string name="summary_checkbox_51_surround"> 如果你的聲音聽起來有問題請禁用。 \n 需要GFE 2.7或更高版本 </string>
 
     <string name="category_input_settings">輸入設置</string>															  
     <string name="title_checkbox_multi_controller"> 自動檢測手柄 </string>

app/src/main/res/values/arrays.xml

@@ -30,6 +30,17 @@
         <item>120</item>
     </string-array>
 
+    <string-array name="audio_config_names">
+        <item>Stereo</item>
+        <item>5.1 Surround Sound</item>
+        <item>7.1 Surround Sound</item>
+    </string-array>
+    <string-array name="audio_config_values" translatable="false">
+        <item>2</item>
+        <item>51</item>
+        <item>71</item>
+    </string-array>
+
     <string-array name="language_names" translatable="false">
         <item>Default</item>
         <item>English</item>

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

@@ -135,8 +135,8 @@
     <string name="summary_checkbox_enable_pip">Allows the stream to be viewed (but not controlled) while multitasking</string>
 
     <string name="category_audio_settings">Audio Settings</string>
-    <string name="title_checkbox_51_surround">Enable 5.1 surround sound</string>
-    <string name="summary_checkbox_51_surround">Uncheck if you experience audio issues. Requires GFE 2.7 or higher.</string>
+    <string name="title_audio_config_list">Surround sound configuration</string>
+    <string name="summary_audio_config_list">Enable 5.1 or 7.1 surround sound for home-theater systems</string>
 
     <string name="category_input_settings">Input Settings</string>
     <string name="title_checkbox_multi_controller">Automatic gamepad presence detection</string>

app/src/main/res/xml/preferences.xml

@@ -43,11 +43,13 @@
             android:defaultValue="false" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_audio_settings">
-        <CheckBoxPreference
-            android:key="checkbox_51_surround"
-            android:title="@string/title_checkbox_51_surround"
-            android:summary="@string/summary_checkbox_51_surround"
-            android:defaultValue="false" />
+        <ListPreference
+            android:key="list_audio_config"
+            android:title="@string/title_audio_config_list"
+            android:summary="@string/summary_audio_config_list"
+            android:entries="@array/audio_config_names"
+            android:entryValues="@array/audio_config_values"
+            android:defaultValue="2" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_input_settings">
         <!--com.limelight.preferences.SeekBarPreference

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
     }
 }
 

fastlane/metadata/android/en-US/changelogs/219.txt

@@ -0,0 +1,2 @@
+- Added 7.1 surround sound support
+- Fixed a crash on some devices during a high intensity rumble event

fastlane/metadata/android/en-US/full_description.txt

@@ -6,7 +6,7 @@ Streaming performance may vary based on your client device and network setup. HD
 * Open-source and completely free (no ads, IAPs, or "Pro")
 * Streams games purchased from any store
 * Works on your home network or over the Internet/LTE
-* Up to 4K 120 FPS HDR streaming with 5.1 surround sound
+* Up to 4K 120 FPS HDR streaming with 7.1 surround sound
 * Keyboard and mouse support (with Android 8.0 or rooted device)
 * Supports PS3, PS4, Xbox 360, Xbox One, and Android gamepads
 * Force feedback support