[Mplayer-cvslog] CVS: main help_mp-en.h,1.15,1.16 help_mp-hu.h,1.19,1.20 mplayer.c,1.336,1.337

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv25248

Modified Files:
	help_mp-en.h help_mp-hu.h mplayer.c 
Log Message:
Add subtitle loader for gui

Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- help_mp-en.h	3 Dec 2001 21:11:44 -0000	1.15
+++ help_mp-en.h	15 Dec 2001 15:35:59 -0000	1.16
@@ -229,6 +229,8 @@
 // --- labels ---
 #define MSGTR_About "About"
 #define MSGTR_FileSelect "Select file ..."
+#define MSGTR_SubtitleSelect "Select subtitle ..."
+#define MSGTR_OtherSelect "Select ..."
 #define MSGTR_MessageBox "MessageBox"
 #define MSGTR_PlayList "PlayList"
 #define MSGTR_SkinBrowser "Skin Browser"

Index: help_mp-hu.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-hu.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- help_mp-hu.h	3 Dec 2001 22:30:47 -0000	1.19
+++ help_mp-hu.h	15 Dec 2001 15:35:59 -0000	1.20
@@ -224,6 +224,8 @@
 // --- labels ---
 #define MSGTR_About "A GUI-ról"
 #define MSGTR_FileSelect "File kiválasztása ..."
+#define MSGTR_SubtitleSelect "Felirat kiválasztása ..."
+#define MSGTR_OtherSelect "File kiválasztása ..."
 #define MSGTR_MessageBox "Üzenetablak"
 #define MSGTR_PlayList "Lejátszási lista"
 #define MSGTR_SkinBrowser "Skin böngészõ"

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- mplayer.c	12 Dec 2001 21:47:44 -0000	1.336
+++ mplayer.c	15 Dec 2001 15:35:59 -0000	1.337
@@ -589,18 +589,6 @@
   }
 #endif
 
-#ifdef USE_SUB
-// check .sub
-  if(sub_name){
-       int l=strlen(sub_name);
-       if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
-		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
-	  sub_utf8=1;
-       subtitles=sub_read_file(sub_name);
-       if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
-  }
-#endif
-
   // It's time to init the GUI code: (and fork() the GTK process)
 #ifdef HAVE_NEW_GUI
   if(use_gui){
@@ -678,6 +666,10 @@
       if(mplShMem->FilenameChanged){
         filename=mplShMem->Filename;
       }
+#ifdef USE_SUB
+      sub_name=NULL;
+      if ( mplShMem->SubtitleChanged ) sub_name=mplShMem->Subtitlename;
+#endif
     }
 #endif
 
@@ -685,6 +677,14 @@
 
 #ifdef USE_SUB
 // check .sub
+  if(sub_name){
+       int l=strlen(sub_name);
+       if ((l>4) && ((0==strcmp(&sub_name[l-4],".utf"))
+		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
+	  sub_utf8=1;
+       subtitles=sub_read_file(sub_name);
+       if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
+  }
   if(!sub_name){
       if(sub_auto && filename) { // auto load sub file ...
          subtitles=sub_read_file( sub_filename( get_path("sub/"), filename ) );