[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.40,1.41 configure,1.42,1.43 dec_audio.c,1.9,1.10 help_mp.h,1.10,1.11

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv26164

Modified Files:
	cfg-mplayer.h configure dec_audio.c help_mp.h 
Log Message:
applied 'fakemono' patch by Bryan Chan scorpio at acm.org

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** cfg-mplayer.h	2001/05/08 19:39:21	1.40
--- cfg-mplayer.h	2001/05/08 21:49:00	1.41
***************
*** 19,22 ****
--- 19,25 ----
  extern int sdl_forcexv;
  #endif
+ #ifdef USE_FAKE_MONO
+ extern int fakemono; // defined in dec_audio.c
+ #endif
  
  extern int vo_dbpp;
***************
*** 77,80 ****
--- 80,86 ----
  	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
  	{"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 32},
+ #ifdef USE_FAKE_MONO
+ 	{"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2},
+ #endif
  
  	{"dumpfile", &stream_dump_name, CONF_TYPE_STRING, 0, 0, 0},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** configure	2001/05/08 12:17:02	1.42
--- configure	2001/05/08 21:49:00	1.43
***************
*** 1012,1015 ****
--- 1012,1022 ----
  #define ALSA_TIMER
  
+ /* Undefine this if you don't want to select mono audio (left or right)
+    with a stereo MPEG layer 2/3 audio stream. The command-line option
+    -stereo has three possible values (0 for stereo, 1 for left-only, 2 for
+    right-only), with 0 being the default.
+    */
+ #define USE_FAKE_MONO
+ 
  /* Undefine this if your soundcard driver has no working select().
     If you have kernel Oops, player hangups, or just no audio, you should

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** dec_audio.c	2001/04/26 01:57:31	1.9
--- dec_audio.c	2001/05/08 21:49:00	1.10
***************
*** 7,10 ****
--- 7,14 ----
  extern int verbose; // defined in mplayer.c
  
+ #ifdef USE_FAKE_MONO
+ int fakemono=0;
+ #endif
+ 
  #include "stream.h"
  #include "demuxer.h"
***************
*** 158,162 ****
--- 162,170 ----
  case 1: {
    // MPEG Audio:
+ #ifdef USE_FAKE_MONO
+   MP3_Init(fakemono);
+ #else
    MP3_Init();
+ #endif
    MP3_samplerate=MP3_channels=0;
  //  printf("[\n");

Index: help_mp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** help_mp.h	2001/04/18 20:44:59	1.10
--- help_mp.h	2001/05/08 21:49:00	1.11
***************
*** 26,29 ****
--- 26,32 ----
  "    -alsa           enable timing code (works better with ALSA)\n"
  #endif
+ #ifdef USE_FAKE_MONO
+ "    -stereo         select MPEG1 stereo output (0:stereo 1:left 2:right)\n"
+ #endif
  "    -aid <id>       select audio channel [MPG: 0-31  AVI: 1-99]\n"
  "    -vid <id>       select video channel [MPG: 0-15  AVI:  -- ]\n"


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog