From 809d160c1ec1c050d1877e66f93fcffc98fe4e83 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 23 Apr 2017 17:51:55 +0200 Subject: [PATCH] options: remove remaining deprecated audio device selection options --- DOCS/interface-changes.rst | 3 +++ DOCS/man/ao.rst | 53 +++----------------------------------- audio/out/ao_alsa.c | 4 --- audio/out/ao_oss.c | 4 --- audio/out/ao_pulse.c | 4 +-- audio/out/ao_rsound.c | 16 ------------ audio/out/ao_sndio.c | 10 ++----- audio/out/internal.h | 3 --- 8 files changed, 9 insertions(+), 88 deletions(-) diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index bdf5791a6b..2e10d7da2d 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -19,6 +19,9 @@ Interface changes :: + --- mpv 0.26.0 --- + - remove remaining deprecated audio device options, like --alsa-devide + Some of them were removed in earlier releases. --- mpv 0.25.0 --- - remove opengl-cb dxva2 dummy hwdec interop (see git "vo_opengl: remove dxva2 dummy hwdec backend") diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst index 5984abaa1c..ed0035fcc1 100644 --- a/DOCS/man/ao.rst +++ b/DOCS/man/ao.rst @@ -41,9 +41,6 @@ Available audio output drivers are: The following global options are supported by this audio output: - ``--oss-device`` - Sets the audio output device (default: ``/dev/dsp``). - Deprecated, use ``--audio-device``. ``--oss-mixer-device`` Sets the audio mixer device (default: ``/dev/mixer``). ``--oss-mixer-channel`` @@ -98,12 +95,6 @@ Available audio output drivers are: setting in the ``Audio Devices`` dialog in the ``Audio MIDI Setup`` utility. Note that this does not affect the selected speaker setup. - ``--coreaudio-exclusive`` - Deprecated, use ``--audio-exclusive``. - Use exclusive mode access. This merely redirects to - ``coreaudio_exclusive``, but should be preferred over using that AO - directly. - ``coreaudio_exclusive`` (Mac OS X only) Native Mac OS X audio output driver using direct device access and @@ -120,11 +111,9 @@ Available audio output drivers are: The following global options are supported by this audio output: - ``--pulse-host=``, ``--pulse-sink=`` - Specify the host and optionally output sink to use. An empty - string uses a local connection, "localhost" uses network transfer - (most likely not what you want). - Deprecated, use ``--audio-device``. + ``--pulse-host=`` + Specify the host to use. An empty string uses a local connection, + "localhost" uses network transfer (most likely not what you want). ``--pulse-buffer=<1-2000|native>`` Set the audio buffer size in milliseconds. A higher value buffers @@ -224,19 +213,6 @@ Available audio output drivers are: confused with RoarAudio, which is something completely different. - The following global options are supported by this audio output: - - ``--rsound-host=`` - Set the address of the server (default: localhost). Can be either a - network hostname for TCP connections or a Unix domain socket path - starting with '/'. - ``--rsound-port=`` - Set the TCP port used for connecting to the server (default: 12345). - Not used if connecting to a Unix domain socket. - - These options are deprecated. If anyone cares enough, their functionality - can be added back using ``--audio-device``. - ``sndio`` Audio output to the OpenBSD sndio sound system @@ -245,28 +221,5 @@ Available audio output drivers are: (Note: only supports mono, stereo, 4.0, 5.1 and 7.1 channel layouts.) - The following global options are supported by this audio output: - - ``--ao-sndio-device=`` - sndio device to use (default: ``$AUDIODEVICE``, resp. ``snd0``). - Deprecated, use ``--audio-device``. - ``wasapi`` Audio output to the Windows Audio Session API. - - The following global options are supported by this audio output: - - ``--ao-wasapi-exclusive`` - Deprecated, use ``--audio-exclusive``. - Requests exclusive, direct hardware access. By definition prevents - sound playback of any other program until mpv exits. - ``--ao-wasapi-device=`` - Deprecated, use ``--audio-device``. - - Uses the requested endpoint instead of the system's default audio - endpoint. Both an ordinal number (0,1,2,...) and the GUID - String are valid; the GUID string is guaranteed to not change - unless the driver is uninstalled. - - Also supports searching active devices by human-readable name. If more - than one device matches the name, refuses loading it. diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index f7f9a1a555..c0efdaff40 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -50,7 +50,6 @@ #include "audio/format.h" struct ao_alsa_opts { - char *device; char *mixer_device; char *mixer_name; int mixer_index; @@ -62,7 +61,6 @@ struct ao_alsa_opts { #define OPT_BASE_STRUCT struct ao_alsa_opts static const struct m_sub_options ao_alsa_conf = { .opts = (const struct m_option[]) { - OPT_STRING("alsa-device", device, 0, DEVICE_OPT_DEPRECATION), OPT_FLAG("alsa-resample", resample, 0), OPT_STRING("alsa-mixer-device", mixer_device, 0), OPT_STRING("alsa-mixer-name", mixer_name, 0), @@ -656,8 +654,6 @@ static int init_device(struct ao *ao, int mode) const char *device = "default"; if (ao->device) device = ao->device; - if (p->opts->device && p->opts->device[0]) - device = p->opts->device; err = try_open_device(ao, device, mode); CHECK_ALSA_ERROR("Playback open error"); diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 7e73644b8f..aee4357075 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -70,7 +70,6 @@ struct priv { bool device_failed; double audio_end; - char *dsp; char *oss_mixer_device; char *cfg_oss_mixer_channel; }; @@ -282,8 +281,6 @@ static int reopen_device(struct ao *ao, bool allow_format_changes) const char *device = PATH_DEV_DSP; if (ao->device) device = ao->device; - if (p->dsp && p->dsp[0]) - device = p->dsp; MP_VERBOSE(ao, "using '%s' dsp device\n", device); #ifdef __linux__ @@ -652,7 +649,6 @@ const struct ao_driver audio_out_oss = { .oss_mixer_device = PATH_DEV_MIXER, }, .options = (const struct m_option[]) { - OPT_STRING("device", dsp, 0, DEVICE_OPT_DEPRECATION), OPT_STRING("mixer-device", oss_mixer_device, 0), OPT_STRING("mixer-channel", cfg_oss_mixer_channel, 0), {0} diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 6c6a517f2a..eb53b4604a 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -59,7 +59,6 @@ struct priv { int wakeup_status; char *cfg_host; - char *cfg_sink; int cfg_buffer; int cfg_latency_hacks; }; @@ -415,7 +414,7 @@ static int init(struct ao *ao) pa_proplist *proplist = NULL; pa_format_info *format = NULL; struct priv *priv = ao->priv; - char *sink = priv->cfg_sink && priv->cfg_sink[0] ? priv->cfg_sink : ao->device; + char *sink = ao->device; if (pa_init_boilerplate(ao) < 0) return -1; @@ -836,7 +835,6 @@ const struct ao_driver audio_out_pulse = { }, .options = (const struct m_option[]) { OPT_STRING("host", cfg_host, 0), - OPT_STRING("sink", cfg_sink, 0, DEVICE_OPT_DEPRECATION), OPT_CHOICE_OR_INT("buffer", cfg_buffer, 0, 1, 2000, ({"native", 0})), OPT_FLAG("latency-hacks", cfg_latency_hacks, 0), {0} diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c index 9689a9e0b8..4140716bc0 100644 --- a/audio/out/ao_rsound.c +++ b/audio/out/ao_rsound.c @@ -36,8 +36,6 @@ struct priv { rsound_t *rd; - char *host; - char *port; }; static int set_format(struct ao *ao) @@ -66,12 +64,6 @@ static int init(struct ao *ao) if (rsd_init(&priv->rd) < 0) return -1; - if (priv->host && priv->host[0]) - rsd_set_param(priv->rd, RSD_HOST, priv->host); - - if (priv->port && priv->port[0]) - rsd_set_param(priv->rd, RSD_PORT, priv->port); - // Actual channel layout unknown. struct mp_chmap_sel sel = {0}; mp_chmap_sel_add_waveext_def(&sel); @@ -155,13 +147,5 @@ const struct ao_driver audio_out_rsound = { .pause = audio_pause, .resume = audio_resume, .priv_size = sizeof(struct priv), - .options = (const struct m_option[]) { - OPT_STRING("host", host, 0, - .deprecation_message = "request --audio-device support on issue tracker"), - OPT_STRING("port", port, 0, - .deprecation_message = "request --audio-device support on issue tracker"), - {0} - }, - .options_prefix = "rsound", }; diff --git a/audio/out/ao_sndio.c b/audio/out/ao_sndio.c index e0fd9f0296..d9ac4ef7e4 100644 --- a/audio/out/ao_sndio.c +++ b/audio/out/ao_sndio.c @@ -122,9 +122,9 @@ static int init(struct ao *ao) const struct af_to_par *ap; int i; - p->hdl = sio_open(p->dev, SIO_PLAY, 0); + p->hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); if (p->hdl == NULL) { - MP_ERR(ao, "can't open sndio %s\n", p->dev); + MP_ERR(ao, "can't open sndio %s\n", SIO_DEVANY); goto error; } @@ -319,10 +319,4 @@ const struct ao_driver audio_out_sndio = { .resume = audio_resume, .reset = reset, .priv_size = sizeof(struct priv), - .options = (const struct m_option[]) { - OPT_STRING("device", dev, 0, OPTDEF_STR(SIO_DEVANY), - DEVICE_OPT_DEPRECATION), - {0} - }, - .options_prefix = "ao-sndio", }; diff --git a/audio/out/internal.h b/audio/out/internal.h index b35f20fba2..896e427a95 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -207,7 +207,4 @@ bool ao_chmap_sel_get_def(struct ao *ao, const struct mp_chmap_sel *s, void ao_device_list_add(struct ao_device_list *list, struct ao *ao, struct ao_device_desc *e); -#define DEVICE_OPT_DEPRECATION \ - .deprecation_message = "use --audio-device instead" - #endif