Mercurial > mplayer.hg
view mixer.h @ 18708:9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
(same as new_sh_audio()) instead of sh_audio_t *, use those to remove
the pointer from demuxer->a_streams[] before freeing it.
Some demuxers use free_sh_audio() to undo the creation of an
already-allocated audio stream in case of error. These uses were unsafe
since free_sh_audio() freed the data structure but left the pointer in
demuxer->a_streams[], leading to double free later in free_demuxer()
(and perhaps use of the freed stream before that, I didn't check).
author | uau |
---|---|
date | Wed, 14 Jun 2006 14:05:59 +0000 |
parents | 75b84965d137 |
children | 519e42b716aa |
line wrap: on
line source
#ifndef __MPLAYER_MIXER #define __MPLAYER_MIXER #include "libaf/af.h" #include "libao2/audio_out.h" extern char * mixer_device; extern char * mixer_channel; extern int soft_vol; extern float soft_vol_max; typedef struct mixer_s { ao_functions_t *audio_out; af_stream_t *afilter; int volstep; int muted; float last_l, last_r; } mixer_t; void mixer_getvolume(mixer_t *mixer, float *l, float *r); void mixer_setvolume(mixer_t *mixer, float l, float r); void mixer_incvolume(mixer_t *mixer); void mixer_decvolume(mixer_t *mixer); void mixer_getbothvolume(mixer_t *mixer, float *b); void mixer_mute(mixer_t *mixer); //extern void mixer_setbothvolume( int v ); #define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v) #endif