[Mplayer-cvslog] CVS: main help_mp-cz.h,1.10,1.11 help_mp-de.h,1.27,1.28 help_mp-dk.h,1.6,1.7 help_mp-en.h,1.29,1.30 help_mp-es.h,1.6,1.7 help_mp-fr.h,1.13,1.14 help_mp-hu.h,1.29,1.30 help_mp-it.h,1.4,1.5 help_mp-ko.h,1.3,1.4 help_mp-nl.h,1.10,1.11 help_mp-no.h,1.6,1.7 help_mp-pl.h,1.25,1.26 help_mp-pt_BR.h,1.1,1.2 help_mp-ru.h,1.10,1.11 help_mp-sk.h,1.2,1.3 mplayer.c,1.511,1.512 mplayer.h,1.7,1.8

Zoltan Ponekker pontscho at mplayerhq.hu
Mon Jun 3 17:06:34 CEST 2002 

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

Modified Files:
	help_mp-cz.h help_mp-de.h help_mp-dk.h help_mp-en.h 
	help_mp-es.h help_mp-fr.h help_mp-hu.h help_mp-it.h 
	help_mp-ko.h help_mp-nl.h help_mp-no.h help_mp-pl.h 
	help_mp-pt_BR.h help_mp-ru.h help_mp-sk.h mplayer.c mplayer.h 
Log Message:
add VCD support for GUI

Index: help_mp-cz.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-cz.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- help_mp-cz.h	1 Feb 2002 05:31:51 -0000	1.10
+++ help_mp-cz.h	3 Jun 2002 15:06:30 -0000	1.11
@@ -292,6 +292,7 @@
 #define MSGTR_MENU_DoubleSize "Dvojnásobná velikost"
 #define MSGTR_MENU_FullScreen "Celá obrazovka"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Pøehrát disk ..."
 #define MSGTR_MENU_ShowDVDMenu "Zobrazit DVD menu"
 #define MSGTR_MENU_Titles "Tituly"

Index: help_mp-de.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-de.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- help_mp-de.h	1 Jun 2002 09:54:53 -0000	1.27
+++ help_mp-de.h	3 Jun 2002 15:06:30 -0000	1.28
@@ -293,6 +293,7 @@
 #define MSGTR_MENU_DoubleSize "Doppelte Größe"
 #define MSGTR_MENU_FullScreen "Vollbild"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Spiele Disk ..."
 #define MSGTR_MENU_ShowDVDMenu "Zeige DVD Menü"
 #define MSGTR_MENU_Titles "Titel"

Index: help_mp-dk.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-dk.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- help_mp-dk.h	1 Feb 2002 05:31:51 -0000	1.6
+++ help_mp-dk.h	3 Jun 2002 15:06:30 -0000	1.7
@@ -290,6 +290,7 @@
 #define MSGTR_MENU_DoubleSize "Double størrelse"
 #define MSGTR_MENU_FullScreen "Fuld skærm"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Afspiller disk ..."
 #define MSGTR_MENU_ShowDVDMenu "Vis DVD menu"
 #define MSGTR_MENU_Titles "Titler"

Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- help_mp-en.h	24 May 2002 00:53:27 -0000	1.29
+++ help_mp-en.h	3 Jun 2002 15:06:30 -0000	1.30
@@ -294,6 +294,7 @@
 #define MSGTR_MENU_DoubleSize "Double size"
 #define MSGTR_MENU_FullScreen "Fullscreen"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Play disc ..."
 #define MSGTR_MENU_ShowDVDMenu "Show DVD menu"
 #define MSGTR_MENU_Titles "Titles"

Index: help_mp-es.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-es.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- help_mp-es.h	1 Feb 2002 05:31:51 -0000	1.6
+++ help_mp-es.h	3 Jun 2002 15:06:30 -0000	1.7
@@ -293,6 +293,7 @@
 #define MSGTR_MENU_DoubleSize "Tamaño doble"
 #define MSGTR_MENU_FullScreen "Fullscreen"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Reproducir disco ..."
 #define MSGTR_MENU_ShowDVDMenu "Mostrar menú DVD"
 #define MSGTR_MENU_Titles "Títulos"

Index: help_mp-fr.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-fr.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- help_mp-fr.h	29 May 2002 20:09:40 -0000	1.13
+++ help_mp-fr.h	3 Jun 2002 15:06:30 -0000	1.14
@@ -292,6 +292,7 @@
 #define MSGTR_MENU_DoubleSize "Taille double"
 #define MSGTR_MENU_FullScreen "Plein écran"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Lire un disque..."
 #define MSGTR_MENU_ShowDVDMenu "Afficher le menu DVD"
 #define MSGTR_MENU_Titles "Titres"

Index: help_mp-hu.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-hu.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- help_mp-hu.h	20 May 2002 05:10:17 -0000	1.29
+++ help_mp-hu.h	3 Jun 2002 15:06:30 -0000	1.30
@@ -288,6 +288,7 @@
 #define MSGTR_MENU_DoubleSize "Dupla méret"
 #define MSGTR_MENU_FullScreen "Teljesképernyõ" 
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Lemez lejátszása ..."
 #define MSGTR_MENU_ShowDVDMenu "DVD menû"
 #define MSGTR_MENU_Titles "Sávok"

Index: help_mp-it.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-it.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- help_mp-it.h	1 Feb 2002 05:31:51 -0000	1.4
+++ help_mp-it.h	3 Jun 2002 15:06:30 -0000	1.5
@@ -293,6 +293,7 @@
 #define MSGTR_MENU_DoubleSize "Dimensione doppia"
 #define MSGTR_MENU_FullScreen "Schermo intero"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Disco in riproduzione..."
 #define MSGTR_MENU_ShowDVDMenu "Mostra il menu del DVD"
 #define MSGTR_MENU_Titles "Titoli"

Index: help_mp-ko.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-ko.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- help_mp-ko.h	1 Feb 2002 05:31:51 -0000	1.3
+++ help_mp-ko.h	3 Jun 2002 15:06:30 -0000	1.4
@@ -293,6 +293,7 @@
 #define MSGTR_MENU_DoubleSize "µÎ¹è Å©±â"
 #define MSGTR_MENU_FullScreen "Àüü È­¸é"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "µð½ºÅ© Àç»ý ..."
 #define MSGTR_MENU_ShowDVDMenu "DVD ¸Þ´ºº¸±â"
 #define MSGTR_MENU_Titles "ŸÀÌƲ"

Index: help_mp-nl.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-nl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- help_mp-nl.h	1 Feb 2002 05:31:51 -0000	1.10
+++ help_mp-nl.h	3 Jun 2002 15:06:30 -0000	1.11
@@ -290,6 +290,7 @@
 #define MSGTR_MENU_DoubleSize "Dubbele grootte"
 #define MSGTR_MENU_FullScreen "Volledig scherm"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Speel disc ..."
 #define MSGTR_MENU_ShowDVDMenu "Toon DVD menu"
 #define MSGTR_MENU_Titles "Titels"

Index: help_mp-no.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-no.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- help_mp-no.h	1 Feb 2002 05:31:51 -0000	1.6
+++ help_mp-no.h	3 Jun 2002 15:06:30 -0000	1.7
@@ -293,6 +293,7 @@
 #define MSGTR_MENU_DoubleSize "Dobbel størrelse"
 #define MSGTR_MENU_FullScreen "Fullskjerm"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Spill Plate ..."
 #define MSGTR_MENU_ShowDVDMenu "Vis DVD meny"
 #define MSGTR_MENU_Titles "Titler"

Index: help_mp-pl.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-pl.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- help_mp-pl.h	25 May 2002 08:48:05 -0000	1.25
+++ help_mp-pl.h	3 Jun 2002 15:06:30 -0000	1.26
@@ -292,6 +292,7 @@
 #define MSGTR_MENU_DoubleSize "Podwójna wielko¶æ"
 #define MSGTR_MENU_FullScreen "Pe³en Ekran"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Odtwarzaj dysk ..."
 #define MSGTR_MENU_ShowDVDMenu "Poka¿ menu DVD"
 #define MSGTR_MENU_Titles "Tytu³y"

Index: help_mp-pt_BR.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-pt_BR.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- help_mp-pt_BR.h	26 May 2002 22:02:41 -0000	1.1
+++ help_mp-pt_BR.h	3 Jun 2002 15:06:30 -0000	1.2
@@ -298,6 +298,7 @@
 #define MSGTR_MENU_DoubleSize "Tamanho dobrado"
 #define MSGTR_MENU_FullScreen "Tela cheia"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Reproduzir disco ..."
 #define MSGTR_MENU_ShowDVDMenu "Mostrar menu do DVD"
 #define MSGTR_MENU_Titles "Títulos"

Index: help_mp-ru.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-ru.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- help_mp-ru.h	1 Feb 2002 05:31:51 -0000	1.10
+++ help_mp-ru.h	3 Jun 2002 15:06:30 -0000	1.11
@@ -290,6 +290,7 @@
 #define MSGTR_MENU_DoubleSize "ä×ÏÊÎÏÊ ÒÁÚÍÅÒ"
 #define MSGTR_MENU_FullScreen "ðÏÌÎÙÊ ÜËÒÁÎ"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "éÇÒÁÔØ ÄÉÓË ..."
 #define MSGTR_MENU_ShowDVDMenu "ðÏËÁÚÁÔØ DVD ÍÅÎÀ"
 #define MSGTR_MENU_Titles "ôÉÔÒÙ"

Index: help_mp-sk.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-sk.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- help_mp-sk.h	14 Mar 2002 19:16:48 -0000	1.2
+++ help_mp-sk.h	3 Jun 2002 15:06:30 -0000	1.3
@@ -290,6 +290,7 @@
 #define MSGTR_MENU_DoubleSize "Dvojnásobná veµkos»"
 #define MSGTR_MENU_FullScreen "Celá obrazovka"
 #define MSGTR_MENU_DVD "DVD"
+#define MSGTR_MENU_VCD "VCD"
 #define MSGTR_MENU_PlayDisc "Prehra» disk ..."
 #define MSGTR_MENU_ShowDVDMenu "Zobrazi» DVD menu"
 #define MSGTR_MENU_Titles "Tituly"

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- mplayer.c	28 May 2002 11:55:00 -0000	1.511
+++ mplayer.c	3 Jun 2002 15:06:30 -0000	1.512
@@ -206,7 +206,7 @@
 char* audio_lang=NULL;
 char* dvdsub_lang=NULL;
 static char* spudec_ifo=NULL;
-static int vcd_track=0;
+int vcd_track=0;
 
 // cache2:
 static int stream_cache_size=0;
@@ -813,12 +813,17 @@
 #endif
        } 
 
-#ifdef USE_DVDREAD 
-     if ( guiIntfStruct.DVDChanged )
+#if defined( HAVE_VCD ) && defined( USE_DVDREAD )
+     if ( guiIntfStruct.DiskChanged )
       {
-       guiIntfStruct.DVDChanged=0;
+#ifdef USE_DVDREAD 
+       switch ( guiIntfStruct.StreamType )
+        {
+         case STREAMTYPE_DVD: filename=DEFAULT_DVD_DEVICE; break;
+	}
+#endif
+       guiIntfStruct.DiskChanged=0;
        guiGetEvent( guiCEvent,(char *)guiSetPlay );
-       filename=DEFAULT_DVD_DEVICE;
       }
 #endif
 
@@ -1383,12 +1388,9 @@
    if ( use_gui )
     {
      guiGetEvent( guiSetFileName,filename );
-     guiIntfStruct.StreamType=stream->type;
+     guiGetEvent( guiSetStream,(char *)stream );
      if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
      if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,1 ); else guiGetEvent( guiSetAudioOnly,0 );
-#ifdef USE_DVDREAD
-     if ( stream->type == STREAMTYPE_DVD ) guiGetEvent( guiSetDVD,(char *)stream->priv );
-#endif
     }
 #endif
 
@@ -2881,8 +2883,8 @@
 #endif
 	 } 
 	guiIntfStruct.Volume=(float)mixer_getbothvolume();
+        if ( guiIntfStruct.DiskChanged ) goto goto_next_file;
 #ifdef USE_DVDREAD
-        if ( guiIntfStruct.DVDChanged ) goto goto_next_file;
         if ( stream->type == STREAMTYPE_DVD )
 	 {
 	  dvd_priv_t * dvdp = stream->priv;
@@ -3061,7 +3063,7 @@
  if( use_gui && !playtree_iter ) 
   {
 #ifdef USE_DVDREAD
-   if ( !guiIntfStruct.DVDChanged ) 
+   if ( !guiIntfStruct.DiskChanged ) 
 #endif
    mplStop();
   }	

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer.h	1 May 2002 09:28:40 -0000	1.7
+++ mplayer.h	3 Jun 2002 15:06:31 -0000	1.8
@@ -5,6 +5,7 @@
 extern int use_gui;
 extern char* current_module;
 extern int fullscreen;
+extern int vcd_track;
 
 extern void exit_player(char* how);

More information about the MPlayer-cvslog mailing list