summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_alsa.c4
-rw-r--r--audio/out/ao_oss.c4
-rw-r--r--audio/out/ao_pulse.c4
-rw-r--r--audio/out/ao_rsound.c16
-rw-r--r--audio/out/ao_sndio.c10
-rw-r--r--audio/out/internal.h3
6 files changed, 3 insertions, 38 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 07:43:40 +0000