add mixer support

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@463 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 7 insertions, 1 deletions

diff --git a/help_mp.h b/help_mp.h
index a1cd318f88..02becc5cd0 100644
--- a/help_mp.h
+++ b/help_mp.h
@@ -40,4 +40,6 @@ static char* help_text=
 "    q or ESC        stop playing and quit program\n"
 "    + or -          adjust audio delay by +/- 0.1 second\n"
 "    o               toggle OSD:  none / seek / seek+timer\n"
+"    * or /          increase or decrease volume\n"
+"    m or c          use mixer master or pcm channel\n"
 "\n";
diff --git a/lirc_mp.c b/lirc_mp.c
index 7ab91c06cd..42ab098826 100644
--- a/lirc_mp.c
+++ b/lirc_mp.c
@@ -95,7 +95,11 @@ int lirc_mp_getinput(){
     {"FFWD" , KEY_UP},
     {"RWND" , KEY_LEFT},
     {"FRWND" , KEY_DOWN},
-    {"PAUSE", 'p'}    
+    {"PAUSE", 'p'},
+    {"INCVOL", '*'},
+    {"DECVOL", '/'},
+    {"MASTER", 'm'},
+    {"PCM", 'c'}
   };
        
   char *code;