Mercurial > mplayer.hg

comparison Gui/interface.c @ 12918:eb0d3c1b6c6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unified audio options dialog, fixes also bug #40
author reimar
date Fri, 30 Jul 2004 15:58:36 +0000
parents 0230544f52a1
children 00bb3326391c
comparison
equal deleted inserted replaced
12917:94cab66a5d07 12918:eb0d3c1b6c6d
171 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) ); 171 memset( &guiIntfStruct,0,sizeof( guiIntfStruct ) );
172 guiIntfStruct.Balance=50.0f; 172 guiIntfStruct.Balance=50.0f;
173 guiIntfStruct.StreamType=-1; 173 guiIntfStruct.StreamType=-1;
174 174
175 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) ); 175 memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
176 #ifdef USE_OSS_AUDIO
177 if ( !gtkAOOSSMixer ) gtkAOOSSMixer=strdup( PATH_DEV_MIXER );
178 if ( !gtkAOOSSDevice ) gtkAOOSSDevice=strdup( PATH_DEV_DSP );
179 #endif
180 #ifdef HAVE_DXR3 176 #ifdef HAVE_DXR3
181 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); 177 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
182 #endif 178 #endif
183 if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; } 179 if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
184 if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; } 180 if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
795 { 791 {
796 gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); 792 gset( &ao_plugin_cfg.plugin_list,"extrastereo" );
797 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; 793 ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul;
798 } 794 }
799 #ifdef USE_OSS_AUDIO 795 #ifdef USE_OSS_AUDIO
800 mixer_device=gstrdup( gtkAOOSSMixer ); 796 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) )
801 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) && gtkAOOSSDevice ) 797 {
802 { 798 char *tmp;
803 char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 ); 799 mixer_device = gtkAOOSSMixer;
800 mixer_channel = gtkAOOSSMixerChannel;
801 if (gtkAOOSSDevice) {
802 tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 );
804 sprintf( tmp,"oss:%s",gtkAOOSSDevice ); 803 sprintf( tmp,"oss:%s",gtkAOOSSDevice );
804 } else
805 tmp = "oss";
805 gaddlist( &audio_driver_list,tmp ); 806 gaddlist( &audio_driver_list,tmp );
806 } 807 }
807 #endif 808 #endif
809 #if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
810 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) )
811 {
812 char *tmp;
813 mixer_device = gtkAOALSAMixer;
814 mixer_channel = gtkAOALSAMixerChannel;
815 if (gtkAOALSADevice) {
816 tmp = calloc( 1,strlen( gtkAOALSADevice ) + 14 );
817 sprintf( tmp,"alsa:device=%s",gtkAOALSADevice );
818 } else
819 tmp = "alsa";
820 gaddlist( &audio_driver_list,tmp );
821 }
822 #endif
808 #ifdef HAVE_SDL 823 #ifdef HAVE_SDL
809 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) && gtkAOSDLDriver ) 824 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
810 { 825 {
811 char * tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 ); 826 char *tmp;
827 if (gtkAOSDLDriver) {
828 tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 );
812 sprintf( tmp,"sdl:%s",gtkAOSDLDriver ); 829 sprintf( tmp,"sdl:%s",gtkAOSDLDriver );
830 } else
831 tmp = "sdl";
813 gaddlist( &audio_driver_list,tmp ); 832 gaddlist( &audio_driver_list,tmp );
814 } 833 }
815 #endif 834 #endif
816 // -- subtitle 835 // -- subtitle
817 #ifdef USE_SUB 836 #ifdef USE_SUB