mplayer.hg: Gui/mplayer/mw.h comparison

comparison Gui/mplayer/mw.h @ 6794:77980ab4e296

- add preferences support (first try) - fix some playlist bug - fix some equ bug - fix some redraw bug - fix dvd playing - fix file open dialog box - etc.

author	pontscho
date	Thu, 25 Jul 2002 20:26:38 +0000
parents	a31b9f15cbff
children	c2d4100c964e

comparison

equal deleted inserted replaced

-:48d432a8d531
+:77980ab4e296
 //      !appMPlayer.mainWindow.Mapped ) return;
 btnModify( evSetMoviePosition,guiIntfStruct.Position );
 btnModify( evSetVolume,guiIntfStruct.Volume );
-if ( mplMainRender )
+if ( mplMainRender && appMPlayer.mainWindow.State == wsWindowExpose )
 {
 memcpy( mplDrawBuffer,appMPlayer.main.Bitmap.Image,appMPlayer.main.Bitmap.ImageSize );
 for( i=0;i < appMPlayer.NumberOfItems + 1;i++ )
 {
 item=&appMPlayer.Items[i];
 case evExit:
 exit_player( "Exit" );
 break;
 case evPlayNetwork:
+if ( guiIntfStruct.Subtitlename ) { free( guiIntfStruct.Subtitlename ); guiIntfStruct.Subtitlename=NULL; }
+	if ( guiIntfStruct.AudioFile ) { free( guiIntfStruct.AudioFile ); guiIntfStruct.AudioFile=NULL; }
 	guiIntfStruct.StreamType=STREAMTYPE_STREAM;
 goto play;
 case evSetURL:
 gtkShow( evPlayNetwork,NULL );
 	break;
 #ifdef HAVE_VCD
 case evSetVCDTrack:
 guiIntfStruct.Track=(int)param;
 case evPlayVCD:
+	gtkSet( gtkClearStruct,guiALL,NULL );
 	guiIntfStruct.StreamType=STREAMTYPE_VCD;
 	goto play;
 #endif
 #ifdef USE_DVDREAD
 case evPlayDVD:
 guiIntfStruct.DVD.current_title=1;
 guiIntfStruct.DVD.current_chapter=1;
 guiIntfStruct.DVD.current_angle=1;
 play_dvd_2:
+	gtkSet( gtkClearStruct,guiALL - guiDVD,NULL );
 guiIntfStruct.StreamType=STREAMTYPE_DVD;
 #endif
 case evPlay:
 case evPlaySwitchToPause:
 play:
 mplMainAutoPlay=0;
-if ( ( msg == evPlaySwitchToPause )&&( guiIntfStruct.Playing == 1 ) ) goto NoPause;
+if ( ( msg == evPlaySwitchToPause )&&( guiIntfStruct.Playing == 2 ) ) goto NoPause;
 	vcd_track=0;
 	dvd_title=0;
 	if ( gtkSet( gtkGetCurrPlItem,0,NULL ) )
 	  plItem * next = gtkSet( gtkGetCurrPlItem,0,NULL );
 	  plLastPlayed=next;
 	  guiSetDF( guiIntfStruct.Filename,next->path,next->name );
 	  guiIntfStruct.StreamType=STREAMTYPE_FILE;
 	  guiIntfStruct.FilenameChanged=1;
-	  if ( guiIntfStruct.AudioFile ) free( guiIntfStruct.AudioFile );
+	  gfree( (void **)&guiIntfStruct.AudioFile );
-	  guiIntfStruct.AudioFile=NULL;
+	  gfree( (void **)&guiIntfStruct.Subtitlename );
 	 }
 switch ( guiIntfStruct.StreamType )
 {
 	  case STREAMTYPE_STREAM:
 	  case STREAMTYPE_FILE:
-	       guiGetEvent( guiClearStruct,(char *)guiALL );
+	       gtkSet( gtkClearStruct,guiALL - guiFilenames,NULL );
 	       break;
 #ifdef HAVE_VCD
 case STREAMTYPE_VCD:
-	       guiGetEvent( guiClearStruct,(char *)(guiALL - guiVCD ) );
+	       gtkSet( gtkClearStruct,guiALL - guiVCD - guiFilenames,NULL );
 	       if ( !cdrom_device )
 	        {
 		 cdrom_device=DEFAULT_CDROM_DEVICE;
 		 guiSetFilename( guiIntfStruct.Filename,cdrom_device );
 		}
 		}
 	       break;
 #endif
 #ifdef USE_DVDREAD
 case STREAMTYPE_DVD:
-	       guiGetEvent( guiClearStruct,(char *)(guiALL - guiDVD ) );
+	       gtkSet( gtkClearStruct,guiALL - guiDVD - guiFilenames,NULL );
 	       if ( !dvd_device )
 	        {
 	         dvd_device=DEFAULT_DVD_DEVICE;
-guiSetFilename( guiIntfStruct.Filename,dvd_device );
+guiSetFilename( guiIntfStruct.Filename,dvd_device )
 		}
 	       if ( guiIntfStruct.Playing != 2 )
 	        {
 	         dvd_title=guiIntfStruct.DVD.current_title;
 	         dvd_angle=guiIntfStruct.DVD.current_angle;
 		}
 break;
 #endif
 }
 mplPlay();
-mplMainRender=1;
 break;
 #ifdef USE_DVDREAD
 case evSetDVDSubtitle:
 dvdsub_id=(int)param;
 goto play_dvd_2;
 case evPause:
 case evPauseSwitchToPlay:
 NoPause:
 mplPause();
-mplMainRender=1;
+break;
-break;
+case evStop: guiIntfStruct.Playing=guiSetStop; break;
-case evStop:
-mplStop();
-mplMainRender=1;
-break;
 case evLoadPlay:
 mplMainAutoPlay=1;
 //	guiIntfStruct.StreamType=STREAMTYPE_FILE;
 case evLoad:
-mplMainRender=1;
 	gtkSet( gtkDelPl,0,NULL );
 gtkShow( evLoad,NULL );
 break;
-case evLoadSubtitle:
+case evLoadSubtitle:  gtkShow( evLoadSubtitle,NULL );  break;
-mplMainRender=1;
+case evLoadAudioFile: gtkShow( evLoadAudioFile,NULL ); break;
-gtkShow( evLoadSubtitle,NULL );
+case evPrev: mplPrev(); break;
-break;
+case evNext: mplNext(); break;
-case evLoadAudioFile:
-	gtkShow( evLoadAudioFile,NULL );
-	break;
-case evPrev:
-	mplPrev();
-mplMainRender=1;
-break;
-case evNext:
-	mplNext();
-mplMainRender=1;
-break;
 case evPlayList:    gtkShow( evPlayList,NULL );        break;
 case evSkinBrowser: gtkShow( evSkinBrowser,skinName ); break;
 case evAbout:       gtkShow( evAbout,NULL );           break;
 case evPreferences: gtkShow( evPreferences,NULL );     break;
 appMPlayer.Items[j].tmp=!appMPlayer.Items[j].tmp;
 appMPlayer.Items[j].pressed=appMPlayer.Items[j].tmp;
 }
 }
 mplFullScreen();
-mplMainRender=1;
 break;
 // --- timer events
 case evRedraw:
 mplMainRender=1;
 case wsPLMouseButton:
 	  gtkShow( evHidePopUpMenu,NULL );
 sx=X; sy=Y; boxMoved=1; itemtype=itPLMButton; // if move the main window
 SelectedItem=currentselected;
 if ( SelectedItem == -1 ) break; // yeees, i'm move the fucking window
-boxMoved=0; mplMainRender=1; // No, not move the window, i'm pressed one button
+boxMoved=0; //mplMainRender=1; // No, not move the window, i'm pressed one button
 item=&appMPlayer.Items[SelectedItem];
 itemtype=item->type;
 item->pressed=btnPressed;
 switch( item->type )
 {
 		 mplEventHandling( item->msg,item->value );
 value=item->value;
 break;
 }
 mplEventHandling( item->msg,value );
-mplMainRender=1;
+//          mplMainRender=1;
 itemtype=0;
 break;
 case wsPRMouseButton:
 gtkShow( evShowPopUpMenu,NULL );
 if ( ( item->type == itHPotmeter )||( item->type == itVPotmeter )||( item->type == itPotmeter ) )
 {
 item->value+=value;
 btnModify( item->msg,item->value );
 mplEventHandling( item->msg,item->value );
-mplMainRender=1;
 }
 break;
 // --- moving
 case wsMoveMouse:

Mercurial > mplayer.hg

comparison Gui/mplayer/mw.h @ 6794:77980ab4e296