Mercurial > mplayer.hg

comparison Gui/interface.c @ 6857:397e7a1860f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upsz 2
author pontscho
date Wed, 31 Jul 2002 13:26:46 +0000
parents e330b1b0b835
children e1c5f3128b3a
comparison
equal deleted inserted replaced
6856:23221df30608 6857:397e7a1860f9
82 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) ); 82 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
83 gtkAOOSSMixer=strdup( PATH_DEV_MIXER ); 83 gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
84 gtkAOOSSDevice=strdup( PATH_DEV_DSP ); 84 gtkAOOSSDevice=strdup( PATH_DEV_DSP );
85 cfg_read(); 85 cfg_read();
86 appInit( (void*)mDisplay ); 86 appInit( (void*)mDisplay );
87 if ( plCurrent ) mplSetFileName( plCurrent->path,plCurrent->name ); 87 if ( plCurrent && !filename ) mplSetFileName( plCurrent->path,plCurrent->name );
88 #if defined( USE_OSD ) || defined( USE_SUB ) 88 #if defined( USE_OSD ) || defined( USE_SUB )
89 guiLoadFont(); 89 guiLoadFont();
90 #endif 90 #endif
91 } 91 }
92 92
313 #ifdef USE_OSD 313 #ifdef USE_OSD
314 gtkSubFFactor=font_factor; 314 gtkSubFFactor=font_factor;
315 #endif 315 #endif
316 break; 316 break;
317 case guiSetDefaults: 317 case guiSetDefaults:
318 if ( filename && gstrcmp( filename,guiIntfStruct.Filename ) ) 318 if ( filename && !guiIntfStruct.Filename )
319 { 319 {
320 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE; 320 gtkSet( gtkDelPl,0,NULL ); guiIntfStruct.StreamType=STREAMTYPE_FILE;
321 guiSetFilename( guiIntfStruct.Filename,filename ); 321 guiSetFilename( guiIntfStruct.Filename,filename );
322 } 322 }
323 323