diff options
author | wm4 <wm4@mplayer2.org> | 2012-01-18 04:21:58 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-01-18 04:21:58 +0100 |
commit | 6e41497d5be1f107c18b2143fa45b3c46d6e95d3 (patch) | |
tree | ba18bcab5e209d3c48658bac046fa48a9c5f053a /mixer.h | |
parent | 064f8c2fb656462db9662c67bdbc6716958a4de4 (diff) | |
parent | f7c2ecebccc4b3c5d6299aee5b8f4d382fa78987 (diff) | |
download | mpv-6e41497d5be1f107c18b2143fa45b3c46d6e95d3.tar.bz2 mpv-6e41497d5be1f107c18b2143fa45b3c46d6e95d3.tar.xz |
Merge branch 'softvol' into my_master
Diffstat (limited to 'mixer.h')
-rw-r--r-- | mixer.h | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -19,6 +19,8 @@ #ifndef MPLAYER_MIXER_H #define MPLAYER_MIXER_H +#include <stdbool.h> + #include "libaf/af.h" #include "libao2/audio_out.h" @@ -31,20 +33,26 @@ typedef struct mixer_s { struct ao *ao; af_stream_t *afilter; int volstep; - int muted; + bool muted; + bool mute_emulation; float last_l, last_r; + float restore_vol_l, restore_vol_r; + bool restore_volume; + float balance; + bool restore_balance; } mixer_t; +void mixer_reinit(mixer_t *mixer); +void mixer_uninit(mixer_t *mixer); 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); +bool mixer_getmuted(mixer_t *mixer); +void mixer_setmuted(mixer_t *mixer, bool mute); void mixer_getbalance(mixer_t *mixer, float *bal); void mixer_setbalance(mixer_t *mixer, float bal); -//void mixer_setbothvolume(int v); -#define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v) - #endif /* MPLAYER_MIXER_H */ |