[Mplayer-cvslog] CVS: main/Gui cfg.c,1.23,1.24 cfg.h,1.8,1.9 interface.c,1.61,1.62

[Zoltan Ponekker]

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

Modified Files:
	cfg.c cfg.h interface.c 
Log Message:
add autosync && some 10l bugfix

Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cfg.c	28 Nov 2002 21:33:59 -0000	1.23
+++ cfg.c	28 Nov 2002 23:17:10 -0000	1.24
@@ -42,6 +42,9 @@
 int    gtkCacheOn = 0;
 int    gtkCacheSize = 2048;
 
+int    gtkAutoSyncOn = 0;
+int    gtkAutoSync = 0;
+
 #ifdef HAVE_DXR3
  char * gtkDXR3Device;
 #endif
@@ -111,11 +114,14 @@
  { "font_autoscale",&subtitle_autoscale,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
 #endif
 
- { "cache",&gtkCacheOn,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL },
+ { "cache",&gtkCacheOn,CONF_TYPE_FLAG,0,0,1,NULL },
  { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL },
  
  { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL },
  { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL },
+
+ { "autosync",&gtkAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL },
+ { "autosync_size",&gtkAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL },
  
  { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 

Index: cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cfg.h	25 Nov 2002 18:18:43 -0000	1.8
+++ cfg.h	28 Nov 2002 23:17:10 -0000	1.9
@@ -20,6 +20,9 @@
 extern int    gtkCacheOn;
 extern int    gtkCacheSize;
 
+extern int    gtkAutoSyncOn;
+extern int    gtkAutoSync;
+
 extern int    gtkSubDumpMPSub;
 extern int    gtkSubDumpSrt;
 

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- interface.c	28 Nov 2002 00:44:09 -0000	1.61
+++ interface.c	28 Nov 2002 23:17:10 -0000	1.62
@@ -167,7 +167,9 @@
 #ifdef HAVE_DXR3
  if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
 #endif
- fullscreen=gtkLoadFullscreen;       
+ fullscreen=gtkLoadFullscreen;
+ if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
+ if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
    
  gtkInit();
 // --- initialize X 
@@ -551,6 +553,9 @@
 	 
 	if ( gtkCacheOn ) stream_cache_size=gtkCacheSize;
 	 else stream_cache_size=-1;
+
+	if ( gtkAutoSyncOn ) autosync=gtkAutoSync;
+	 else autosync=0;
 
 // -- audio
         if ( audio_out )