opt: ao (#1811)

* opt: ao

* multi select

---------

Co-authored-by: dom <githubaccount56556@proton.me>

lib/models/common/sponsor_block/skip_type.dart

@@ -1,4 +1,6 @@
-enum SkipType {
+import 'package:PiliPlus/models/common/enum_with_label.dart';
+
+enum SkipType implements EnumWithLabel {
   alwaysSkip('总是跳过'),
   skipOnce('跳过一次'),
   skipManually('手动跳过'),
@@ -6,6 +8,7 @@ enum SkipType {
   disable('禁用')
   ;
 
-  final String title;
+  @override
-  const SkipType(this.title);
+  final String label;
+  const SkipType(this.label);
 }

lib/pages/setting/models/extra_settings.dart

@@ -134,54 +134,12 @@ List<SettingsModel> get extraSettings => [
       ],
     ),
   ),
-  NormalModel(
+  getPopupMenuModel(
-    leading: const Icon(MdiIcons.debugStepOver),
     title: '番剧片头/片尾跳过类型',
-    getTrailing: () => Builder(
+    leading: const Icon(MdiIcons.debugStepOver),
-      builder: (context) {
+    key: SettingBoxKey.pgcSkipType,
-        final pgcSkipType = Pref.pgcSkipType;
+    values: SkipType.values,
-        final colorScheme = ColorScheme.of(context);
+    defaultIndex: SkipType.skipOnce.index,
-        final color = pgcSkipType == SkipType.disable
-            ? colorScheme.outline
-            : colorScheme.secondary;
-        return PopupMenuButton<SkipType>(
-          initialValue: pgcSkipType,
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8),
-            child: Text.rich(
-              style: TextStyle(fontSize: 14, height: 1, color: color),
-              strutStyle: const StrutStyle(
-                leading: 0,
-                height: 1,
-                fontSize: 14,
-              ),
-              TextSpan(
-                children: [
-                  TextSpan(text: pgcSkipType.title),
-                  WidgetSpan(
-                    alignment: .middle,
-                    child: Icon(
-                      MdiIcons.unfoldMoreHorizontal,
-                      size: 14,
-                      color: color,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-          onSelected: (value) async {
-            await GStorage.setting.put(SettingBoxKey.pgcSkipType, value.index);
-            if (context.mounted) {
-              (context as Element).markNeedsBuild();
-            }
-          },
-          itemBuilder: (context) => SkipType.values
-              .map((e) => PopupMenuItem(value: e, child: Text(e.title)))
-              .toList(),
-        );
-      },
-    ),
   ),
   SwitchModel(
     title: '检查未读动态',

lib/pages/setting/models/model.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/models/common/enum_with_label.dart';
 import 'package:PiliPlus/pages/setting/widgets/normal_item.dart';
 import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart';
 import 'package:PiliPlus/pages/setting/widgets/switch_item.dart';
@@ -7,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show FilteringTextInputFormatter;
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 @immutable
 sealed class SettingsModel {
@@ -258,3 +260,61 @@ SettingsModel getVideoFilterSelectModel({
     },
   );
 }
+
+SettingsModel getPopupMenuModel({
+  required String title,
+  Widget? leading,
+  String? subtitle,
+  required String key,
+  required List<EnumWithLabel> values,
+  int defaultIndex = 0,
+}) {
+  // final globalKey = GlobalKey<PopupMenuButtonState<EnumWithLabel>>();
+  return NormalModel(
+    title: title,
+    subtitle: subtitle,
+    leading: leading,
+    // onTap: (context, setState) => globalKey.currentState?.showButtonMenu(),
+    getTrailing: () => Builder(
+      builder: (context) {
+        final color = ColorScheme.of(context).secondary;
+        final v = values[GStorage.setting.get(key, defaultValue: defaultIndex)];
+        return PopupMenuButton(
+          // key: globalKey,
+          padding: .zero,
+          initialValue: v,
+          onSelected: (value) async {
+            await GStorage.setting.put(key, value.index);
+            if (context.mounted) {
+              (context as Element).markNeedsBuild();
+            }
+          },
+          itemBuilder: (context) => values
+              .map((i) => PopupMenuItem(value: i, child: Text(i.label)))
+              .toList(),
+          child: Padding(
+            padding: const .symmetric(vertical: 8),
+            child: Text.rich(
+              style: TextStyle(fontSize: 14, height: 1, color: color),
+              strutStyle: const StrutStyle(leading: 0, height: 1, fontSize: 14),
+              TextSpan(
+                children: [
+                  TextSpan(text: v.label),
+                  WidgetSpan(
+                    alignment: .middle,
+                    child: Icon(
+                      size: 14,
+                      MdiIcons.unfoldMoreHorizontal,
+                      color: color,
+                    ),
+                  ),
+                ],
+                style: TextStyle(color: color),
+              ),
+            ),
+          ),
+        );
+      },
+    ),
+  );
+}

lib/pages/setting/models/video_settings.dart

@@ -8,11 +8,13 @@ import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/pages/setting/models/model.dart';
 import 'package:PiliPlus/pages/setting/widgets/ordered_multi_select_dialog.dart';
 import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart';
+import 'package:PiliPlus/plugin/pl_player/models/audio_output_type.dart';
 import 'package:PiliPlus/plugin/pl_player/models/hwdec_type.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:PiliPlus/utils/video_utils.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
@@ -317,13 +319,32 @@ List<SettingsModel> get videoSettings => [
       }
     },
   ),
-  if (Platform.isAndroid)
+  if (kDebugMode || Platform.isAndroid)
-    const SwitchModel(
+    NormalModel(
-      title: '优先使用 OpenSL ES 输出音频',
+      title: '音频输出设备',
-      leading: Icon(Icons.speaker_outlined),
+      leading: const Icon(Icons.speaker_outlined),
-      subtitle: '关闭则优先使用AAudio输出音频（此项即mpv的--ao），若遇系统音效丢失、无声、音画不同步等问题请尝试打开。',
+      getSubtitle: () => '当前：${Pref.audioOutput}',
-      setKey: SettingBoxKey.useOpenSLES,
+      onTap: (context, setState) async {
-      defaultVal: false,
+        final result = await showDialog<List<String>>(
+          context: context,
+          builder: (context) {
+            return OrderedMultiSelectDialog<String>(
+              title: '音频输出设备',
+              initValues: Pref.audioOutput.split(','),
+              values: {
+                for (final e in AudioOutput.values) e.name: e.label,
+              },
+            );
+          },
+        );
+        if (result != null && result.isNotEmpty) {
+          await GStorage.setting.put(
+            SettingBoxKey.audioOutput,
+            result.join(','),
+          );
+          setState();
+        }
+      },
     ),
   const SwitchModel(
     title: '扩大缓冲区',

lib/pages/sponsor_block/view.dart

@@ -594,7 +594,7 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                         .map(
                           (item) => PopupMenuItem<SkipType>(
                             value: item,
-                            child: Text(item.title),
+                            child: Text(item.label),
                           ),
                         )
                         .toList(),
@@ -617,7 +617,7 @@ class _SponsorBlockPageState extends State<SponsorBlockPage> {
                         ),
                         TextSpan(
                           children: [
-                            TextSpan(text: item.second.title),
+                            TextSpan(text: item.second.label),
                             WidgetSpan(
                               alignment: .middle,
                               child: Icon(

lib/pages/video/controller.dart

@@ -659,7 +659,7 @@ class VideoDetailController extends GetxController
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         Text(
-                          item.skipType.title,
+                          item.skipType.label,
                           style: const TextStyle(fontSize: 13),
                         ),
                         if (item.segment.second != 0)

lib/plugin/pl_player/controller.dart

@@ -796,8 +796,7 @@ class PlPlayerController {
       await pp.setProperty("af", "scaletempo2=max-speed=8");
       if (Platform.isAndroid) {
         await pp.setProperty("volume-max", "100");
-        final ao = Pref.useOpenSLES ? "opensles,aaudio" : "aaudio,opensles";
+        await pp.setProperty("ao", Pref.audioOutput);
-        await pp.setProperty("ao", ao);
       }
       // video-sync=display-resample
       await pp.setProperty("video-sync", Pref.videoSync);

lib/plugin/pl_player/models/audio_output_type.dart

@@ -0,0 +1,14 @@
+import 'package:PiliPlus/models/common/enum_with_label.dart';
+
+enum AudioOutput implements EnumWithLabel {
+  aaudio('AAudio'),
+  opensles('OpenSL ES'),
+  audiotrack('AudioTrack')
+  ;
+
+  static final defaultValue = values.map((e) => e.name).join(',');
+
+  @override
+  final String label;
+  const AudioOutput(this.label);
+}

lib/utils/storage_key.dart

@@ -13,7 +13,7 @@ abstract final class SettingBoxKey {
       defaultToastOp = 'defaultToastOp',
       defaultPicQa = 'defaultPicQa',
       enableHA = 'enableHA',
-      useOpenSLES = 'useOpenSLES',
+      audioOutput = 'audioOutput',
       expandBuffer = 'expandBuffer',
       hardwareDecoding = 'hardwareDecoding',
       videoSync = 'videoSync',

lib/utils/storage_pref.dart

@@ -24,6 +24,7 @@ import 'package:PiliPlus/models/common/video/video_decode_type.dart';
 import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models/user/danmaku_rule.dart';
 import 'package:PiliPlus/models/user/info.dart';
+import 'package:PiliPlus/plugin/pl_player/models/audio_output_type.dart';
 import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart';
 import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart';
 import 'package:PiliPlus/plugin/pl_player/models/hwdec_type.dart';
@@ -786,8 +787,10 @@ abstract final class Pref {
   static bool get expandBuffer =>
       _setting.get(SettingBoxKey.expandBuffer, defaultValue: false);
 
-  static bool get useOpenSLES =>
+  static String get audioOutput => _setting.get(
-      _setting.get(SettingBoxKey.useOpenSLES, defaultValue: false);
+    SettingBoxKey.audioOutput,
+    defaultValue: AudioOutput.defaultValue,
+  );
 
   static bool get enableAi =>
       _setting.get(SettingBoxKey.enableAi, defaultValue: false);