Mercurial > mplayer.hg

comparison Gui/mplayer/gtk/eq.c @ 6627:fd3ac41ee1a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add equalizer support and fix some small bug...
author pontscho
date Wed, 03 Jul 2002 18:57:52 +0000
parents 036948569977
children 8f49c75a2824
comparison
equal deleted inserted replaced
6626:036948569977 6627:fd3ac41ee1a1
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <gdk/gdkkeysyms.h> 9 #include <gdk/gdkkeysyms.h>
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
11 11
12 #include "../../events.h"
13 #include "../../../config.h"
14 #include "../../../help_mp.h"
15 #include "../../../mplayer.h"
16 #include "../../../libao2/eq.h"
17 #include "../widgets.h"
18 #include "../mplayer.h"
19
12 #include "eq.h" 20 #include "eq.h"
13 21
14 static GtkWidget * Equalizer; 22 GtkWidget * Equalizer;
23
24 static GtkWidget * Notebook;
15 static GtkWidget * ChannelsList; 25 static GtkWidget * ChannelsList;
16 static GtkWidget * VContrast, * VBrightness, * VHue, * VSaturation; 26 static GtkWidget * VContrast, * VBrightness, * VHue, * VSaturation;
17 static GtkAdjustment * VContrastadj, * VBrightnessadj, * VHueadj, * VSaturationadj; 27 static GtkAdjustment * VContrastadj, * VBrightnessadj, * VHueadj, * VSaturationadj;
18 static GtkWidget * Ok; 28 static GtkWidget * Ok, * Clear;
19 static GtkWidget * A3125, * A125, * A6250, * A250, * A500, * A1000, * A2000, * A4000, * A8000, * A16000; 29 static GtkWidget * A3125, * A125, * A6250, * A250, * A500, * A1000, * A2000, * A4000, * A8000, * A16000;
20 static GtkAdjustment * A3125adj, * A125adj, * A6250adj, * A250adj, * A500adj, * A1000adj, * A2000adj, * A4000adj, * A8000adj, * A16000adj; 30 static GtkAdjustment * A3125adj, * A125adj, * A6250adj, * A250adj, * A500adj, * A1000adj, * A2000adj, * A4000adj, * A8000adj, * A16000adj;
21 31
22 static int Channel = -1; 32 static int Channel = -1;
33 static int gtkVEqualizer = 0;
34
35 int gtkEnableAudioEqualizer = 1;
36 int gtkEnableVideoEqualizer = 1;
37
38 static void eqSetBands( int channel )
39 {
40 if ( channel < 0 ) channel=0;
41 gtk_adjustment_set_value( A3125adj,0.0f - gtkEquChannels[channel][0] );
42 gtk_adjustment_set_value( A6250adj,0.0f - gtkEquChannels[channel][1] );
43 gtk_adjustment_set_value( A125adj,0.0f - gtkEquChannels[channel][2] );
44 gtk_adjustment_set_value( A250adj,0.0f - gtkEquChannels[channel][3] );
45 gtk_adjustment_set_value( A500adj,0.0f - gtkEquChannels[channel][4] );
46 gtk_adjustment_set_value( A1000adj,0.0f - gtkEquChannels[channel][5] );
47 gtk_adjustment_set_value( A2000adj,0.0f - gtkEquChannels[channel][6] );
48 gtk_adjustment_set_value( A4000adj,0.0f - gtkEquChannels[channel][7] );
49 gtk_adjustment_set_value( A8000adj,0.0f - gtkEquChannels[channel][8] );
50 gtk_adjustment_set_value( A16000adj,0.0f - gtkEquChannels[channel][9] );
51 gtk_adjustment_set_value( VContrastadj,gtkContrast );
52 gtk_adjustment_set_value( VBrightnessadj,gtkBrightness );
53 gtk_adjustment_set_value( VHueadj,gtkHue );
54 gtk_adjustment_set_value( VSaturationadj,gtkSaturation );
55 }
56
57 void ShowEqualizer( void )
58 {
59 if ( gtkVEqualizer ) gtkActive( Equalizer );
60 else Equalizer=create_Equalizer();
61
62 {
63 gchar * str[2]; str[1]="";
64 str[0]="All"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
65 if ( guiIntfStruct.AudioType > 1 )
66 {
67 str[0]="Front Right"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
68 str[0]="Front Left"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
69 }
70 if ( guiIntfStruct.AudioType > 2 )
71 {
72 str[0]="Channel 3. (Back Right?)"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
73 str[0]="Channel 4. (Back Left?)"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
74 }
75 if ( guiIntfStruct.AudioType > 4 )
76 {
77 str[0]="Channel 5. (?)"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
78 str[0]="Channel 6. (?)"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
79 }
80 gtk_clist_select_row( GTK_CLIST( ChannelsList ),1,0 );
81
82 VContrastadj->value=gtkContrast;
83 VBrightnessadj->value=gtkBrightness;
84 VHueadj->value=gtkHue;
85 VSaturationadj->value=gtkSaturation;
86
87 if ( !guiIntfStruct.Playing && gtkEnableVideoEqualizer )
88 {
89
90 gtk_widget_set_sensitive( VContrast,FALSE );
91 gtk_widget_set_sensitive( VBrightness,FALSE );
92 gtk_widget_set_sensitive( VHue,FALSE );
93 gtk_widget_set_sensitive( VSaturation,FALSE );
94 }
95
96 Channel=0;
97 eqSetBands( 0 );
98
99 if ( !guiIntfStruct.Playing && gtkEnableAudioEqualizer )
100 {
101 gtk_widget_set_sensitive( ChannelsList,FALSE );
102 gtk_widget_set_sensitive( A3125,FALSE );
103 gtk_widget_set_sensitive( A125,FALSE );
104 gtk_widget_set_sensitive( A6250,FALSE );
105 gtk_widget_set_sensitive( A250,FALSE );
106 gtk_widget_set_sensitive( A500,FALSE );
107 gtk_widget_set_sensitive( A1000,FALSE );
108 gtk_widget_set_sensitive( A2000,FALSE );
109 gtk_widget_set_sensitive( A4000,FALSE );
110 gtk_widget_set_sensitive( A8000,FALSE );
111 gtk_widget_set_sensitive( A16000,FALSE );
112 }
113 }
114
115 gtk_widget_show( Equalizer );
116 }
23 117
24 void HideEqualizer( void ) 118 void HideEqualizer( void )
25 { gtk_widget_hide( Equalizer ); gtk_widget_destroy( Equalizer ); gtk_main_quit(); } 119 { gtkVEqualizer=0; gtk_widget_hide( Equalizer ); gtk_widget_destroy( Equalizer ); }
26 120
27 gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ) 121 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
28 { 122 {
29 float value; 123 equalizer_t eq;
30 switch ( (int)user_data ) 124 switch ( (int)user_data )
31 { 125 {
32 case 0: value=A3125adj->value; break; 126 case 0: eq.gain=A3125adj->value; break;
33 case 1: value=A6250adj->value; break; 127 case 1: eq.gain=A6250adj->value; break;
34 case 2: value=A125adj->value; break; 128 case 2: eq.gain=A125adj->value; break;
35 case 3: value=A250adj->value; break; 129 case 3: eq.gain=A250adj->value; break;
36 case 4: value=A500adj->value; break; 130 case 4: eq.gain=A500adj->value; break;
37 case 5: value=A1000adj->value; break; 131 case 5: eq.gain=A1000adj->value; break;
38 case 6: value=A2000adj->value; break; 132 case 6: eq.gain=A2000adj->value; break;
39 case 7: value=A4000adj->value; break; 133 case 7: eq.gain=A4000adj->value; break;
40 case 8: value=A8000adj->value; break; 134 case 8: eq.gain=A8000adj->value; break;
41 case 9: value=A16000adj->value; break; 135 case 9: eq.gain=A16000adj->value; break;
42 default: return FALSE;
43 }
44 value=0.0f - value;
45
46 printf( "hscale: %d -> %.2f\n",(int)user_data,value );
47 return FALSE;
48 }
49
50 gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
51 {
52 float value;
53 switch( (int)user_data )
54 {
55 case 1: value=VContrastadj->value; break;
56 case 2: value=VBrightnessadj->value; break;
57 case 3: value=VHueadj->value; break;
58 case 4: value=VSaturationadj->value; break;
59 default: return FALSE; 136 default: return FALSE;
60 } 137 }
61 138 eq.gain=0.0f - eq.gain;
62 printf( "vscale: %d -> %.2f\n",(int)user_data,value ); 139 eq.band=(int)user_data;
63 return FALSE; 140 if ( Channel == -1 )
141 {
142 int i;
143 for ( i=0;i<6;i++ )
144 { eq.channel=i; gtkSet( gtkSetEqualizer,0,&eq ); }
145 } else { eq.channel=Channel; gtkSet( gtkSetEqualizer,0,&eq ); }
146
147 return FALSE;
64 } 148 }
65 149
66 void eqButtonReleased( GtkButton * button,gpointer user_data ) 150 static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion * event,gpointer user_data )
67 { HideEqualizer(); } 151 {
152
153 switch( (int)user_data )
154 {
155 case 1: gtkSet( gtkSetContrast,VContrastadj->value,NULL ); break;
156 case 2: gtkSet( gtkSetBrightness,VBrightnessadj->value,NULL ); break;
157 case 3: gtkSet( gtkSetHue,VHueadj->value,NULL ); break;
158 case 4: gtkSet( gtkSetSaturation,VSaturationadj->value,NULL ); break;
159 }
160
161 return FALSE;
162 }
163
164 static void eqButtonReleased( GtkButton * button,gpointer user_data )
165 {
166 switch( (int)user_data )
167 {
168 case 0: HideEqualizer(); break;
169 case 1:
170 if ( gtk_notebook_get_current_page( Notebook ) == 0 )
171 {
172 gtkSet( gtkSetEqualizer,0,NULL );
173 eqSetBands( Channel );
174 }
175 else
176 {
177 gtkSet( gtkSetContrast,0.0f,NULL );
178 gtkSet( gtkSetBrightness,0.0f,NULL );
179 gtkSet( gtkSetHue,0.0f,NULL );
180 gtkSet( gtkSetSaturation,0.0f,NULL );
181 }
182 break;
183 }
184 }
68 185
69 gboolean eqDestroy( GtkWidget * widget,GdkEvent * event,gpointer user_data ) 186 gboolean eqDestroy( GtkWidget * widget,GdkEvent * event,gpointer user_data )
70 { HideEqualizer(); return FALSE; } 187 { HideEqualizer(); return FALSE; }
71 188
72 void eqShow( GtkWidget * widget,gpointer user_data ) 189 static void eqShow( GtkWidget * widget,gpointer user_data )
73 { 190 { gtkVEqualizer=(int)user_data; }
74 gchar * str[2]; str[1]=""; 191
75 str[0]="All"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str); 192 static void eqSelectChannelsListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data )
76 str[0]="Left"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
77 str[0]="Right"; gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
78 gtk_clist_select_row( GTK_CLIST( ChannelsList ),0,0 );
79 }
80
81 void eqSelectChannelsListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data )
82 { 193 {
83 char * tmp; 194 char * tmp;
84 Channel=row - 1; 195 Channel=row - 1;
85 gtk_clist_get_text( clist,row,0,&tmp ); 196 eqSetBands( Channel );
86 printf( "Selected channel: %s (%d)\n",tmp,Channel ); 197 if ( Channel == -1 )
198 {
199 int i,j; equalizer_t eq;
200 for ( i=1;i<6;i++ )
201 for ( j=0;j<10;j++ )
202 { eq.band=j; eq.channel=i; eq.gain=gtkEquChannels[0][j]; gtkSet( gtkSetEqualizer,0,&eq ); }
203 }
87 } 204 }
88 205
89 GtkWidget * create_Equalizer( void ) 206 GtkWidget * create_Equalizer( void )
90 { 207 {
91 GtkWidget * frame1; 208 GtkWidget * frame1;
92 GtkWidget * frame2; 209 GtkWidget * frame2;
93 GtkWidget * frame3; 210 GtkWidget * frame3;
94 GtkWidget * frame4; 211 GtkWidget * frame4;
95 GtkWidget * vbox1; 212 GtkWidget * vbox1;
96 GtkWidget * Notebook;
97 GtkWidget * hbox1; 213 GtkWidget * hbox1;
98 GtkWidget * scrolledwindow1; 214 GtkWidget * scrolledwindow1;
99 GtkWidget * table1; 215 GtkWidget * table1;
100 GtkWidget * label3; 216 GtkWidget * label3;
101 GtkWidget * label4; 217 GtkWidget * label4;
453 gtk_widget_ref( vbox3 ); 569 gtk_widget_ref( vbox3 );
454 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"vbox3",vbox3,(GtkDestroyNotify)gtk_widget_unref ); 570 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"vbox3",vbox3,(GtkDestroyNotify)gtk_widget_unref );
455 gtk_widget_show( vbox3 ); 571 gtk_widget_show( vbox3 );
456 gtk_box_pack_start( GTK_BOX( hbox2 ),vbox3,TRUE,TRUE,0 ); 572 gtk_box_pack_start( GTK_BOX( hbox2 ),vbox3,TRUE,TRUE,0 );
457 573
458 VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 574 VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,1,0,0 ) );
459 VContrast=gtk_hscale_new( VContrastadj ); 575 VContrast=gtk_hscale_new( VContrastadj );
460 gtk_widget_set_name( VContrast,"VContrast" ); 576 gtk_widget_set_name( VContrast,"VContrast" );
461 gtk_widget_ref( VContrast ); 577 gtk_widget_ref( VContrast );
462 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VContrast",VContrast,(GtkDestroyNotify)gtk_widget_unref ); 578 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VContrast",VContrast,(GtkDestroyNotify)gtk_widget_unref );
463 gtk_widget_show( VContrast ); 579 gtk_widget_show( VContrast );
464 gtk_box_pack_start( GTK_BOX( vbox3 ),VContrast,TRUE,TRUE,0 ); 580 gtk_box_pack_start( GTK_BOX( vbox3 ),VContrast,TRUE,TRUE,0 );
465 gtk_scale_set_value_pos( GTK_SCALE( VContrast ),GTK_POS_RIGHT ); 581 gtk_scale_set_value_pos( GTK_SCALE( VContrast ),GTK_POS_RIGHT );
466 582
467 VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 583 VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,1,0,0 ) );
468 VBrightness=gtk_hscale_new( VBrightnessadj ); 584 VBrightness=gtk_hscale_new( VBrightnessadj );
469 gtk_widget_set_name( VBrightness,"VBrightness" ); 585 gtk_widget_set_name( VBrightness,"VBrightness" );
470 gtk_widget_ref( VBrightness ); 586 gtk_widget_ref( VBrightness );
471 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VBrightness",VBrightness,(GtkDestroyNotify)gtk_widget_unref ); 587 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VBrightness",VBrightness,(GtkDestroyNotify)gtk_widget_unref );
472 gtk_widget_show( VBrightness ); 588 gtk_widget_show( VBrightness );
473 gtk_box_pack_start( GTK_BOX( vbox3 ),VBrightness,TRUE,TRUE,0 ); 589 gtk_box_pack_start( GTK_BOX( vbox3 ),VBrightness,TRUE,TRUE,0 );
474 gtk_scale_set_value_pos( GTK_SCALE( VBrightness ),GTK_POS_RIGHT ); 590 gtk_scale_set_value_pos( GTK_SCALE( VBrightness ),GTK_POS_RIGHT );
475 591
476 VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 592 VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,1,0,0 ) );
477 VHue=gtk_hscale_new( VHueadj ); 593 VHue=gtk_hscale_new( VHueadj );
478 gtk_widget_set_name( VHue,"VHue" ); 594 gtk_widget_set_name( VHue,"VHue" );
479 gtk_widget_ref( VHue ); 595 gtk_widget_ref( VHue );
480 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VHue",VHue,(GtkDestroyNotify)gtk_widget_unref ); 596 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VHue",VHue,(GtkDestroyNotify)gtk_widget_unref );
481 gtk_widget_show( VHue ); 597 gtk_widget_show( VHue );
482 gtk_box_pack_start( GTK_BOX( vbox3 ),VHue,TRUE,TRUE,0 ); 598 gtk_box_pack_start( GTK_BOX( vbox3 ),VHue,TRUE,TRUE,0 );
483 gtk_scale_set_value_pos( GTK_SCALE( VHue ),GTK_POS_RIGHT ); 599 gtk_scale_set_value_pos( GTK_SCALE( VHue ),GTK_POS_RIGHT );
484 600
485 VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); 601 VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,1,0,0 ) );
486 VSaturation=gtk_hscale_new( VSaturationadj ); 602 VSaturation=gtk_hscale_new( VSaturationadj );
487 gtk_widget_set_name( VSaturation,"VSaturation" ); 603 gtk_widget_set_name( VSaturation,"VSaturation" );
488 gtk_widget_ref( VSaturation ); 604 gtk_widget_ref( VSaturation );
489 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VSaturation",VSaturation,(GtkDestroyNotify)gtk_widget_unref ); 605 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"VSaturation",VSaturation,(GtkDestroyNotify)gtk_widget_unref );
490 gtk_widget_show( VSaturation ); 606 gtk_widget_show( VSaturation );
503 gtk_widget_ref( hbuttonbox1 ); 619 gtk_widget_ref( hbuttonbox1 );
504 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"hbuttonbox1",hbuttonbox1,(GtkDestroyNotify)gtk_widget_unref ); 620 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"hbuttonbox1",hbuttonbox1,(GtkDestroyNotify)gtk_widget_unref );
505 gtk_widget_show( hbuttonbox1 ); 621 gtk_widget_show( hbuttonbox1 );
506 gtk_box_pack_end( GTK_BOX( vbox1 ),hbuttonbox1,FALSE,TRUE,0 ); 622 gtk_box_pack_end( GTK_BOX( vbox1 ),hbuttonbox1,FALSE,TRUE,0 );
507 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); 623 gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
624 gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),0 );
625
626 Clear=gtk_button_new_with_label( "Clear" );
627 gtk_widget_set_name( Clear,"Clear" );
628 gtk_widget_ref( Clear );
629 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"Clear",Clear,(GtkDestroyNotify)gtk_widget_unref );
630 gtk_widget_show( Clear );
631 gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),Clear );
632 GTK_WIDGET_UNSET_FLAGS( Clear,GTK_CAN_FOCUS );
633 GTK_WIDGET_SET_FLAGS( Clear,GTK_CAN_DEFAULT );
508 634
509 Ok=gtk_button_new_with_label( "Ok" ); 635 Ok=gtk_button_new_with_label( "Ok" );
510 gtk_widget_set_name( Ok,"Ok" ); 636 gtk_widget_set_name( Ok,"Ok" );
511 gtk_widget_ref( Ok ); 637 gtk_widget_ref( Ok );
512 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"Ok",Ok,(GtkDestroyNotify)gtk_widget_unref ); 638 gtk_object_set_data_full( GTK_OBJECT( Equalizer ),"Ok",Ok,(GtkDestroyNotify)gtk_widget_unref );
524 gtk_widget_show( hseparator1 ); 650 gtk_widget_show( hseparator1 );
525 gtk_box_pack_start( GTK_BOX( vbox1 ),hseparator1,FALSE,FALSE,0 ); 651 gtk_box_pack_start( GTK_BOX( vbox1 ),hseparator1,FALSE,FALSE,0 );
526 gtk_widget_set_usize( hseparator1,-2,5 ); 652 gtk_widget_set_usize( hseparator1,-2,5 );
527 653
528 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( eqDestroy ),NULL ); 654 gtk_signal_connect( GTK_OBJECT( Equalizer ),"destroy",GTK_SIGNAL_FUNC( eqDestroy ),NULL );
529 gtk_signal_connect( GTK_OBJECT( Equalizer ),"show",GTK_SIGNAL_FUNC( eqShow ),NULL ); 655 gtk_signal_connect( GTK_OBJECT( Equalizer ),"show",GTK_SIGNAL_FUNC( eqShow ),(void *)1 );
656 gtk_signal_connect( GTK_OBJECT( Equalizer ),"hide",GTK_SIGNAL_FUNC( eqShow ),(void *)0 );
530 gtk_signal_connect( GTK_OBJECT( ChannelsList ),"select_row",GTK_SIGNAL_FUNC( eqSelectChannelsListRow ),NULL ); 657 gtk_signal_connect( GTK_OBJECT( ChannelsList ),"select_row",GTK_SIGNAL_FUNC( eqSelectChannelsListRow ),NULL );
531 658
532 gtk_signal_connect( GTK_OBJECT( A3125 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)0 ); 659 gtk_signal_connect( GTK_OBJECT( A3125 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)0 );
533 gtk_signal_connect( GTK_OBJECT( A6250 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)1 ); 660 gtk_signal_connect( GTK_OBJECT( A6250 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)1 );
534 gtk_signal_connect( GTK_OBJECT( A125 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)2 ); 661 gtk_signal_connect( GTK_OBJECT( A125 ),"motion_notify_event",GTK_SIGNAL_FUNC( eqHScaleMotion ),(void*)2 );
543 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)1 ); 670 gtk_signal_connect( GTK_OBJECT( VContrast ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)1 );
544 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 ); 671 gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 );
545 gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 ); 672 gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 );
546 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 ); 673 gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 );
547 674
548 gtk_signal_connect( GTK_OBJECT( Ok ),"released",GTK_SIGNAL_FUNC( eqButtonReleased ),NULL ); 675 gtk_signal_connect( GTK_OBJECT( Ok ),"released",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 );
676 gtk_signal_connect( GTK_OBJECT( Clear ),"released",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 );
549 677
550 gtk_window_add_accel_group( GTK_WINDOW( Equalizer ),accel_group ); 678 gtk_window_add_accel_group( GTK_WINDOW( Equalizer ),accel_group );
551 679
552 return Equalizer; 680 return Equalizer;
553 } 681 }