From: Takashi Iwai Date: Tue, 24 May 2005 16:52:18 +0000 (+0000) Subject: Fix compile warnings X-Git-Tag: v1.0.9~2 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=2e27f490d597eaa9121f156883aa45676fcfa70f;p=alsa-tools.git Fix compile warnings Fix compile warnings regarding int <-> pointer conversion --- diff --git a/echomixer/echomixer.c b/echomixer/echomixer.c index 17c46c2..5178523 100644 --- a/echomixer/echomixer.c +++ b/echomixer/echomixer.c @@ -584,7 +584,7 @@ gint CheckInputs(gpointer unused) { if (source>=0 && source!=clocksrcVal) { // Set the clock source, but do not change the value of AutoClock - Clock_source_activate(clocksrc_menuitem[source], (gpointer)(source|DONT_CHANGE)); + Clock_source_activate(clocksrc_menuitem[source], (gpointer)(long)(source|DONT_CHANGE)); gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal); } return(TRUE); @@ -902,10 +902,10 @@ void Mixer_Input_selector_clicked(GtkWidget *widget, gpointer ich) { snd_ctl_elem_id_t *id; snd_ctl_elem_value_t *control; - if (mixerControl.input==(int)ich) + if (mixerControl.input==(int)(long)ich) return; - mixerControl.input=(int)ich; + mixerControl.input=(int)(long)ich; snd_ctl_elem_id_alloca(&id); snd_ctl_elem_value_alloca(&control); @@ -1061,7 +1061,7 @@ void Monitor_volume_changed(GtkWidget *widget, gpointer cnl) { UI_DEBUG(("Monitor_volume_changed() %d %d\n",mixerControl.input,mixerControl.output)); val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value); - ch=(int)cnl; + ch=(int)(long)cnl; #ifdef REVERSE i=ch; @@ -1093,9 +1093,9 @@ void Monitor_volume_changed(GtkWidget *widget, gpointer cnl) { void Monitor_volume_clicked(GtkWidget *widget, gpointer ch) { #ifdef REVERSE - mixerControl.input=(int)ch; + mixerControl.input=(int)(long)ch; #else - mixerControl.output=(int)ch; + mixerControl.output=(int)(long)ch; #endif } @@ -1118,15 +1118,15 @@ void PCM_volume_changed(GtkWidget *widget, gpointer ch) { snd_ctl_elem_id_alloca(&id); snd_ctl_elem_value_alloca(&control); - if ((int)chvalue); sprintf(str, "%+4.1f", 0.5*val); } else { // Output - channel=(int)ch-ECHO_MAXAUDIOINPUTS; + channel=(int)(long)ch-ECHO_MAXAUDIOINPUTS; vol=&pcmoutControl; val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value); pcmoutControl.Gain[channel]=val; @@ -1213,7 +1213,7 @@ void LineOut_volume_changed(GtkWidget *widget, gpointer ch) { char str[16]; int err, channel, val; - channel=(int)ch; + channel=(int)(long)ch; val=INVERT((int)GTK_ADJUSTMENT(widget)->value); lineoutControl.Gain[channel]=val; @@ -1251,7 +1251,7 @@ void Vmixer_volume_changed(GtkWidget *widget, gpointer ch) { int val, channel; int o, v; - channel=(int)ch; + channel=(int)(long)ch; #ifdef REVERSE v=channel; @@ -1279,10 +1279,10 @@ void Vmixer_volume_changed(GtkWidget *widget, gpointer ch) { void Vmixer_volume_clicked(GtkWidget *widget, gpointer ch) { #ifdef REVERSE - vmixerControl.vchannel=(int)ch; + vmixerControl.vchannel=(int)(long)ch; UI_DEBUG(("Vmixer_volume_clicked vch=%d\n",vmixerControl.vchannel)); #else - vmixerControl.output=(int)ch; + vmixerControl.output=(int)(long)ch; UI_DEBUG(("Vmixer_volume_clicked out=%d\n",vmixerControl.output)); #endif } @@ -1317,9 +1317,9 @@ void Vmixer_vchannel_selector_clicked(GtkWidget *widget, gpointer ch) { snd_ctl_elem_id_t *id; snd_ctl_elem_value_t *control; - if (vmixerControl.vchannel==(int)ch) + if (vmixerControl.vchannel==(int)(long)ch) return; - vmixerControl.vchannel=(int)ch; + vmixerControl.vchannel=(int)(long)ch; UI_DEBUG(("Vmixer_selector_clicked vch=%d\n",vmixerControl.vchannel)); snd_ctl_elem_id_alloca(&id); @@ -1346,11 +1346,11 @@ void Nominal_level_toggled(GtkWidget *widget, gpointer ch) { snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER); val=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - if ((int)chLevel[channel]=!val; @@ -1408,13 +1408,13 @@ void AutoClock_toggled(GtkWidget *widget, gpointer unused) { void Digital_mode_activate(GtkWidget *widget, gpointer mode) { int adat; - if (SetEnum(dmodeId, (int)mode)<0) { + if (SetEnum(dmodeId, (int)(long)mode)<0) { // Restore old value if it failed gtk_option_menu_set_history(GTK_OPTION_MENU(dmodeOpt), dmodeVal); return; } - dmodeVal=(int)mode; + dmodeVal=(int)(long)mode; // When I change the digital mode, the clock source can change too clocksrcVal=GetEnum(clocksrcId); gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal); @@ -1435,13 +1435,13 @@ void Digital_mode_activate(GtkWidget *widget, gpointer mode) { void Clock_source_activate(GtkWidget *widget, gpointer clk) { unsigned int source; - source=(unsigned int)clk & 0xff; + source=(unsigned int)(long)clk & 0xff; if (SetEnum(clocksrcId, source)<0) { gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal); } else { - clocksrcVal=(int)clk & 0xff; + clocksrcVal=(int)(long)clk & 0xff; // Change only when the user triggers it - if (((int)clk & DONT_CHANGE)==0 && AutoClock>=0) { + if (((int)(long)clk & DONT_CHANGE)==0 && AutoClock>=0) { AutoClock=clocksrcVal; AutoClock_toggled(autoclockChkbutton, NULL); } @@ -1452,8 +1452,8 @@ void Clock_source_activate(GtkWidget *widget, gpointer clk) { void SPDIF_mode_activate(GtkWidget *widget, gpointer mode) { - SetEnum(spdifmodeId, (int)mode); // This one should never fail - spdifmodeVal=(int)mode; + SetEnum(spdifmodeId, (int)(long)mode); // This one should never fail + spdifmodeVal=(int)(long)mode; } @@ -2050,7 +2050,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 1); gtk_widget_show(button); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), NominalIn.Level[i]); // Forces handler call - gtk_signal_connect(GTK_OBJECT(button), "toggled", GTK_SIGNAL_FUNC(Nominal_level_toggled), (gpointer)i); + gtk_signal_connect(GTK_OBJECT(button), "toggled", GTK_SIGNAL_FUNC(Nominal_level_toggled), (gpointer)(long)i); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), !NominalIn.Level[i]); } } @@ -2071,7 +2071,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 1); gtk_widget_show(button); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), NominalOut.Level[i]); - gtk_signal_connect(GTK_OBJECT(button), "toggled", GTK_SIGNAL_FUNC(Nominal_level_toggled), (gpointer)(i+ECHO_MAXAUDIOINPUTS)); + gtk_signal_connect(GTK_OBJECT(button), "toggled", GTK_SIGNAL_FUNC(Nominal_level_toggled), (gpointer)(long)(i+ECHO_MAXAUDIOINPUTS)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), !NominalOut.Level[i]); } } @@ -2093,7 +2093,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/ for (i=0; ivalue; char text[16]; @@ -226,7 +226,7 @@ void dac_volume_adjust(GtkAdjustment *adj, gpointer data) void adc_volume_adjust(GtkAdjustment *adj, gpointer data) { - int idx = (int)data; + int idx = (int)(long)data; snd_ctl_elem_value_t *val; int err, ival = -(int)adj->value; char text[16]; @@ -244,7 +244,7 @@ void adc_volume_adjust(GtkAdjustment *adj, gpointer data) void ipga_volume_adjust(GtkAdjustment *adj, gpointer data) { - int idx = (int)data; + int idx = (int)(long)data; snd_ctl_elem_value_t *val; int err, ival = -(int)adj->value; char text[16]; @@ -386,15 +386,15 @@ void analog_volume_postinit(void) for (i = 0; i < dac_volumes; i++) { dac_volume_update(i); - dac_volume_adjust((GtkAdjustment *)av_dac_volume_adj[i], (gpointer)i); + dac_volume_adjust((GtkAdjustment *)av_dac_volume_adj[i], (gpointer)(long)i); } for (i = 0; i < adc_volumes; i++) { adc_volume_update(i); - adc_volume_adjust((GtkAdjustment *)av_adc_volume_adj[i], (gpointer)i); + adc_volume_adjust((GtkAdjustment *)av_adc_volume_adj[i], (gpointer)(long)i); } for (i = 0; i < ipga_volumes; i++) { ipga_volume_update(i); - ipga_volume_adjust((GtkAdjustment *)av_ipga_volume_adj[i], (gpointer)i); + ipga_volume_adjust((GtkAdjustment *)av_ipga_volume_adj[i], (gpointer)(long)i); } for (i = 0; i < dac_senses; i++) dac_sense_update(i);