mplayer.hg: gui/ui/gtk/preferences.c comparison

comparison gui/ui/gtk/preferences.c @ 34684:b03481253518

Cosmetic: Prefer C style for single line comments. Additionally, slightly revise some of these comments.

author	ib
date	Fri, 24 Feb 2012 17:16:54 +0000
parents	4ff933a89818
children	311b47301ea7

comparison

equal deleted inserted replaced

-:621058eff80f
+:b03481253518
 #include "gui/util/string.h"
 #include "preferences.h"
 #include "fileselect.h"
 #include "tools.h"
-// for mpcodecs_[av]d_drivers:
+/* for mpcodecs_[av]d_drivers: */
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/ad.h"
 GtkWidget * Preferences = NULL;
 static GtkWidget * AConfig;
 void ShowPreferences( void )
 {
 if ( Preferences ) gtkActive( Preferences );
 else Preferences=create_Preferences();
-// -- 1. page
+/* 1st page */
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer );
 #if 0
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround );
 #endif
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBExtraStereo ),gtkAOExtraStereo );
 !strncmp( ao_driver[0],"sdl",3 ) )
 gtk_widget_set_sensitive( AConfig,TRUE );
 }
 }
-// -- 2. page
+/* 2nd page */
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),vo_doublebuffering );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDR ),vo_directrendering );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFramedrop ),FALSE );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBHFramedrop ),FALSE );
 #endif
 }
 gtk_adjustment_set_value( HSFPSadj,force_fps );
-// -- 3. page
+/* 3rd page */
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubUnicode ),sub_unicode );
 if ( !gstrcasecmp( sub_cp,lEncoding[i].name ) ) break;
 if ( lEncoding[i].name ) gtk_entry_set_text( GTK_ENTRY( ESubEncoding ),lEncoding[i].comment );
 }
 #endif
-// --- 4. page
+/* 4th page */
-// font ...
+/* font ... */
 if ( font_name ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
 #ifndef CONFIG_FREETYPE
 gtk_adjustment_set_value( HSFontFactoradj,font_factor );
 #else
 gtk_adjustment_set_value( HSFontBluradj,( subtitle_font_radius / 8.0f ) * 100.0f );
 case 2: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ),TRUE ); break;
 case 3: gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ),TRUE ); break;
 }
 #endif
-// -- 5. page
+/* 5th page */
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ),force_ni );
 if ( index_mode == 1 ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBIndex ),1 );
 {
 int     i;
 GList * Items = NULL;
 gtk_combo_set_popdown_strings( GTK_COMBO( CBAFM ),Items );
 g_list_free( Items );
 if ( name ) gtk_entry_set_text( GTK_ENTRY( EAFM ),name );
 }
-// --- 6. page
+/* 6th page */
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),gtkShowVideoWindow );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver );
 if ( dvd_device ) gtk_entry_set_text( GTK_ENTRY( prEDVDDevice ),dvd_device );
 else gtk_entry_set_text( GTK_ENTRY( prEDVDDevice ),DEFAULT_DVD_DEVICE );
 if ( cdrom_device ) gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),cdrom_device );
 else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE );
-// -- disables
+/* disables */
 #ifndef CONFIG_ASS
 gtk_widget_set_sensitive( CBUseASS,FALSE );
 gtk_widget_set_sensitive( CBASSUseMargins,FALSE );
 gtk_widget_set_sensitive( SBASSTopMargin,FALSE );
 gtk_widget_set_sensitive( SBASSBottomMargin,FALSE );
 #endif
-// -- signals
+/* signals */
 gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 );
 gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );
 gtk_signal_connect( GTK_OBJECT( CBSoftwareMixer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );
 gtk_signal_connect( GTK_OBJECT( CBAudioEqualizer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)2 );
 gtk_signal_connect( GTK_OBJECT( CBShowVideoWindow ),"toggled",GTK_SIGNAL_FUNC( prToggled ), (void*)3 );
 static void prButton( GtkButton * button, gpointer user_data )
 {
 switch ( (int)user_data )
 {
 case bOk:
-	// -- 1. page
+	/* 1st page */
 gtkEnableAudioEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ) );
 	gtkAOExtraStereo=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) );
 	gtkAONorm=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNormalize ) );
 	soft_vol=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSoftwareMixer ) );
 	mplayer( MPLAYER_SET_EXTRA_STEREO,HSExtraStereoMuladj->value,0 );
 	audio_delay=HSAudioDelayadj->value;
 	listSet( &audio_driver_list,ao_driver[0] );
 	listSet( &video_driver_list,vo_driver[0] );
-	// -- 2. page
+	/* 2nd page */
 	vo_doublebuffering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) );
 	vo_directrendering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDR ) );
 frame_dropping=0;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFramedrop ) ) == TRUE ) frame_dropping=1;
 	flip=-1;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFlip ) ) ) flip=1;
 	force_fps=HSFPSadj->value;
-	// -- 3. page
+	/* 3rd page */
 	suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
 	sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
 	gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
 	gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) );
 	sub_unicode=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubUnicode ) );
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDIndicator ) ) ) osd_level=1;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTandP ) ) ) osd_level=2;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ) ) ) osd_level=3;
-// --- 4. page
+/* 4th page */
 	setdup( &font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
 #ifndef CONFIG_FREETYPE
 	mplayer( MPLAYER_SET_FONT_FACTOR,HSFontFactoradj->value,0 );
 #else
 	mplayer( MPLAYER_SET_FONT_BLUR,HSFontBluradj->value,0 );
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleHeight ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,1,0 );
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleWidth ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,2,0 );
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBFontAutoScaleDiagonal ) ) ) mplayer( MPLAYER_SET_FONT_AUTOSCALE,3,0 );
 #endif
-	// -- 5. page
+	/* -- 5th page */
 	force_ni=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNonInterlaved ) );
 	index_mode=-1;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBIndex ) ) ) index_mode=1;
 	{
 for( i=0;mpcodecs_ad_drivers[i];i++ )
 if ( !gstrcmp( tmp,(char *)mpcodecs_ad_drivers[i]->info->name ) )
 	   { listSet( &audio_fm_list,(char *)mpcodecs_ad_drivers[i]->info->short_name ); break; }
 	}
-	// --- 6. page
+	/* 6th page */
 	gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
 	gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
 	gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
 	gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
 	stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
 hbox1=AddVBox( notebook1,0 );
 frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 );
 frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 );
-// --- 1. page
+/* 1st page */
 vbox2=AddVBox( frame,0 );
 scrolledwindow3=gtk_scrolled_window_new( NULL,NULL );
 gtk_widget_set_name( scrolledwindow3,"scrolledwindow3" );
 HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.01,0,0 ) );
 HSAudioDelay=AddHScaler( HSAudioDelayadj,hbox8,2 );
 label=AddLabel( MSGTR_PREFERENCES_Audio,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label );
-// --- 2. page
+/* 2nd page */
 hbox2=AddVBox( notebook1,0 );
 vbox4=AddVBox(
 AddFrame( NULL,GTK_SHADOW_NONE,
 gtk_table_attach( GTK_TABLE( table1 ),HSFPS,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 label=AddLabel( MSGTR_PREFERENCES_Video,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label );
-// --- 3. page
+/* 3rd page */
 vbox6=AddVBox( notebook1,0 );
 vbox600=AddVBox(
 AddFrame( NULL,GTK_SHADOW_NONE,
 label=AddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),2 ),label );
 vbox601=AddVBox( notebook1,0 );
-// --- 4. page
+/* 4th page */
 vbox603=AddVBox(
 AddFrame( NULL,GTK_SHADOW_NONE,
 AddFrame( MSGTR_PREFERENCES_FRAME_Font,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 #endif
 label=AddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label );
-// --- 5. page
+/* 5th page */
 vbox601=AddVBox( notebook1,0 );
 vbox602=AddVBox(
 AddFrame( NULL,GTK_SHADOW_NONE,
 label=AddLabel( MSGTR_PREFERENCES_Codecs,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),4 ),label );
 vbox601=AddVBox( notebook1,0 );
-// --- 6. page
+/* 6th page */
 vbox602=AddVBox(
 AddFrame( NULL,GTK_SHADOW_NONE,
 AddFrame( MSGTR_PREFERENCES_FRAME_PostProcess,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 //  AddHSeparator( vbox602 );
 label=AddLabel( MSGTR_PREFERENCES_Misc,NULL );
 gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),5 ),label );
-// ---
+/* --- */
 AddHSeparator( vbox1 );
 hbuttonbox1=AddHButtonBox( vbox1 );
 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
 }
 #ifdef CONFIG_OSS_AUDIO
 static GList *appendOSSDevices(GList *l)
 {
-// careful! the current implementation allows only string constants!
+/* careful! the current implementation allows only string constants! */
 l = g_list_append(l, (gpointer)"/dev/dsp");
 if (gtkAOOSSDevice && strncmp(gtkAOOSSDevice, "/dev/sound", 10) == 0) {
 l = g_list_append(l, (gpointer)"/dev/sound/dsp0");
 l = g_list_append(l, (gpointer)"/dev/sound/dsp1");
 l = g_list_append(l, (gpointer)"/dev/sound/dsp2");
 return l;
 }
 static GList *appendOSSMixers(GList *l)
 {
-// careful! the current implementation allows only string constants!
+/* careful! the current implementation allows only string constants! */
 l = g_list_append(l, (gpointer)"/dev/mixer");
 if (gtkAOOSSMixer && strncmp(gtkAOOSSMixer, "/dev/sound", 10) == 0) {
 l = g_list_append(l, (gpointer)"/dev/sound/mixer0");
 l = g_list_append(l, (gpointer)"/dev/sound/mixer1");
 l = g_list_append(l, (gpointer)"/dev/sound/mixer2");
 gtk_window_add_accel_group(GTK_WINDOW(AudioConfig), accel_group);
 return AudioConfig;
 }
-// --- dxr3 config box
+/* dxr3 config box */
 static GtkWidget * DXR3Config;
 static GtkWidget * CBDevice;
 static GtkWidget * CEDXR3Device;
 static GtkWidget * RBVNone;

Mercurial > mplayer.hg

comparison gui/ui/gtk/preferences.c @ 34684:b03481253518