diff options
| author | wm4 <wm4@nowhere> | 2014-10-02 01:47:27 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-10-02 02:42:23 +0200 |
| commit | 7dd3822d099522cd8bf59aa1eb3e318e2cfcacdd (patch) | |
| tree | 2167d50000fe2d52f23c468595c8c6b887b09a29 /audio/decode/dec_audio.h | |
| parent | 2e16dfbf93bd9348c4beb526b14f52b01af3e867 (diff) | |
| download | mpv-7dd3822d099522cd8bf59aa1eb3e318e2cfcacdd.tar.bz2 mpv-7dd3822d099522cd8bf59aa1eb3e318e2cfcacdd.tar.xz | |
audio: refactor some aspects of filter chain setup
There's no real reason why audio_init_filter() should exist. Just use
af_init or af_reinit directly. (We lose a useless message; the same
information is printed in a quite close place with more details.)
Requires less code, and the way the filter chain is marked as having
failed to initialize allows just switching off audio instead of
crashing if trying to insert a volume filter in mixer.c fails, and
recreating the old filter chain fails too.
Diffstat (limited to 'audio/decode/dec_audio.h')
| -rw-r--r-- | audio/decode/dec_audio.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index b76ff0b95c..08fa87e8a7 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -36,7 +36,6 @@ struct dec_audio { struct mp_audio_buffer *decode_buffer; struct af_stream *afilter; char *decoder_desc; - struct replaygain_data *replaygain_data; int init_retries; // set by decoder struct mp_audio decoded; // decoded audio set by last decode_packet() call @@ -65,8 +64,4 @@ int initial_audio_decode(struct dec_audio *d_audio); void audio_reset_decoding(struct dec_audio *d_audio); void audio_uninit(struct dec_audio *d_audio); -int audio_init_filters(struct dec_audio *d_audio, int in_samplerate, - int *out_samplerate, struct mp_chmap *out_channels, - int *out_format); - #endif /* MPLAYER_DEC_AUDIO_H */ |