summaryrefslogtreecommitdiffstats
path: root/libao2/ao_plugin.c
diff options
context:
space:
mode:
authoranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 13:31:26 +0000
committeranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-25 13:31:26 +0000
commit330d33256f51e049ee93458b43cef557a8a96f7e (patch)
treef2ce84ccba67afdef2672aa17c1923a6481ed368 /libao2/ao_plugin.c
parent4b6f1667dbc44aebfae5de7d92ae5b8a2095c243 (diff)
downloadmpv-330d33256f51e049ee93458b43cef557a8a96f7e.tar.bz2
mpv-330d33256f51e049ee93458b43cef557a8a96f7e.tar.xz
Adding SW volume control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4860 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_plugin.c')
-rw-r--r--libao2/ao_plugin.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/libao2/ao_plugin.c b/libao2/ao_plugin.c
index 8038660977..a5907438cd 100644
--- a/libao2/ao_plugin.c
+++ b/libao2/ao_plugin.c
@@ -36,8 +36,8 @@ typedef struct ao_plugin_local_data_s
static ao_plugin_local_data_t ao_plugin_local_data={NULL,0,0.0,NULL,NULL,AO_PLUGINS};
// global data
-volatile ao_plugin_data_t ao_plugin_data; // Data used by the plugins
-volatile ao_plugin_cfg_t ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
+ao_plugin_data_t ao_plugin_data; // Data used by the plugins
+ao_plugin_cfg_t ao_plugin_cfg=CFG_DEFAULTS; // Set in cfg-mplayer.h
// to set/get/query special features/parameters
static int control(int cmd,int arg){
@@ -45,6 +45,15 @@ static int control(int cmd,int arg){
case AOCONTROL_SET_PLUGIN_DRIVER:
ao_plugin_local_data.driver=(ao_functions_t*)arg;
return CONTROL_OK;
+ case AOCONTROL_GET_VOLUME:
+ case AOCONTROL_SET_VOLUME:
+ {
+ int r=audio_plugin_volume.control(cmd,arg);
+ if(CONTROL_OK != r)
+ return driver()->control(cmd,arg);
+ else
+ return r;
+ }
default:
return driver()->control(cmd,arg);
}