diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-26 09:14:20 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-26 09:14:20 +0000 |
commit | ba3c4568fb1ac38da3cc3b098434ac399ba7bb7d (patch) | |
tree | 8ca93e3eeb12a81ebcfdff37b48cc2c24a026e32 /mixer.h | |
parent | a26c2b997eef1fc20be08dc3a48784a2214f9a20 (diff) | |
download | mpv-ba3c4568fb1ac38da3cc3b098434ac399ba7bb7d.tar.bz2 mpv-ba3c4568fb1ac38da3cc3b098434ac399ba7bb7d.tar.xz |
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12673 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mixer.h')
-rw-r--r-- | mixer.h | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -1,19 +1,28 @@ - #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 muted; -extern void mixer_getvolume( float *l,float *r ); -extern void mixer_setvolume( float l,float r ); -extern void mixer_incvolume( void ); -extern void mixer_decvolume( void ); -extern float mixer_getbothvolume( void ); -void mixer_mute( void ); +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( v ) mixer_setvolume( v,v ) +#define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v) #endif |