# HG changeset patch
# User pontscho
# Date 1041518500 0
# Node ID 2df4e9d9922d59a25cdfa2d850a51270f858b337
# Parent  ef36186ca7e00d443ed6fc536b18ad6354d63490
add overlapping to preferences

diff -r ef36186ca7e0 -r 2df4e9d9922d Gui/cfg.c
--- a/Gui/cfg.c	Thu Jan 02 14:33:55 2003 +0000
+++ b/Gui/cfg.c	Thu Jan 02 14:41:40 2003 +0000
@@ -113,6 +113,7 @@
  { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
+ { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL },
  { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
  { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
 #ifdef HAVE_FREETYPE 
diff -r ef36186ca7e0 -r 2df4e9d9922d Gui/mplayer/gtk/opts.c
--- a/Gui/mplayer/gtk/opts.c	Thu Jan 02 14:33:55 2003 +0000
+++ b/Gui/mplayer/gtk/opts.c	Thu Jan 02 14:41:40 2003 +0000
@@ -60,6 +60,7 @@
 static GtkWidget * CBFlip;
 static GtkWidget * CBNoAutoSub;
 static GtkWidget * CBSubUnicode;
+static GtkWidget * CBSubOverlap;
 static GtkWidget * CBDumpMPSub;
 static GtkWidget * CBDumpSrt;
 static GtkWidget * CBPostprocess;
@@ -245,6 +246,7 @@
  }
 
 // -- 3. page
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt );
@@ -340,6 +342,7 @@
 #ifndef USE_SUB
  gtk_widget_set_sensitive( AConfig,FALSE );
  gtk_widget_set_sensitive( CBNoAutoSub,FALSE );
+ gtk_widget_set_sensitive( CBSubOverlap,FALSE );
  gtk_widget_set_sensitive( CBSubUnicode,FALSE );
  gtk_widget_set_sensitive( CBDumpMPSub,FALSE );
  gtk_widget_set_sensitive( CBDumpSrt,FALSE );
@@ -463,6 +466,7 @@
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFlip ) ) ) flip=1;
 	
 	// -- 3. page
+	suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
 	sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
 	gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
 	gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) );
@@ -872,6 +876,7 @@
 
   vbox9=AddVBox( vbox8,0 );
 
+  CBSubOverlap=AddCheckButton( MSGTR_PREFERENCES_SUB_Overlap,vbox9 );
   CBNoAutoSub=AddCheckButton( MSGTR_PREFERENCES_SUB_AutoLoad,vbox9 );
   CBSubUnicode=AddCheckButton( MSGTR_PREFERENCES_SUB_Unicode,vbox9 );
   CBDumpMPSub=AddCheckButton( MSGTR_PREFERENCES_SUB_MPSUB,vbox9 );
diff -r ef36186ca7e0 -r 2df4e9d9922d help/help_mp-en.h
--- a/help/help_mp-en.h	Thu Jan 02 14:33:55 2003 +0000
+++ b/help/help_mp-en.h	Thu Jan 02 14:41:40 2003 +0000
@@ -442,6 +442,7 @@
 #define MSGTR_PREFERENCES_SUB_Unicode "Unicode subtitle"
 #define MSGTR_PREFERENCES_SUB_MPSUB "Convert the given subtitle to MPlayer's subtitle format"
 #define MSGTR_PREFERENCES_SUB_SRT "Convert the given subtitle to the time based SubViewer (SRT) format"
+#define MSGTR_PREFERENCES_SUB_Overlap "Toggle subtitle overlapping"
 #define MSGTR_PREFERENCES_Font "Font:"
 #define MSGTR_PREFERENCES_FontFactor "Font factor:"
 #define MSGTR_PREFERENCES_PostProcess "Enable postprocessing"
diff -r ef36186ca7e0 -r 2df4e9d9922d mplayer.h
--- a/mplayer.h	Thu Jan 02 14:33:55 2003 +0000
+++ b/mplayer.h	Thu Jan 02 14:41:40 2003 +0000
@@ -32,6 +32,7 @@
 extern int    sub_unicode;
 extern subtitle* subtitles;
 extern subtitle* vo_sub;
+extern int    suboverlap_enabled;
 
 extern char * filename;