summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-16 00:09:53 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-16 00:09:53 +0000
commitd72468bace9e659eddf4d2febd18bb6970d25ba4 (patch)
tree1dc7ce41faad799bba367f4e4873b3fe3a4e41f9 /mplayer.c
parent31063c5f27d54a3ce25591af65fb698658970695 (diff)
downloadmpv-d72468bace9e659eddf4d2febd18bb6970d25ba4.tar.bz2
mpv-d72468bace9e659eddf4d2febd18bb6970d25ba4.tar.xz
add mixer support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@460 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 3d74849faa..9b524ddad1 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -431,6 +431,7 @@ float sub_delay=0;
float sub_fps=0;
//int user_bpp=0;
+#include "mixer.h"
#include "cfg-mplayer.h"
printf("%s",banner_text);
@@ -1578,6 +1579,18 @@ switch(sh_video->codec->driver){
case 'o': // toggle OSD
osd_level=(osd_level+1)%3;
break;
+ case '*':
+ mixer_incvolume();
+ break;
+ case '/':
+ mixer_decvolume();
+ break;
+ case 'm':
+ mixer_usemaster=1;
+ break;;
+ case 'c':
+ mixer_usemaster=0;
+ break;
}
if(rel_seek_secs)
if(file_format==DEMUXER_TYPE_AVI && avi_header.idx_size<=0){