[Mplayer-cvslog] CVS: main/Gui cfg.c,1.17,1.18 cfg.h,1.5,1.6 interface.c,1.51,1.52 interface.h,1.27,1.28

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv3420/Gui

Modified Files:
	cfg.c cfg.h interface.c interface.h 
Log Message:


- better dxr3 support
- fix oss subdevice bug
- add some warning fix from Dominik Mierzejewski <dominik at rangers.eu.org>


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cfg.c	2 Oct 2002 13:16:14 -0000	1.17
+++ cfg.c	10 Oct 2002 14:06:35 -0000	1.18
@@ -36,6 +36,10 @@
 char * gtkAOOSSMixer;
 char * gtkAOOSSDevice;
 
+#ifdef HAVE_DXR3
+ char * gtkDXR3Device;
+#endif
+
 int    gtkSubDumpMPSub = 0;
 int    gtkSubDumpSrt = 0;
 
@@ -56,6 +60,9 @@
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
  { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
  { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
+#ifdef HAVE_DXR3
+ { "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
+#endif
 
  { "v_framedrop",&frame_dropping,CONF_TYPE_INT,CONF_RANGE,0,2,NULL },
  { "v_flip",&flip,CONF_TYPE_INT,CONF_RANGE,-1,1,NULL },
@@ -221,7 +228,7 @@
 	    }
        case CONF_TYPE_STRING_LIST:
             {
-	     char ** tmp = *( (char **)gui_opts[i].p );
+	     char ** tmp = *( (char ***)gui_opts[i].p );
 	     if ( tmp && tmp[0] && tmp[0][0] ) fprintf( f,"%s = \"%s\"\n",gui_opts[i].name,tmp[0] );
 	     break;
 	    }

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cfg.h	28 Sep 2002 19:42:07 -0000	1.5
+++ cfg.h	10 Oct 2002 14:06:35 -0000	1.6
@@ -16,6 +16,7 @@
 extern float  gtkAOExtraStereoMul;
 extern char * gtkAOOSSMixer;
 extern char * gtkAOOSSDevice;
+extern char * gtkDXR3Device;
 
 extern int    gtkSubDumpMPSub;
 extern int    gtkSubDumpSrt;

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- interface.c	2 Oct 2002 13:16:14 -0000	1.51
+++ interface.c	10 Oct 2002 14:06:35 -0000	1.52
@@ -155,14 +155,13 @@
  guiIntfStruct.StreamType=-1;
 
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
- gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
- gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+ if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
+ if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP );
+ if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
  fullscreen=gtkLoadFullscreen;       
    
  gtkInit();
  wsXInit( (void *)mDisplay );
-     
-// cfg_read(); 
  appInit( (void*)mDisplay );
 
  if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- interface.h	2 Oct 2002 13:16:14 -0000	1.27
+++ interface.h	10 Oct 2002 14:06:35 -0000	1.28
@@ -139,6 +139,7 @@
 extern int  guiGetEvent( int type,char * arg );
 extern void guiEventHandling( void );
 extern void guiLoadFont( void );
+extern void guiLoadSubtitle( char * name );
 
 typedef struct _plItem 
 {