comparison Gui/mplayer/gtk/opts.c @ 12924:65f49a82ac94

100l, fixes DXR3 compile problems caused by my last patch.
author reimar
date Sat, 31 Jul 2004 18:04:42 +0000
parents eb0d3c1b6c6d
children 914749a92b28
comparison
equal deleted inserted replaced
12923:51276a7f4ea1 12924:65f49a82ac94
150 static int old_audio_driver = 0; 150 static int old_audio_driver = 0;
151 static char * ao_driver[3]; 151 static char * ao_driver[3];
152 static char * vo_driver[3]; 152 static char * vo_driver[3];
153 static int old_video_driver = 0; 153 static int old_video_driver = 0;
154 154
155 #ifdef HAVE_DXR3
156 void ShowDXR3Config( void );
157 void HideDXR3Config( void );
158 #endif
155 void ShowAudioConfig(); 159 void ShowAudioConfig();
156 void HideAudioConfig(); 160 void HideAudioConfig();
157 161
158 static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ); 162 static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer user_data );
159 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ); 163 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data );
1682 gtkAddIcon( DXR3Config ); 1686 gtkAddIcon( DXR3Config );
1683 1687
1684 vbox1=AddVBox( AddDialogFrame( DXR3Config ),0 ); 1688 vbox1=AddVBox( AddDialogFrame( DXR3Config ),0 );
1685 vbox2=AddVBox( vbox1,0 ); 1689 vbox2=AddVBox( vbox1,0 );
1686 hbox1=AddHBox( vbox2,1 ); 1690 hbox1=AddHBox( vbox2,1 );
1687 AddLabel( MSGTR_PREFERENCES_OSS_Device,hbox1 ); 1691 AddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 );
1688 1692
1689 CBDevice=AddComboBox( hbox1 ); 1693 CBDevice=AddComboBox( hbox1 );
1690 1694
1691 CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300" ); 1695 CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300" );
1692 CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300-0" ); 1696 CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300-0" );