From 3daea856b19deca2a7e89048cf70ea4897a46c0a Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 8 Jul 2014 01:44:30 +0200 Subject: [PATCH] config: Deprecate audio/mixer_track --- docs/config.rst | 8 -------- mopidy/config/__init__.py | 2 +- mopidy/config/default.conf | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/config.rst b/docs/config.rst index 692204d9..e51ee273 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -91,14 +91,6 @@ Audio configuration Setting the config value to blank leaves the audio mixer volume unchanged. For the software mixer blank means 100. -.. confval:: audio/mixer_track - - Audio mixer track to use. - - Name of the mixer track to use. If this is not set we will try to find the - master output track. As an example, using ``alsamixer`` you would typically - set this to ``Master`` or ``PCM``. - .. confval:: audio/output Audio output to use. diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 1f9f5e2d..c23707d8 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -24,7 +24,7 @@ _loglevels_schema = LogLevelConfigSchema('loglevels') _audio_schema = ConfigSchema('audio') _audio_schema['mixer'] = String() -_audio_schema['mixer_track'] = String(optional=True) +_audio_schema['mixer_track'] = Deprecated() _audio_schema['mixer_volume'] = Integer(optional=True, minimum=0, maximum=100) _audio_schema['output'] = String() _audio_schema['visualizer'] = String(optional=True) diff --git a/mopidy/config/default.conf b/mopidy/config/default.conf index 839c983d..d56b7b28 100644 --- a/mopidy/config/default.conf +++ b/mopidy/config/default.conf @@ -6,7 +6,6 @@ config_file = [audio] mixer = software -mixer_track = mixer_volume = output = autoaudiosink visualizer =