[Mplayer-cvslog] CVS: main help_mp-en.h,1.46,1.47 help_mp-hu.h,1.43,1.44 mplayer.c,1.554,1.555 mplayer.h,1.13,1.14

[Zoltan Ponekker]

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

Modified Files:
	help_mp-en.h help_mp-hu.h mplayer.c mplayer.h 
Log Message:


- add play time subtitle change support
- better language support


Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- help_mp-en.h	29 Aug 2002 17:16:18 -0000	1.46
+++ help_mp-en.h	29 Aug 2002 22:24:45 -0000	1.47
@@ -336,6 +336,11 @@
 #define MSGTR_Network "Network streaming ..."
 #define MSGTR_Preferences "Preferences"
 #define MSGTR_OSSPreferences "OSS driver configuration"
+#define MSGTR_NoMediaOpened "no media opened"
+#define MSGTR_VCDTrack "VCD track %d"
+#define MSGTR_NoChapter "no chapter"
+#define MSGTR_Chapter "chapter %d"
+#define MSGTR_NoFileLoaded "no file loaded"
 
 // --- buttons ---
 #define MSGTR_Ok "Ok"

Index: help_mp-hu.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-hu.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- help_mp-hu.h	29 Aug 2002 17:16:18 -0000	1.43
+++ help_mp-hu.h	29 Aug 2002 22:24:45 -0000	1.44
@@ -228,7 +228,7 @@
 #ifdef HAVE_NEW_GUI
 
 // --- labels ---
-#define MSGTR_About "A GUI-ról"
+#define MSGTR_About "Az MPlayer - röl"
 #define MSGTR_FileSelect "File kiválasztása ..."
 #define MSGTR_SubtitleSelect "Felirat kiválasztása ..."
 #define MSGTR_OtherSelect "File kiválasztása ..."
@@ -240,6 +240,11 @@
 #define MSGTR_Network "Lejátszás WEB - röl ..."
 #define MSGTR_Preferences "Beállítások"
 #define MSGTR_OSSPreferences "OSS driver beállítások"
+#define MSGTR_NoMediaOpened "nincs megnyitva semmi"
+#define MSGTR_VCDTrack "%d. VCD track"
+#define MSGTR_NoChapter "nincs megnyitott fejezet"
+#define MSGTR_Chapter "%d. fejezet"
+#define MSGTR_NoFileLoaded "nincs file betöltve"
 
 // --- buttons ---
 #define MSGTR_Ok "Ok"
@@ -305,10 +310,10 @@
 #define MSGTR_MENU_PlayDisc "Lemez megnyitása ..."
 #define MSGTR_MENU_ShowDVDMenu "DVD menû"
 #define MSGTR_MENU_Titles "Sávok"
-#define MSGTR_MENU_Title "Sáv %2d"
+#define MSGTR_MENU_Title "%2d. sáv"
 #define MSGTR_MENU_None "(nincs)"
 #define MSGTR_MENU_Chapters "Fejezetek"
-#define MSGTR_MENU_Chapter "Fejezet %2d"
+#define MSGTR_MENU_Chapter "%2d. fejezet"
 #define MSGTR_MENU_AudioLanguages "Szinkron nyelvei"
 #define MSGTR_MENU_SubtitleLanguages "Feliratok nyelvei"
 #define MSGTR_MENU_PlayList "Playlist"

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- mplayer.c	29 Aug 2002 20:11:43 -0000	1.554
+++ mplayer.c	29 Aug 2002 22:24:45 -0000	1.555
@@ -251,6 +251,10 @@
 char *vobsub_name=NULL;
 /*DSP!!char *dsp=NULL;*/
 int   subcc_enabled=0;
+#ifdef USE_SUB
+subtitle* subtitles=NULL;
+float sub_last_pts = -303;
+#endif
 
 extern char *vo_subdevice;
 extern char *ao_subdevice;
@@ -467,10 +471,6 @@
 
 int main(int argc,char* argv[], char *envp[]){
 
-#ifdef USE_SUB
-static subtitle* subtitles=NULL;
-float sub_last_pts = -303;
-#endif
 
 static demux_stream_t *d_audio=NULL;
 static demux_stream_t *d_video=NULL;
@@ -2803,6 +2803,7 @@
   if ( subtitles ) 
    {
     sub_free( subtitles );
+    if ( sub_name ) free( sub_name );
     sub_name=NULL;
     vo_sub=NULL;
     subtitles=NULL;

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mplayer.h	15 Aug 2002 22:52:50 -0000	1.13
+++ mplayer.h	29 Aug 2002 22:24:45 -0000	1.14
@@ -2,6 +2,9 @@
 #ifndef __MPLAYER_MAIN
 #define __MPLAYER_MAIN
 
+#include "libvo/sub.h"
+#include "subreader.h"
+
 extern int use_gui;
 extern char* current_module;
 extern int fullscreen;
@@ -25,6 +28,8 @@
 extern int    sub_auto;
 extern int    sub_pos;
 extern int    sub_unicode;
+extern subtitle* subtitles;
+extern subtitle* vo_sub;
 
 extern char * filename;