[Mplayer-cvslog] CVS: main/Gui interface.c,1.64,1.65

[Zoltan Ponekker]

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

Modified Files:
	interface.c 
Log Message:


- fix (?) "mixer bug"
- fix audio_id/video_id changing
- fix some other bug



Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- interface.c	11 Dec 2002 01:21:08 -0000	1.64
+++ interface.c	16 Dec 2002 22:24:56 -0000	1.65
@@ -691,7 +691,7 @@
 	  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 @@
 
 // --- 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;