comparison gui/mplayer/gtk/eq.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents b0a7b35b78d2
children 016e5fc1dead
comparison
equal deleted inserted replaced
29262:7d545a6b8aff 29263:0f1b5b68af32
89 get_video_colors( guiIntfStruct.sh_video,"brightness",&vo_gamma_brightness ); 89 get_video_colors( guiIntfStruct.sh_video,"brightness",&vo_gamma_brightness );
90 get_video_colors( guiIntfStruct.sh_video,"contrast",&vo_gamma_contrast ); 90 get_video_colors( guiIntfStruct.sh_video,"contrast",&vo_gamma_contrast );
91 get_video_colors( guiIntfStruct.sh_video,"hue",&vo_gamma_hue ); 91 get_video_colors( guiIntfStruct.sh_video,"hue",&vo_gamma_hue );
92 get_video_colors( guiIntfStruct.sh_video,"saturation",&vo_gamma_saturation ); 92 get_video_colors( guiIntfStruct.sh_video,"saturation",&vo_gamma_saturation );
93 } 93 }
94 94
95 gtk_adjustment_set_value( VContrastadj,(float)vo_gamma_contrast ); 95 gtk_adjustment_set_value( VContrastadj,(float)vo_gamma_contrast );
96 gtk_adjustment_set_value( VBrightnessadj,(float)vo_gamma_brightness ); 96 gtk_adjustment_set_value( VBrightnessadj,(float)vo_gamma_brightness );
97 gtk_adjustment_set_value( VHueadj,(float)vo_gamma_hue ); 97 gtk_adjustment_set_value( VHueadj,(float)vo_gamma_hue );
98 gtk_adjustment_set_value( VSaturationadj,(float)vo_gamma_saturation ); 98 gtk_adjustment_set_value( VSaturationadj,(float)vo_gamma_saturation );
99 } 99 }
175 } 175 }
176 176
177 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) 177 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
178 { 178 {
179 equalizer_t eq; 179 equalizer_t eq;
180 switch ( (int)user_data ) 180 switch ( (int)user_data )
181 { 181 {
182 case 0: eq.gain=A3125adj->value; break; 182 case 0: eq.gain=A3125adj->value; break;
183 case 1: eq.gain=A6250adj->value; break; 183 case 1: eq.gain=A6250adj->value; break;
184 case 2: eq.gain=A125adj->value; break; 184 case 2: eq.gain=A125adj->value; break;
185 case 3: eq.gain=A250adj->value; break; 185 case 3: eq.gain=A250adj->value; break;
191 case 9: eq.gain=A16000adj->value; break; 191 case 9: eq.gain=A16000adj->value; break;
192 default: return FALSE; 192 default: return FALSE;
193 } 193 }
194 eq.gain=0.0f - eq.gain; 194 eq.gain=0.0f - eq.gain;
195 eq.band=(int)user_data; 195 eq.band=(int)user_data;
196 if ( Channel == -1 ) 196 if ( Channel == -1 )
197 { 197 {
198 int i; 198 int i;
199 for ( i=0;i<6;i++ ) 199 for ( i=0;i<6;i++ )
200 { eq.channel=i; gtkSet( gtkSetEqualizer,0,&eq ); } 200 { eq.channel=i; gtkSet( gtkSetEqualizer,0,&eq ); }
201 } else { eq.channel=Channel; gtkSet( gtkSetEqualizer,0,&eq ); } 201 } else { eq.channel=Channel; gtkSet( gtkSetEqualizer,0,&eq ); }
202 202
203 return FALSE; 203 return FALSE;
204 } 204 }
205 205
206 static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) 206 static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
207 { 207 {
216 216
217 return FALSE; 217 return FALSE;
218 } 218 }
219 219
220 static void eqButtonReleased( GtkButton * button,gpointer user_data ) 220 static void eqButtonReleased( GtkButton * button,gpointer user_data )
221 { 221 {
222 switch( (int)user_data ) 222 switch( (int)user_data )
223 { 223 {
224 case 0: HideEqualizer(); break; 224 case 0: HideEqualizer(); break;
225 case 1: 225 case 1:
226 if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 ) 226 if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 )
227 { 227 {
228 if ( !guiIntfStruct.Playing || !gtkEnableAudioEqualizer ) break; 228 if ( !guiIntfStruct.Playing || !gtkEnableAudioEqualizer ) break;
229 gtkSet( gtkSetEqualizer,0,NULL ); 229 gtkSet( gtkSetEqualizer,0,NULL );
230 eqSetBands( Channel ); 230 eqSetBands( Channel );
231 } 231 }
232 else 232 else
233 { 233 {
234 if ( !guiIntfStruct.Playing ) break; 234 if ( !guiIntfStruct.Playing ) break;
235 gtkSet( gtkSetContrast,0.0f,NULL ); 235 gtkSet( gtkSetContrast,0.0f,NULL );
322 gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 ); 322 gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 );
323 323
324 A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 324 A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
325 A3125=AddVScaler( A3125adj,NULL,-1 ); 325 A3125=AddVScaler( A3125adj,NULL,-1 );
326 gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 326 gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
327 327
328 A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 328 A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
329 A6250=AddVScaler( A6250adj,NULL,-1 ); 329 A6250=AddVScaler( A6250adj,NULL,-1 );
330 gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); 330 gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
331 331
332 A125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); 332 A125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
406 406
407 table1=gtk_table_new( 4,2,FALSE ); 407 table1=gtk_table_new( 4,2,FALSE );
408 gtk_widget_set_name( table1,"table1" ); 408 gtk_widget_set_name( table1,"table1" );
409 gtk_widget_show( table1 ); 409 gtk_widget_show( table1 );
410 gtk_container_add( GTK_CONTAINER( Notebook ),table1 ); 410 gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
411 411
412 gtk_table_attach( GTK_TABLE( table1 ), 412 gtk_table_attach( GTK_TABLE( table1 ),
413 AddLabel( MSGTR_EQU_Contrast,NULL ), 413 AddLabel( MSGTR_EQU_Contrast,NULL ),
414 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 414 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
415 415
416 gtk_table_attach( GTK_TABLE( table1 ), 416 gtk_table_attach( GTK_TABLE( table1 ),
455 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); 455 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
456 456
457 Config=AddButton( MSGTR_Config,hbuttonbox1 ); 457 Config=AddButton( MSGTR_Config,hbuttonbox1 );
458 Clear=AddButton( MSGTR_Clear,hbuttonbox1 ); 458 Clear=AddButton( MSGTR_Clear,hbuttonbox1 );
459 Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); 459 Ok=AddButton( MSGTR_Ok,hbuttonbox1 );
460 460
461 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 461 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
462 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 462 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
463 463
464 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Equalizer ); 464 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Equalizer );
465 gtk_signal_connect( GTK_OBJECT( Equalizer ),"focus_in_event",GTK_SIGNAL_FUNC( eqFocus ),(void *)2 ); 465 gtk_signal_connect( GTK_OBJECT( Equalizer ),"focus_in_event",GTK_SIGNAL_FUNC( eqFocus ),(void *)2 );
479 479
480 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)1 ); 480 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)1 );
481 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 ); 481 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 );
482 gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 ); 482 gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 );
483 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 ); 483 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 );
484 484
485 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 ); 485 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 );
486 gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 ); 486 gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 );
487 gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)2 ); 487 gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)2 );
488 488
489 gtk_signal_connect( GTK_OBJECT( Notebook ),"switch_page",GTK_SIGNAL_FUNC( eqNotebook ),NULL ); 489 gtk_signal_connect( GTK_OBJECT( Notebook ),"switch_page",GTK_SIGNAL_FUNC( eqNotebook ),NULL );
516 { 516 {
517 GList * Items = NULL; 517 GList * Items = NULL;
518 518
519 if ( EquConfig ) gtkActive( EquConfig ); 519 if ( EquConfig ) gtkActive( EquConfig );
520 else EquConfig=create_EquConfig(); 520 else EquConfig=create_EquConfig();
521 521
522 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right ); 522 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right );
523 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left ); 523 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left );
524 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Right ); 524 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Right );
525 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Left ); 525 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Left );
526 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Center ); 526 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Center );
527 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Bass ); 527 Items=g_list_append( Items,(gpointer)MSGTR_EQU_Bass );
528 528
529 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items ); 529 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items );
530 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items ); 530 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items );
531 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel3 ),Items ); 531 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel3 ),Items );
532 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel4 ),Items ); 532 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel4 ),Items );
533 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel5 ),Items ); 533 gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel5 ),Items );
548 548
549 void HideEquConfig( void ) 549 void HideEquConfig( void )
550 { 550 {
551 if ( !EquConfig ) return; 551 if ( !EquConfig ) return;
552 gtk_widget_hide( EquConfig ); 552 gtk_widget_hide( EquConfig );
553 gtk_widget_destroy( EquConfig ); 553 gtk_widget_destroy( EquConfig );
554 EquConfig=NULL; 554 EquConfig=NULL;
555 } 555 }
556 556
557 static void ecButtonReleased( GtkButton * button,gpointer user_data ) 557 static void ecButtonReleased( GtkButton * button,gpointer user_data )
558 { 558 {
632 gtk_widget_set_name( CEChannel1,"CEChannel1" ); 632 gtk_widget_set_name( CEChannel1,"CEChannel1" );
633 gtk_widget_show( CEChannel1 ); 633 gtk_widget_show( CEChannel1 );
634 634
635 CBChannel2=AddComboBox( NULL ); 635 CBChannel2=AddComboBox( NULL );
636 gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 636 gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
637 637
638 CEChannel2=GTK_COMBO( CBChannel2 )->entry; 638 CEChannel2=GTK_COMBO( CBChannel2 )->entry;
639 gtk_widget_set_name( CEChannel2,"CEChannel2" ); 639 gtk_widget_set_name( CEChannel2,"CEChannel2" );
640 gtk_widget_show( CEChannel2 ); 640 gtk_widget_show( CEChannel2 );
641 641
642 CBChannel3=AddComboBox( NULL ); 642 CBChannel3=AddComboBox( NULL );
643 gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 643 gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
644 644
645 CEChannel3=GTK_COMBO( CBChannel3 )->entry; 645 CEChannel3=GTK_COMBO( CBChannel3 )->entry;
646 gtk_widget_set_name( CEChannel3,"CEChannel3" ); 646 gtk_widget_set_name( CEChannel3,"CEChannel3" );
647 gtk_widget_show( CEChannel3 ); 647 gtk_widget_show( CEChannel3 );
648 648
649 CBChannel4=AddComboBox( NULL ); 649 CBChannel4=AddComboBox( NULL );
650 gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 650 gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
651 651
652 CEChannel4=GTK_COMBO( CBChannel4 )->entry; 652 CEChannel4=GTK_COMBO( CBChannel4 )->entry;
653 gtk_widget_set_name( CEChannel4,"CEChannel4" ); 653 gtk_widget_set_name( CEChannel4,"CEChannel4" );
654 gtk_widget_show( CEChannel4 ); 654 gtk_widget_show( CEChannel4 );
655 655
656 CBChannel5=AddComboBox( NULL ); 656 CBChannel5=AddComboBox( NULL );
657 gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 657 gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
658 658
659 CEChannel5=GTK_COMBO( CBChannel5 )->entry; 659 CEChannel5=GTK_COMBO( CBChannel5 )->entry;
660 gtk_widget_set_name( CEChannel5,"CEChannel5" ); 660 gtk_widget_set_name( CEChannel5,"CEChannel5" );
661 gtk_widget_show( CEChannel5 ); 661 gtk_widget_show( CEChannel5 );
662 662
663 CBChannel6=AddComboBox( NULL ); 663 CBChannel6=AddComboBox( NULL );
664 gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); 664 gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
665 665
666 CEChannel6=GTK_COMBO( CBChannel6 )->entry; 666 CEChannel6=GTK_COMBO( CBChannel6 )->entry;
667 gtk_widget_set_name( CEChannel6,"CEChannel6" ); 667 gtk_widget_set_name( CEChannel6,"CEChannel6" );
668 gtk_widget_show( CEChannel6 ); 668 gtk_widget_show( CEChannel6 );
669 669
670 AddHSeparator( vbox1 ); 670 AddHSeparator( vbox1 );
678 678
679 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 679 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
680 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 680 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
681 681
682 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&EquConfig ); 682 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&EquConfig );
683 683
684 gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 ); 684 gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 );
685 gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 ); 685 gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 );
686 686
687 gtk_window_add_accel_group( GTK_WINDOW( EquConfig ),accel_group ); 687 gtk_window_add_accel_group( GTK_WINDOW( EquConfig ),accel_group );
688 688