diff options
| author | wm4 <wm4@nowhere> | 2013-06-16 19:15:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-16 19:36:56 +0200 |
| commit | 4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (patch) | |
| tree | 8324cc1b661ff83ad9a8f50c5f08b42d838e4731 /core | |
| parent | f88193091b3de59b496633682b659cd388e24a59 (diff) | |
| download | mpv-4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6.tar.bz2 mpv-4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6.tar.xz | |
audio/out: remove ao->outburst/buffersize fields
The core didn't use these fields, and use of them was inconsistent
accross AOs. Some didn't use them at all. Some only set them; the values
were completely unused by the core. Some made full use of them.
Remove these fields. In places where they are still needed, make them
private AO state.
Remove the --abs option. It set the buffer size for ao_oss and ao_dsound
(being ignored by all other AOs), and was already marked as obsolete. If
it turns out that it's still needed for ao_oss or ao_dsound, their
default buffer sizes could be adjusted, and if even that doesn't help,
AO suboptions could be added in these cases.
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 1 | ||||
| -rw-r--r-- | core/options.c | 3 | ||||
| -rw-r--r-- | core/options.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index b6d2923818..d38363b9ce 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -1706,7 +1706,6 @@ void reinit_audio_chain(struct MPContext *mpctx) goto init_error; } if (!ao->initialized) { - ao->buffersize = opts->ao_buffersize; ao->encode_lavc_ctx = mpctx->encode_lavc_ctx; mp_chmap_remove_useless_channels(&ao->channels, &opts->audio_output_channels); diff --git a/core/options.c b/core/options.c index f73fcf7bb2..d3dd9d19c8 100644 --- a/core/options.c +++ b/core/options.c @@ -543,8 +543,6 @@ const m_option_t mp_opts[] = { {"no", 0}, {"yes", 1}, {"", 1})), OPT_FLAG("gapless-audio", gapless_audio, 0), - // override audio buffer size (used only by -ao oss/win32, obsolete) - OPT_INT("abs", ao_buffersize, 0), // set screen dimensions (when not detectable or virtual!=visible) OPT_INTRANGE("screenw", vo.screenwidth, CONF_GLOBAL, 0, 4096), @@ -734,7 +732,6 @@ const struct MPOpts mp_default_opts = { .mixer_init_volume = -1, .mixer_init_mute = -1, .volstep = 3, - .ao_buffersize = -1, .vo = { .video_driver_list = NULL, .cursor_autohide_delay = 1000, diff --git a/core/options.h b/core/options.h index f598cf267f..f925990a6c 100644 --- a/core/options.h +++ b/core/options.h @@ -57,7 +57,6 @@ typedef struct MPOpts { int volstep; float softvol_max; int gapless_audio; - int ao_buffersize; mp_vo_opts vo; |