mplayer.hg: Gui/interface.c comparison

comparison Gui/interface.c @ 7009:98bed9e12087

- add dxr3 gui support (dialogbox, etc.) - fix one small dvd playing bug ( dvd playing don't del the playlist) - add some ifdef() check

author	pontscho
date	Wed, 14 Aug 2002 23:02:45 +0000
parents	163f78ece9c2
children	e37a67d5e117

comparison

equal deleted inserted replaced

-:2af81c9ed167
+:98bed9e12087
 wsXInit( (void *)mDisplay );
 cfg_read();
 appInit( (void*)mDisplay );
-if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
+if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );
 if ( sub_delay != 0.0f ) gtkSubDelay=sub_delay;
 if ( sub_name ) guiSetFilename( guiIntfStruct.Subtitlename,sub_name );
 #if defined( USE_OSD ) || defined( USE_SUB )
 guiLoadFont();
 #endif
 }
 }
 }
 #endif
-void guiGetEvent( int type,char * arg )
+static void add_vop( char * str )
+{
+mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str );
+if ( vo_plugin_args )
+{
+int i = 0;
+while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { i=-1; break; }
+if ( i != -1 )
+{ vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( str ); vo_plugin_args[i+1]=NULL; }
+} else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( str ); vo_plugin_args[1]=NULL; }
+}
+static void remove_vop( char * str )
+{
+int n = 0;
+if ( !vo_plugin_args ) return;
+mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str );
+while ( vo_plugin_args[n++] ); n--;
+if ( n > -1 )
+{
+int i = 0,m = -1;
+while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],str ) ) { m=i - 1; break; }
+i--;
+if ( m > -1 )
+{
+if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; }
+else memcpy( &vo_plugin_args[i],&vo_plugin_args[i + 1],( n - i ) * sizeof( char * ) );
+}
+}
+}
+int guiGetEvent( int type,char * arg )
 {
 stream_t * stream = (stream_t *) arg;
 #ifdef USE_DVDREAD
 dvd_priv_t * dvdp = (dvd_priv_t *) arg;
 #endif
 case guiSetFileName:
 if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg );
 break;
 case guiSetAudioOnly:
 	guiIntfStruct.AudioOnly=(int)arg;
-	if ( (int)arg ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+	if ( (int)arg ) { guiIntfStruct.NoWindow=True; wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); }
 	  else wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
 	break;
 case guiReDrawSubWindow:
 	wsPostRedisplay( &appMPlayer.subWindow );
 	break;
 	   else guiIntfStruct.Balance=50.0f;
 	 btnModify( evSetVolume,guiIntfStruct.Volume );
 	 btnModify( evSetBalance,guiIntfStruct.Balance );
 	}
 	break;
+case guiSetFileFormat:
+guiIntfStruct.FileFormat=(int)arg;
+	break;
 case guiSetValues:
 // -- video
 	if ( arg )
 	 {
 	  if ( vo_gamma_brightness == 1000 )
 	  if ( vo_gamma_hue == 1000 )
 	   { vo_gamma_hue=0; get_video_colors( (void *)arg,"hue",&vo_gamma_hue ); }
 	  if ( vo_gamma_saturation  == 1000 )
 	   { vo_gamma_saturation=0; get_video_colors( (void *)arg,"saturation",&vo_gamma_saturation ); }
 	 }
+	if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
 // -- audio
 if ( audio_out )
 	{
 	 float l,r;
 	 mixer_getvolume( &l,&r );
 gtkSubFPS=sub_fps;
 gtkSubPos=sub_pos;
 #ifdef USE_OSD
 	gtkSubFFactor=font_factor;
 #endif
+#ifdef HAVE_DXR3
+	if ( !gstrcmp( gtkVODriver,"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS && !gtkVopLAVC && !gtkVopFAME )
+	 {
+	  gtkMessageBox( GTK_MB_FATAL,MSGTR_NEEDLAVCFAME );
+	  guiIntfStruct.Playing=0;
+	  return True;
+	 }
+#endif
 	break;
 case guiSetDefaults:
 	if ( filename && !guiIntfStruct.Filename )
 	 {
 	  gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE;
 	  guiSetFilename( guiIntfStruct.Filename,filename );
 	 }
 guiIntfStruct.DiskChanged=0;
 // --- video opts
 if ( !gtkVODriver )
 	{
 int i = 0;
 	 if ( video_driver && !gtkVODriver )
 	  {
 	     }
 	 }
 	if ( gtkVODriver ) { gfree( (void **)&video_driver ); video_driver=gstrdup( gtkVODriver ); }
 	  else { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); }
-	if ( gtkVPP )
+	{
-	 {
+	 int i = 0;
-	  if ( vo_plugin_args )
+guiIntfStruct.NoWindow=False;
+while ( video_out_drivers[i++] )
+	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
 	   {
-	    int i = 0;
+	    const vo_info_t *info = video_out_drivers[i - 1]->get_info();
-	    while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],"pp" ) ) { i=-1; break; }
+	    if  ( ( !gstrcmp( gtkVODriver,(char *)info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) )
-	    if ( i != -1 )
+	      { guiIntfStruct.NoWindow=True; break; }
-	     { vo_plugin_args=realloc( vo_plugin_args,( i + 2 ) * sizeof( char * ) ); vo_plugin_args[i]=strdup( "pp" ); vo_plugin_args[i+1]=NULL; }
+	   }
-	   } else { vo_plugin_args=malloc( 2 * sizeof( char * ) ); vo_plugin_args[0]=strdup( "pp" ); vo_plugin_args[1]=NULL; }
+	}
-	  auto_quality=gtkVAutoq;
-	 }
+#ifdef HAVE_DXR3
-	 else
+	remove_vop( "lavc" );
-	  if ( vo_plugin_args )
+	remove_vop( "fame" );
+	if ( !gstrcmp( gtkVODriver,"dxr3" ) )
+	 {
+	  #warning workaround for this moment.
+	  osd_level=0;
+	  // ---
+	  if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
 	   {
-	    int n = 0;
+	    if ( gtkVopLAVC ) add_vop( "lavc" );
-	    while ( vo_plugin_args[n++] ); n--;
+	    if ( gtkVopFAME ) add_vop( "fame" );
-	    if ( n > -1 )
-	     {
-	      int i = 0;
-	      while ( vo_plugin_args[i] ) if ( !gstrcmp( vo_plugin_args[i++],"pp" ) ) break; i--;
-	      if ( n == i )
-	       {
-	        if ( n == 1 ) { free( vo_plugin_args[0] ); free( vo_plugin_args ); vo_plugin_args=NULL; }
-	         else memcpy( &vo_plugin_args[i],&vo_plugin_args[i+1],( n - i ) * sizeof( char * ) );
-	       }
-	     }
-	    auto_quality=0;
 	   }
+	 }
+#endif
+// ---
+	if ( gtkVopPP ) { add_vop( "pp" ); auto_quality=gtkVAutoq; }
+	 else { remove_vop( "pp" ); auto_quality=0; }
 vo_doublebuffering=gtkVODoubleBuffer;
 vo_directrendering=gtkVODirectRendering;
 	frame_dropping=gtkVFrameDrop;
 	if ( gtkVHardFrameDrop ) frame_dropping=gtkVHardFrameDrop;
 	flip=gtkVFlip;
 	  else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL;
 	index_mode=gtkVIndex;
 	break;
 }
+return False;
 }
 extern unsigned int GetTimerMS( void );
 extern int mplTimer;
 void guiEventHandling( void )
 {
-if ( !guiIntfStruct.Playing || guiIntfStruct.AudioOnly ) wsHandleEvents();
+if ( !guiIntfStruct.Playing || guiIntfStruct.NoWindow ) wsHandleEvents();
 gtkEventHandling();
 mplTimer=GetTimerMS() / 20;
 }
 // ---
 	guiLoadFont();
 	return NULL;
 #endif
 // --- misc
 case gtkClearStruct:
-if ( (unsigned int)fparam & guiFilenames )
+if ( (unsigned int)vparam & guiFilenames )
 	 {
 	  gfree( (void **)&guiIntfStruct.Filename );
 	  gfree( (void **)&guiIntfStruct.Subtitlename );
 	  gfree( (void **)&guiIntfStruct.AudioFile );
+	  gtkSet( gtkDelPl,0,NULL );
 	 }
 #ifdef USE_DVDREAD
-	if ( (unsigned int)fparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
+	if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
 #endif
 #ifdef HAVE_VCD
-	if ( (unsigned int)fparam & guiVCD ) guiIntfStruct.VCDTracks=0;
+	if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
 #endif
 	return NULL;
 case gtkSetExtraStereo:
 gtkAOExtraStereoMul=fparam;
 	audio_plugin_extrastereo.control( AOCONTROL_PLUGIN_ES_SET,(int)&gtkAOExtraStereoMul );

Mercurial > mplayer.hg

comparison Gui/interface.c @ 7009:98bed9e12087