# HG changeset patch
# User pontscho
# Date 987379793 0
# Node ID 9dfad88a8107e9659da11df1f5b4a0c877eeb605
# Parent  49b0474b2e266e83874630da68e8f73b69ae462c
add mixer support

diff -r 49b0474b2e26 -r 9dfad88a8107 mplayer.c
--- a/mplayer.c	Sun Apr 15 23:22:01 2001 +0000
+++ b/mplayer.c	Mon Apr 16 00:09:53 2001 +0000
@@ -431,6 +431,7 @@
 float sub_fps=0;
 //int user_bpp=0;
 
+#include "mixer.h"
 #include "cfg-mplayer.h"
 
   printf("%s",banner_text);
@@ -1578,6 +1579,18 @@
     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){