[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.36,1.37 play.h,1.14,1.15 psignal.c,1.20,1.21 widgets.h,1.10,1.11

[Zoltan Ponekker]

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

Modified Files:
	mw.h play.h psignal.c widgets.h 
Log Message:
Add subtitle loader for gui

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mw.h	22 Nov 2001 18:52:25 -0000	1.36
+++ mw.h	15 Dec 2001 15:36:06 -0000	1.37
@@ -264,6 +264,10 @@
         mplMainRender=1;
         gtkSendMessage( evLoad );
         break;
+   case evLoadSubtitle:
+        mplMainRender=1;
+        gtkSendMessage( evLoadSubtitle );
+        break;
    case evPrev:
         IZE("evPrev");
         mplMainRender=1;
@@ -560,6 +564,8 @@
    case wsF:         msg=evFullScreen; break;
    case wsl:
    case wsL:         msg=evLoad; break;
+   case wsu:
+   case wsU:         msg=evLoadSubtitle; break;
    case wsm:
    case wsM:         msg=evMute; break;
    case wss:

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- play.h	21 Nov 2001 17:43:56 -0000	1.14
+++ play.h	15 Dec 2001 15:36:06 -0000	1.15
@@ -77,6 +77,9 @@
    char   Filename[4096];
    int    FilenameChanged;
    
+   char   Subtitlename[4096];
+   int    SubtitleChanged;
+   
    int    SkinChange;
 } mplCommStruct;
 

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- psignal.c	21 Nov 2001 17:43:56 -0000	1.20
+++ psignal.c	15 Dec 2001 15:36:06 -0000	1.21
@@ -7,6 +7,7 @@
 
 #include "widgets.h"
 #include "play.h"
+#include "gtk/fs.h"
 
 #include "../app.h"
 
@@ -83,16 +84,26 @@
         gtkShow( evPlayList );
         break;
    case evLoad:
+        ShowFileSelect( fsVideoSelector );
+#if 0   
         if ( gtkVisibleFileSelect ) gtk_widget_hide( FileSelect );
         gtk_widget_show( FileSelect );
         gtkVisibleFileSelect=1;
         gtkShow( evPlay );
+#endif
         break;
    case evFirstLoad:
+        ShowFileSelect( fsVideoSelector );
+#if 0
         if ( gtkVisibleFileSelect ) gtk_widget_hide( FileSelect );
         gtk_widget_show( FileSelect );
         gtkVisibleFileSelect=1;
         gtkShow( evFirstLoad );
+#endif	
+        break;
+   case evLoadSubtitle:
+        ShowFileSelect( fsSubtitleSelector );
+//	gtkShow( evPlay );
         break;
    case evMessageBox:
         gtk_label_set_text( gtkMessageBoxText,(char *)gtkShMem->mb.str );
@@ -188,6 +199,11 @@
 	mplShMem->FilenameChanged=1;
 	mplShMem->StreamType=STREAMTYPE_FILE;
         if ( mplMainAutoPlay ) mplGeneralTimer=1;
+        break;
+   case evSubtitleLoaded:
+        printf("*** gtkShMem->fs.subtitlename == '%s'  \n",gtkShMem->fs.subtitlename );
+        strcpy( mplShMem->Subtitlename,gtkShMem->fs.subtitlename ); 
+	mplShMem->SubtitleChanged=1;
         break;
    case evShowPopUpMenu:
         fprintf( stderr,"[psignal] PopUpMenu: %d param: %d\n",gtkShMem->popupmenu,gtkShMem->popupmenuparam );

Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- widgets.h	21 Nov 2001 17:43:56 -0000	1.10
+++ widgets.h	15 Dec 2001 15:36:06 -0000	1.11
@@ -19,6 +19,8 @@
 {
  char dir[ 2048 ];
  char filename[ 2048 ];
+ char subtitlename[ 4096 ];
+ char otherfilename[ 4096 ];
 } gtkFileSelectorStruct;
 
 typedef struct