I applied this now, and also a patch for updating speaker-always. -- Tanu On Wed, 2015-06-17 at 15:52 +0200, David Henningsson wrote: > Looks good, but analog-output-speaker-always.conf should be patched > too. > > Sjoerd, this does not disturb anything on your end, right? > > On 2015-06-15 17:06, Takashi Iwai wrote: > > Some machines provide "Dock Line Out Jack" control that should be > > handled like a normal line out. > > > > Signed-off-by: Takashi Iwai <tiwai at suse.de> > > --- > > src/modules/alsa/mixer/paths/analog-output-lineout.conf | 8 > > ++++++++ > > src/modules/alsa/mixer/paths/analog-output-speaker.conf | 4 ++++ > > 2 files changed, 12 insertions(+) > > > > diff --git a/src/modules/alsa/mixer/paths/analog-output > > -lineout.conf b/src/modules/alsa/mixer/paths/analog-output > > -lineout.conf > > index 68f444ae80a9..773abc409aa2 100644 > > --- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf > > +++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf > > @@ -71,6 +71,14 @@ state.plugged = unknown > > state.unplugged = unknown > > required-any = any > > > > +[Jack Dock Line Out] > > +required-any = any > > + > > +[Jack Dock Line Out Phantom] > > +state.plugged = unknown > > +state.unplugged = unknown > > +required-any = any > > + > > [Element Hardware Master] > > switch = mute > > volume = merge > > diff --git a/src/modules/alsa/mixer/paths/analog-output > > -speaker.conf b/src/modules/alsa/mixer/paths/analog-output > > -speaker.conf > > index 39193dd8851e..9e81e5592baa 100644 > > --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf > > +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf > > @@ -44,6 +44,10 @@ state.unplugged = unknown > > state.plugged = no > > state.unplugged = unknown > > > > +[Jack Dock Line Out] > > +state.plugged = no > > +state.unplugged = unknown > > + > > [Jack Speaker Phantom] > > required-any = any > > state.plugged = unknown > > >
