Mercurial > mplayer.hg

comparison Gui/interface.c @ 14627:cd16b26cf6e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Yet another memleak...
author reimar
date Mon, 31 Jan 2005 18:16:39 +0000
parents db75b76c11b2
children e2b2ab284a9a
comparison
equal deleted inserted replaced
14626:13ffc5167c2d 14627:cd16b26cf6e0
840 mixer_channel = gtkAOOSSMixerChannel; 840 mixer_channel = gtkAOOSSMixerChannel;
841 if (gtkAOOSSDevice) { 841 if (gtkAOOSSDevice) {
842 tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 ); 842 tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 );
843 sprintf( tmp,"oss:%s",gtkAOOSSDevice ); 843 sprintf( tmp,"oss:%s",gtkAOOSSDevice );
844 } else 844 } else
845 tmp = "oss"; 845 tmp = strdup("oss");
846 gaddlist( &audio_driver_list,tmp ); 846 gaddlist( &audio_driver_list,tmp );
847 free(tmp);
847 } 848 }
848 #endif 849 #endif
849 #if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) 850 #if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
850 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) ) 851 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) )
851 { 852 {
854 mixer_channel = gtkAOALSAMixerChannel; 855 mixer_channel = gtkAOALSAMixerChannel;
855 if (gtkAOALSADevice) { 856 if (gtkAOALSADevice) {
856 tmp = calloc( 1,strlen( gtkAOALSADevice ) + 14 ); 857 tmp = calloc( 1,strlen( gtkAOALSADevice ) + 14 );
857 sprintf( tmp,"alsa:device=%s",gtkAOALSADevice ); 858 sprintf( tmp,"alsa:device=%s",gtkAOALSADevice );
858 } else 859 } else
859 tmp = "alsa"; 860 tmp = strdup("alsa");
860 gaddlist( &audio_driver_list,tmp ); 861 gaddlist( &audio_driver_list,tmp );
862 free(tmp);
861 } 863 }
862 #endif 864 #endif
863 #ifdef HAVE_SDL 865 #ifdef HAVE_SDL
864 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) ) 866 if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
865 { 867 {
866 char *tmp; 868 char *tmp;
867 if (gtkAOSDLDriver) { 869 if (gtkAOSDLDriver) {
868 tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 ); 870 tmp = calloc( 1,strlen( gtkAOSDLDriver ) + 10 );
869 sprintf( tmp,"sdl:%s",gtkAOSDLDriver ); 871 sprintf( tmp,"sdl:%s",gtkAOSDLDriver );
870 } else 872 } else
871 tmp = "sdl"; 873 tmp = strdup("sdl");
872 gaddlist( &audio_driver_list,tmp ); 874 gaddlist( &audio_driver_list,tmp );
875 free(tmp);
873 } 876 }
874 #endif 877 #endif
875 // -- subtitle 878 // -- subtitle
876 #ifdef USE_SUB 879 #ifdef USE_SUB
877 //subdata->filename=gstrdup( guiIntfStruct.Subtitlename ); 880 //subdata->filename=gstrdup( guiIntfStruct.Subtitlename );