Mercurial > mplayer.hg

comparison gui/dialog/equalizer.c @ 36776:5ea757ca6270

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix careless pointer parameter handling. User proper GLib macros to avoid pointer cast warnings. This renders the usage of intptr_t redundant (introduced in r36858).
author ib
date Mon, 17 Feb 2014 02:30:49 +0000
parents e788bcd9d49b
children 1236a692d0c6
comparison
equal deleted inserted replaced
36775:666757381a27 36776:5ea757ca6270
131 equalizer_t eq; 131 equalizer_t eq;
132 132
133 (void) widget; 133 (void) widget;
134 (void) event; 134 (void) event;
135 135
136 switch ( (intptr_t)user_data ) 136 switch ( GPOINTER_TO_INT(user_data) )
137 { 137 {
138 case 0: eq.gain=A3125adj->value; break; 138 case 0: eq.gain=A3125adj->value; break;
139 case 1: eq.gain=A6250adj->value; break; 139 case 1: eq.gain=A6250adj->value; break;
140 case 2: eq.gain=A125adj->value; break; 140 case 2: eq.gain=A125adj->value; break;
141 case 3: eq.gain=A250adj->value; break; 141 case 3: eq.gain=A250adj->value; break;
146 case 8: eq.gain=A8000adj->value; break; 146 case 8: eq.gain=A8000adj->value; break;
147 case 9: eq.gain=A16000adj->value; break; 147 case 9: eq.gain=A16000adj->value; break;
148 default: return FALSE; 148 default: return FALSE;
149 } 149 }
150 eq.gain=-eq.gain; 150 eq.gain=-eq.gain;
151 eq.band=(intptr_t)user_data; 151 eq.band=GPOINTER_TO_INT(user_data);
152 if ( Channel == -1 ) 152 if ( Channel == -1 )
153 { 153 {
154 int i; 154 int i;
155 for ( i=0;i<6;i++ ) 155 for ( i=0;i<6;i++ )
156 { eq.channel=i; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); } 156 { eq.channel=i; mplayer( MPLAYER_SET_EQUALIZER,0,&eq ); }
162 static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) 162 static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
163 { 163 {
164 (void) widget; 164 (void) widget;
165 (void) event; 165 (void) event;
166 166
167 switch( (intptr_t)user_data ) 167 switch( GPOINTER_TO_INT(user_data) )
168 { 168 {
169 case 1: mplayer( MPLAYER_SET_CONTRAST,VContrastadj->value,0 ); break; 169 case 1: mplayer( MPLAYER_SET_CONTRAST,VContrastadj->value,0 ); break;
170 case 2: mplayer( MPLAYER_SET_BRIGHTNESS,VBrightnessadj->value,0 ); break; 170 case 2: mplayer( MPLAYER_SET_BRIGHTNESS,VBrightnessadj->value,0 ); break;
171 case 3: mplayer( MPLAYER_SET_HUE,VHueadj->value,0 ); break; 171 case 3: mplayer( MPLAYER_SET_HUE,VHueadj->value,0 ); break;
172 case 4: mplayer( MPLAYER_SET_SATURATION,VSaturationadj->value,0 ); break; 172 case 4: mplayer( MPLAYER_SET_SATURATION,VSaturationadj->value,0 ); break;
177 177
178 static void eqButtonReleased( GtkButton * button,gpointer user_data ) 178 static void eqButtonReleased( GtkButton * button,gpointer user_data )
179 { 179 {
180 (void) button; 180 (void) button;
181 181
182 switch( (intptr_t)user_data ) 182 switch( GPOINTER_TO_INT(user_data) )
183 { 183 {
184 case 0: 184 case 0:
185 gtk_widget_destroy( Equalizer ); 185 gtk_widget_destroy( Equalizer );
186 if ( EquConfig ) gtk_widget_destroy( EquConfig ); 186 if ( EquConfig ) gtk_widget_destroy( EquConfig );
187 break; 187 break;
433 433
434 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 434 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
435 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 435 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
436 436
437 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Equalizer ); 437 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&Equalizer );
438 gtk_signal_connect( GTK_OBJECT( Equalizer ),"focus-in-event",GTK_SIGNAL_FUNC( eqFocus ),(void *)2 ); 438 gtk_signal_connect( GTK_OBJECT( Equalizer ),"focus-in-event",GTK_SIGNAL_FUNC( eqFocus ),GINT_TO_POINTER(2) );
439 439
440 gtk_signal_connect( GTK_OBJECT( ChannelsList ),"select-row",GTK_SIGNAL_FUNC( eqSelectChannelsListRow ),NULL ); 440 gtk_signal_connect( GTK_OBJECT( ChannelsList ),"select-row",GTK_SIGNAL_FUNC( eqSelectChannelsListRow ),NULL );
441 441
442 gtk_signal_connect( GTK_OBJECT( A3125 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)0 ); 442 gtk_signal_connect( GTK_OBJECT( A3125 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(0) );
443 gtk_signal_connect( GTK_OBJECT( A6250 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)1 ); 443 gtk_signal_connect( GTK_OBJECT( A6250 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(1) );
444 gtk_signal_connect( GTK_OBJECT( A125 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)2 ); 444 gtk_signal_connect( GTK_OBJECT( A125 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(2) );
445 gtk_signal_connect( GTK_OBJECT( A250 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)3 ); 445 gtk_signal_connect( GTK_OBJECT( A250 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(3) );
446 gtk_signal_connect( GTK_OBJECT( A500 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)4 ); 446 gtk_signal_connect( GTK_OBJECT( A500 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(4) );
447 gtk_signal_connect( GTK_OBJECT( A1000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)5 ); 447 gtk_signal_connect( GTK_OBJECT( A1000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(5) );
448 gtk_signal_connect( GTK_OBJECT( A2000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)6 ); 448 gtk_signal_connect( GTK_OBJECT( A2000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(6) );
449 gtk_signal_connect( GTK_OBJECT( A4000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)7 ); 449 gtk_signal_connect( GTK_OBJECT( A4000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(7) );
450 gtk_signal_connect( GTK_OBJECT( A8000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)8 ); 450 gtk_signal_connect( GTK_OBJECT( A8000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(8) );
451 gtk_signal_connect( GTK_OBJECT( A16000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)9 ); 451 gtk_signal_connect( GTK_OBJECT( A16000 ),"motion-notify-event",GTK_SIGNAL_FUNC( eqHScaleMotion ),GINT_TO_POINTER(9) );
452 452
453 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)1 ); 453 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),GINT_TO_POINTER(1) );
454 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 ); 454 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),GINT_TO_POINTER(2) );
455 gtk_signal_connect( GTK_OBJECT( VHue ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 ); 455 gtk_signal_connect( GTK_OBJECT( VHue ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),GINT_TO_POINTER(3) );
456 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 ); 456 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion-notify-event",GTK_SIGNAL_FUNC( eqVScaleMotion ),GINT_TO_POINTER(4) );
457 457
458 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 ); 458 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),GINT_TO_POINTER(0) );
459 gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 ); 459 gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),GINT_TO_POINTER(1) );
460 gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)2 ); 460 gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),GINT_TO_POINTER(2) );
461 461
462 gtk_signal_connect( GTK_OBJECT( Notebook ),"switch-page",GTK_SIGNAL_FUNC( eqNotebook ),NULL ); 462 gtk_signal_connect( GTK_OBJECT( Notebook ),"switch-page",GTK_SIGNAL_FUNC( eqNotebook ),NULL );
463 463
464 gtk_window_add_accel_group( GTK_WINDOW( Equalizer ),accel_group ); 464 gtk_window_add_accel_group( GTK_WINDOW( Equalizer ),accel_group );
465 465
563 563
564 static void ecButtonReleased( GtkButton * button,gpointer user_data ) 564 static void ecButtonReleased( GtkButton * button,gpointer user_data )
565 { 565 {
566 (void) button; 566 (void) button;
567 567
568 if ( (intptr_t)user_data ) 568 if ( GPOINTER_TO_INT(user_data) )
569 { // if you pressed Ok 569 { // if you pressed Ok
570 nfree( gtkEquChannel1 ); gtkEquChannel1=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel1 ) ) ); 570 nfree( gtkEquChannel1 ); gtkEquChannel1=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel1 ) ) );
571 nfree( gtkEquChannel2 ); gtkEquChannel2=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel2 ) ) ); 571 nfree( gtkEquChannel2 ); gtkEquChannel2=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel2 ) ) );
572 nfree( gtkEquChannel3 ); gtkEquChannel3=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel3 ) ) ); 572 nfree( gtkEquChannel3 ); gtkEquChannel3=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel3 ) ) );
573 nfree( gtkEquChannel4 ); gtkEquChannel4=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel4 ) ) ); 573 nfree( gtkEquChannel4 ); gtkEquChannel4=gstrdup( gtk_entry_get_text( GTK_ENTRY( CEChannel4 ) ) );
678 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 678 gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
679 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 679 gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
680 680
681 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&EquConfig ); 681 gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&EquConfig );
682 682
683 gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 ); 683 gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),GINT_TO_POINTER(1) );
684 gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 ); 684 gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),GINT_TO_POINTER(0) );
685 685
686 gtk_window_add_accel_group( GTK_WINDOW( EquConfig ),accel_group ); 686 gtk_window_add_accel_group( GTK_WINDOW( EquConfig ),accel_group );
687 687
688 return EquConfig; 688 return EquConfig;
689 } 689 }