path: root/audio/out/ao.h
diff options
authorwm4 <wm4@nowhere>2013-06-16 19:15:32 +0200
committerwm4 <wm4@nowhere>2013-06-16 19:36:56 +0200
commit4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (patch)
tree8324cc1b661ff83ad9a8f50c5f08b42d838e4731 /audio/out/ao.h
parentf88193091b3de59b496633682b659cd388e24a59 (diff)
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 'audio/out/ao.h')
1 files changed, 3 insertions, 5 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h
index 0e004572a6..146c35f823 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -89,13 +89,11 @@ struct ao {
int samplerate;
struct mp_chmap channels;
int format;
- int bps; // bytes per second
- int outburst;
- int buffersize;
- double pts;
+ int bps; // bytes per second
+ double pts; // some mplayer.c state (why is this here?)
struct bstr buffer;
int buffer_playable_size;
- bool probing;
+ bool probing; // if true, don't fail loudly on init
bool initialized;
bool untimed;
bool no_persistent_volume; // the AO does the equivalent of af_volume