From a7f51f8fd48df7f04f47b515180338f8b9b78fed Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 7 Nov 2015 15:20:34 +0100
Subject: ao_jack: remove "alsa" std-channel-layout choice

Same deal as with previous commit. "waveext" is less arbitrary and at
least supports 3/7 channels.
---
 audio/out/ao_jack.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'audio')

diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 04e5c71b4a..41ccfae614 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -162,10 +162,6 @@ static int init(struct ao *ao)
         mp_chmap_sel_add_waveext(&sel);
         break;
 
-    case 1:
-        mp_chmap_sel_add_alsa_def(&sel);
-        break;
-
     default:
         mp_chmap_sel_add_any(&sel);
     }
@@ -236,7 +232,7 @@ const struct ao_driver audio_out_jack = {
         OPT_FLAG("autostart", autostart, 0),
         OPT_FLAG("connect", connect, 0),
         OPT_CHOICE("std-channel-layout", stdlayout, 0,
-                ({"waveext", 0}, {"alsa", 1}, {"any", 2})),
+                ({"waveext", 0}, {"any", 1})),
         {0}
     },
 };
-- 
cgit v1.2.3