diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-16 22:25:17 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-16 22:25:17 +0000 |
commit | fcea588a18214b13cf3635a50e295ba389dded31 (patch) | |
tree | 3cba07250cf1bb876d8161fd11d756dc2f805068 /Gui/interface.c | |
parent | 0e14c382cf0e41bf29de1b5a973c56b9754782b8 (diff) | |
download | mpv-fcea588a18214b13cf3635a50e295ba389dded31.tar.bz2 mpv-fcea588a18214b13cf3635a50e295ba389dded31.tar.xz |
- fix (?) "mixer bug"
- fix audio_id/video_id changing
- fix some other bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8485 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r-- | Gui/interface.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index b06f94faa8..c7266f0c39 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -691,7 +691,7 @@ int guiGetEvent( int type,char * arg ) gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; } - mixer_device=gtkAOOSSMixer; + mixer_device=gstrdup( gtkAOOSSMixer ); if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) && gtkAOOSSDevice ) { char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 ); @@ -713,13 +713,11 @@ int guiGetEvent( int type,char * arg ) // --- misc if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; - else stream_cache_size=-1; - if ( gtkAutoSyncOn ) autosync=gtkAutoSync; - else autosync=0; - if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile; - else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL; + if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile ); + else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream ); + //audio_stream=NULL; guiIntfStruct.DiskChanged=0; guiIntfStruct.FilenameChanged=0; |