mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile warnings

Browse source 
Fix compile warnings regarding int <-> pointer conversion
This commit is contained in:
Takashi Iwai 2005-05-24 16:52:18 +00:00
parent feb3195669
commit 2e27f490d5
3 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

80
echomixer/echomixer.c
View file

@ -584,7 +584,7 @@ gint CheckInputs(gpointer unused) {
if (source>=0 && source!=clocksrcVal) { if (source>=0 && source!=clocksrcVal) {
// Set the clock source, but do not change the value of AutoClock // 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); gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal);
} }
return(TRUE); return(TRUE);
@ -902,10 +902,10 @@ void Mixer_Input_selector_clicked(GtkWidget *widget, gpointer ich) {
snd_ctl_elem_id_t *id; snd_ctl_elem_id_t *id;
snd_ctl_elem_value_t *control; snd_ctl_elem_value_t *control;
if (mixerControl.input==(int)ich) if (mixerControl.input==(int)(long)ich)
return; return;
mixerControl.input=(int)ich; mixerControl.input=(int)(long)ich;
snd_ctl_elem_id_alloca(&id); snd_ctl_elem_id_alloca(&id);
snd_ctl_elem_value_alloca(&control); 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)); UI_DEBUG(("Monitor_volume_changed() %d %d\n",mixerControl.input,mixerControl.output));
val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value); val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value);
ch=(int)cnl; ch=(int)(long)cnl;
#ifdef REVERSE #ifdef REVERSE
i=ch; i=ch;
@ -1093,9 +1093,9 @@ void Monitor_volume_changed(GtkWidget *widget, gpointer cnl) {
void Monitor_volume_clicked(GtkWidget *widget, gpointer ch) { void Monitor_volume_clicked(GtkWidget *widget, gpointer ch) {
#ifdef REVERSE #ifdef REVERSE
mixerControl.input=(int)ch; mixerControl.input=(int)(long)ch;
#else #else
mixerControl.output=(int)ch; mixerControl.output=(int)(long)ch;
#endif #endif
} }
@ -1118,15 +1118,15 @@ void PCM_volume_changed(GtkWidget *widget, gpointer ch) {
snd_ctl_elem_id_alloca(&id); snd_ctl_elem_id_alloca(&id);
snd_ctl_elem_value_alloca(&control); snd_ctl_elem_value_alloca(&control);
if ((int)ch<ECHO_MAXAUDIOINPUTS) { if ((int)(long)ch<ECHO_MAXAUDIOINPUTS) {
// Input // Input
channel=(int)ch; channel=(int)(long)ch;
vol=&lineinControl; vol=&lineinControl;
rval=val=IN_INVERT((int)GTK_ADJUSTMENT(widget)->value); rval=val=IN_INVERT((int)GTK_ADJUSTMENT(widget)->value);
sprintf(str, "%+4.1f", 0.5*val); sprintf(str, "%+4.1f", 0.5*val);
} else { } else {
// Output // Output
channel=(int)ch-ECHO_MAXAUDIOINPUTS; channel=(int)(long)ch-ECHO_MAXAUDIOINPUTS;
vol=&pcmoutControl; vol=&pcmoutControl;
val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value); val=rval=INVERT((int)GTK_ADJUSTMENT(widget)->value);
pcmoutControl.Gain[channel]=val; pcmoutControl.Gain[channel]=val;
@ -1213,7 +1213,7 @@ void LineOut_volume_changed(GtkWidget *widget, gpointer ch) {
char str[16]; char str[16];
int err, channel, val; int err, channel, val;
channel=(int)ch; channel=(int)(long)ch;
val=INVERT((int)GTK_ADJUSTMENT(widget)->value); val=INVERT((int)GTK_ADJUSTMENT(widget)->value);
lineoutControl.Gain[channel]=val; lineoutControl.Gain[channel]=val;
@ -1251,7 +1251,7 @@ void Vmixer_volume_changed(GtkWidget *widget, gpointer ch) {
int val, channel; int val, channel;
int o, v; int o, v;
channel=(int)ch; channel=(int)(long)ch;
#ifdef REVERSE #ifdef REVERSE
v=channel; v=channel;
@ -1279,10 +1279,10 @@ void Vmixer_volume_changed(GtkWidget *widget, gpointer ch) {
void Vmixer_volume_clicked(GtkWidget *widget, gpointer ch) { void Vmixer_volume_clicked(GtkWidget *widget, gpointer ch) {
#ifdef REVERSE #ifdef REVERSE
vmixerControl.vchannel=(int)ch; vmixerControl.vchannel=(int)(long)ch;
UI_DEBUG(("Vmixer_volume_clicked vch=%d\n",vmixerControl.vchannel)); UI_DEBUG(("Vmixer_volume_clicked vch=%d\n",vmixerControl.vchannel));
#else #else
vmixerControl.output=(int)ch; vmixerControl.output=(int)(long)ch;
UI_DEBUG(("Vmixer_volume_clicked out=%d\n",vmixerControl.output)); UI_DEBUG(("Vmixer_volume_clicked out=%d\n",vmixerControl.output));
#endif #endif
} }
@ -1317,9 +1317,9 @@ void Vmixer_vchannel_selector_clicked(GtkWidget *widget, gpointer ch) {
snd_ctl_elem_id_t *id; snd_ctl_elem_id_t *id;
snd_ctl_elem_value_t *control; snd_ctl_elem_value_t *control;
if (vmixerControl.vchannel==(int)ch) if (vmixerControl.vchannel==(int)(long)ch)
return; return;
vmixerControl.vchannel=(int)ch; vmixerControl.vchannel=(int)(long)ch;
UI_DEBUG(("Vmixer_selector_clicked vch=%d\n",vmixerControl.vchannel)); UI_DEBUG(("Vmixer_selector_clicked vch=%d\n",vmixerControl.vchannel));
snd_ctl_elem_id_alloca(&id); 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); snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
val=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); val=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
if ((int)ch<ECHO_MAXAUDIOINPUTS) { if ((int)(long)ch<ECHO_MAXAUDIOINPUTS) {
channel=(int)ch; channel=(int)(long)ch;
NominalLevel=&NominalIn; NominalLevel=&NominalIn;
} else { } else {
channel=(int)ch-ECHO_MAXAUDIOINPUTS; channel=(int)(long)ch-ECHO_MAXAUDIOINPUTS;
NominalLevel=&NominalOut; NominalLevel=&NominalOut;
} }
NominalLevel->Level[channel]=!val; NominalLevel->Level[channel]=!val;
@ -1408,13 +1408,13 @@ void AutoClock_toggled(GtkWidget *widget, gpointer unused) {
void Digital_mode_activate(GtkWidget *widget, gpointer mode) { void Digital_mode_activate(GtkWidget *widget, gpointer mode) {
int adat; int adat;
if (SetEnum(dmodeId, (int)mode)<0) { if (SetEnum(dmodeId, (int)(long)mode)<0) {
// Restore old value if it failed // Restore old value if it failed
gtk_option_menu_set_history(GTK_OPTION_MENU(dmodeOpt), dmodeVal); gtk_option_menu_set_history(GTK_OPTION_MENU(dmodeOpt), dmodeVal);
return; return;
} }
dmodeVal=(int)mode; dmodeVal=(int)(long)mode;
// When I change the digital mode, the clock source can change too // When I change the digital mode, the clock source can change too
clocksrcVal=GetEnum(clocksrcId); clocksrcVal=GetEnum(clocksrcId);
gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal); 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) { void Clock_source_activate(GtkWidget *widget, gpointer clk) {
unsigned int source; unsigned int source;
source=(unsigned int)clk & 0xff; source=(unsigned int)(long)clk & 0xff;
if (SetEnum(clocksrcId, source)<0) { if (SetEnum(clocksrcId, source)<0) {
gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal); gtk_option_menu_set_history(GTK_OPTION_MENU(clocksrcOpt), clocksrcVal);
} else { } else {
clocksrcVal=(int)clk & 0xff; clocksrcVal=(int)(long)clk & 0xff;
// Change only when the user triggers it // 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=clocksrcVal;
AutoClock_toggled(autoclockChkbutton, NULL); AutoClock_toggled(autoclockChkbutton, NULL);
} }
@ -1452,8 +1452,8 @@ void Clock_source_activate(GtkWidget *widget, gpointer clk) {
void SPDIF_mode_activate(GtkWidget *widget, gpointer mode) { void SPDIF_mode_activate(GtkWidget *widget, gpointer mode) {
SetEnum(spdifmodeId, (int)mode); // This one should never fail SetEnum(spdifmodeId, (int)(long)mode); // This one should never fail
spdifmodeVal=(int)mode; 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_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 1);
gtk_widget_show(button); gtk_widget_show(button);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), NominalIn.Level[i]); // Forces handler call 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]); 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_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 1);
gtk_widget_show(button); gtk_widget_show(button);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), NominalOut.Level[i]); 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]); 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; i<ndmodes; i++) { for (i=0; i<ndmodes; i++) {
menuitem=gtk_menu_item_new_with_label(dmodeName[i]); menuitem=gtk_menu_item_new_with_label(dmodeName[i]);
gtk_widget_show(menuitem); gtk_widget_show(menuitem);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate", Digital_mode_activate, (gpointer)i); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", Digital_mode_activate, (gpointer)(long)i);
gtk_menu_append(GTK_MENU(menu), menuitem); gtk_menu_append(GTK_MENU(menu), menuitem);
} }
gtk_option_menu_set_menu(GTK_OPTION_MENU(dmodeOpt), menu); gtk_option_menu_set_menu(GTK_OPTION_MENU(dmodeOpt), menu);
@ -2119,7 +2119,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
clocksrc_menuitem[i]=gtk_menu_item_new_with_label(clocksrcName[i]); clocksrc_menuitem[i]=gtk_menu_item_new_with_label(clocksrcName[i]);
gtk_widget_show(clocksrc_menuitem[i]); gtk_widget_show(clocksrc_menuitem[i]);
gtk_widget_set_sensitive(clocksrc_menuitem[i], FALSE); gtk_widget_set_sensitive(clocksrc_menuitem[i], FALSE);
gtk_signal_connect(GTK_OBJECT(clocksrc_menuitem[i]), "activate", Clock_source_activate, (gpointer)i); gtk_signal_connect(GTK_OBJECT(clocksrc_menuitem[i]), "activate", Clock_source_activate, (gpointer)(long)i);
gtk_menu_append(GTK_MENU(menu), clocksrc_menuitem[i]); gtk_menu_append(GTK_MENU(menu), clocksrc_menuitem[i]);
} }
gtk_option_menu_set_menu(GTK_OPTION_MENU(clocksrcOpt), menu); gtk_option_menu_set_menu(GTK_OPTION_MENU(clocksrcOpt), menu);
@ -2145,7 +2145,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
for (i=0; i<nspdifmodes; i++) { for (i=0; i<nspdifmodes; i++) {
menuitem=gtk_menu_item_new_with_label(spdifmodeName[i]); menuitem=gtk_menu_item_new_with_label(spdifmodeName[i]);
gtk_widget_show(menuitem); gtk_widget_show(menuitem);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate", SPDIF_mode_activate, (gpointer)i); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", SPDIF_mode_activate, (gpointer)(long)i);
gtk_menu_append(GTK_MENU(menu), menuitem); gtk_menu_append(GTK_MENU(menu), menuitem);
} }
gtk_option_menu_set_menu(GTK_OPTION_MENU(spdifmodeOpt), menu); gtk_option_menu_set_menu(GTK_OPTION_MENU(spdifmodeOpt), menu);
@ -2242,7 +2242,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
gtk_widget_show(pcmoutControl.volume[i]); gtk_widget_show(pcmoutControl.volume[i]);
gtk_box_pack_start(GTK_BOX(vbox), pcmoutControl.volume[i], TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), pcmoutControl.volume[i], TRUE, TRUE, 0);
gtk_scale_set_draw_value(GTK_SCALE(pcmoutControl.volume[i]), 0); gtk_scale_set_draw_value(GTK_SCALE(pcmoutControl.volume[i]), 0);
gtk_signal_connect(GTK_OBJECT(pcmoutControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(PCM_volume_changed), (gpointer)(i+ECHO_MAXAUDIOINPUTS)); gtk_signal_connect(GTK_OBJECT(pcmoutControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(PCM_volume_changed), (gpointer)(long)(i+ECHO_MAXAUDIOINPUTS));
// Value label // Value label
pcmoutControl.label[i]=gtk_label_new("xxx"); pcmoutControl.label[i]=gtk_label_new("xxx");
gtk_widget_show(pcmoutControl.label[i]); gtk_widget_show(pcmoutControl.label[i]);
@ -2295,7 +2295,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
gtk_widget_show(lineinControl.volume[i]); gtk_widget_show(lineinControl.volume[i]);
gtk_box_pack_start(GTK_BOX(vbox), lineinControl.volume[i], TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), lineinControl.volume[i], TRUE, TRUE, 0);
gtk_scale_set_draw_value(GTK_SCALE(lineinControl.volume[i]), 0); gtk_scale_set_draw_value(GTK_SCALE(lineinControl.volume[i]), 0);
gtk_signal_connect(GTK_OBJECT(lineinControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(PCM_volume_changed), (gpointer)i); gtk_signal_connect(GTK_OBJECT(lineinControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(PCM_volume_changed), (gpointer)(long)i);
// Value label // Value label
lineinControl.label[i]=gtk_label_new("xxx"); lineinControl.label[i]=gtk_label_new("xxx");
gtk_widget_show(lineinControl.label[i]); gtk_widget_show(lineinControl.label[i]);
@ -2334,7 +2334,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
gtk_widget_show(lineoutControl.volume[i]); gtk_widget_show(lineoutControl.volume[i]);
gtk_box_pack_start(GTK_BOX(vbox), lineoutControl.volume[i], TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), lineoutControl.volume[i], TRUE, TRUE, 0);
gtk_scale_set_draw_value(GTK_SCALE(lineoutControl.volume[i]), 0); gtk_scale_set_draw_value(GTK_SCALE(lineoutControl.volume[i]), 0);
gtk_signal_connect(GTK_OBJECT(lineoutControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(LineOut_volume_changed), (gpointer)i); gtk_signal_connect(GTK_OBJECT(lineoutControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(LineOut_volume_changed), (gpointer)(long)i);
// Value label // Value label
lineoutControl.label[i]=gtk_label_new("xxx"); lineoutControl.label[i]=gtk_label_new("xxx");
gtk_widget_show(lineoutControl.label[i]); gtk_widget_show(lineoutControl.label[i]);
@ -2449,7 +2449,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
mixerControl.inpsel[i]=gtk_radio_button_new_with_label(bgroup, str); mixerControl.inpsel[i]=gtk_radio_button_new_with_label(bgroup, str);
gtk_widget_show(mixerControl.inpsel[i]); gtk_widget_show(mixerControl.inpsel[i]);
gtk_box_pack_start(GTK_BOX(vbsel), mixerControl.inpsel[i], FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbsel), mixerControl.inpsel[i], FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(mixerControl.inpsel[i]), "toggled", GTK_SIGNAL_FUNC(Mixer_Input_selector_clicked), (gpointer)i); gtk_signal_connect(GTK_OBJECT(mixerControl.inpsel[i]), "toggled", GTK_SIGNAL_FUNC(Mixer_Input_selector_clicked), (gpointer)(long)i);
} }
// Mixer volume widgets // Mixer volume widgets
@ -2478,8 +2478,8 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
gtk_widget_show(mixerControl.volume[i]); gtk_widget_show(mixerControl.volume[i]);
gtk_box_pack_start(GTK_BOX(vbox), mixerControl.volume[i], TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), mixerControl.volume[i], TRUE, TRUE, 0);
gtk_scale_set_draw_value(GTK_SCALE(mixerControl.volume[i]), 0); gtk_scale_set_draw_value(GTK_SCALE(mixerControl.volume[i]), 0);
gtk_signal_connect(GTK_OBJECT(mixerControl.volume[i]), "grab_focus", GTK_SIGNAL_FUNC(Monitor_volume_clicked), (gpointer)i); gtk_signal_connect(GTK_OBJECT(mixerControl.volume[i]), "grab_focus", GTK_SIGNAL_FUNC(Monitor_volume_clicked), (gpointer)(long)i);
gtk_signal_connect(GTK_OBJECT(mixerControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(Monitor_volume_changed), (gpointer)i); gtk_signal_connect(GTK_OBJECT(mixerControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(Monitor_volume_changed), (gpointer)(long)i);
// Value label // Value label
mixerControl.label[i]=gtk_label_new("xxx"); mixerControl.label[i]=gtk_label_new("xxx");
gtk_widget_show(mixerControl.label[i]); gtk_widget_show(mixerControl.label[i]);
@ -2587,7 +2587,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
vmixerControl.vchsel[i]=gtk_radio_button_new_with_label(bgroup, str); vmixerControl.vchsel[i]=gtk_radio_button_new_with_label(bgroup, str);
gtk_widget_show(vmixerControl.vchsel[i]); gtk_widget_show(vmixerControl.vchsel[i]);
gtk_box_pack_start(GTK_BOX(vbsel), vmixerControl.vchsel[i], FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbsel), vmixerControl.vchsel[i], FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(vmixerControl.vchsel[i]), "toggled", GTK_SIGNAL_FUNC(Vmixer_vchannel_selector_clicked), (gpointer)i); gtk_signal_connect(GTK_OBJECT(vmixerControl.vchsel[i]), "toggled", GTK_SIGNAL_FUNC(Vmixer_vchannel_selector_clicked), (gpointer)(long)i);
} }
// Vmixer volume widgets // Vmixer volume widgets
@ -2616,8 +2616,8 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
gtk_widget_show(vmixerControl.volume[i]); gtk_widget_show(vmixerControl.volume[i]);
gtk_box_pack_start(GTK_BOX(vbox), vmixerControl.volume[i], TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), vmixerControl.volume[i], TRUE, TRUE, 0);
gtk_scale_set_draw_value(GTK_SCALE(vmixerControl.volume[i]), 0); gtk_scale_set_draw_value(GTK_SCALE(vmixerControl.volume[i]), 0);
gtk_signal_connect(GTK_OBJECT(vmixerControl.volume[i]), "grab_focus", GTK_SIGNAL_FUNC(Vmixer_volume_clicked), (gpointer)i); gtk_signal_connect(GTK_OBJECT(vmixerControl.volume[i]), "grab_focus", GTK_SIGNAL_FUNC(Vmixer_volume_clicked), (gpointer)(long)i);
gtk_signal_connect(GTK_OBJECT(vmixerControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(Vmixer_volume_changed), (gpointer)i); gtk_signal_connect(GTK_OBJECT(vmixerControl.adj[i]), "value_changed", GTK_SIGNAL_FUNC(Vmixer_volume_changed), (gpointer)(long)i);
// Value label // Value label
vmixerControl.label[i]=gtk_label_new("xxx"); vmixerControl.label[i]=gtk_label_new("xxx");
gtk_widget_show(vmixerControl.label[i]); gtk_widget_show(vmixerControl.label[i]);
@ -2748,7 +2748,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
Gang=1; Gang=1;
if (dmodeId) if (dmodeId)
Digital_mode_activate(dmodeOpt, (gpointer)dmodeVal); // Also calls SetSensitivity() Digital_mode_activate(dmodeOpt, (gpointer)(long)dmodeVal); // Also calls SetSensitivity()
gtk_widget_show(Mainwindow); gtk_widget_show(Mainwindow);
gtk_main(); gtk_main();

24
envy24control/envy24control.c
View file

@ -190,7 +190,7 @@ static void create_mixer_frame(GtkWidget *box, int stream)
gtk_scale_set_digits(GTK_SCALE(vscale), 0); gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed", gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(mixer_adjust), GTK_SIGNAL_FUNC(mixer_adjust),
(gpointer)((stream << 16) + 0)); (gpointer)(long)((stream << 16) + 0));
vbox1 = gtk_vbox_new(FALSE, 0); vbox1 = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox1); gtk_widget_show(vbox1);
@ -223,7 +223,7 @@ static void create_mixer_frame(GtkWidget *box, int stream)
gtk_scale_set_digits(GTK_SCALE(vscale), 0); gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed", gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(mixer_adjust), GTK_SIGNAL_FUNC(mixer_adjust),
(gpointer)((stream << 16) + 1)); (gpointer)(long)((stream << 16) + 1));
hbox = gtk_hbox_new(TRUE, 0); hbox = gtk_hbox_new(TRUE, 0);
gtk_widget_show(hbox); gtk_widget_show(hbox);
@ -256,7 +256,7 @@ static void create_mixer_frame(GtkWidget *box, int stream)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled", gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
GTK_SIGNAL_FUNC(mixer_toggled_mute), GTK_SIGNAL_FUNC(mixer_toggled_mute),
(gpointer)((stream << 16) + 0)); (gpointer)(long)((stream << 16) + 0));
toggle = gtk_toggle_button_new_with_label("Mute"); toggle = gtk_toggle_button_new_with_label("Mute");
mixer_mute_toggle[stream-1][1] = toggle; mixer_mute_toggle[stream-1][1] = toggle;
@ -265,7 +265,7 @@ static void create_mixer_frame(GtkWidget *box, int stream)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled", gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
GTK_SIGNAL_FUNC(mixer_toggled_mute), GTK_SIGNAL_FUNC(mixer_toggled_mute),
(gpointer)((stream << 16) + 1)); (gpointer)(long)((stream << 16) + 1));
} }
static void create_mixer(GtkWidget *main, GtkWidget *notebook, int page) static void create_mixer(GtkWidget *main, GtkWidget *notebook, int page)
@ -454,7 +454,7 @@ static void create_router_frame(GtkWidget *box, int stream, int pos)
gtk_box_pack_start(GTK_BOX(vbox), radiobutton, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), radiobutton, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled", gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
(GtkSignalFunc)patchbay_toggled, (GtkSignalFunc)patchbay_toggled,
(gpointer)((stream << 16) + 0)); (gpointer)(long)((stream << 16) + 0));
hseparator = gtk_hseparator_new(); hseparator = gtk_hseparator_new();
@ -476,7 +476,7 @@ static void create_router_frame(GtkWidget *box, int stream, int pos)
radiobutton, FALSE, FALSE, 0); radiobutton, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled", gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
(GtkSignalFunc)patchbay_toggled, (GtkSignalFunc)patchbay_toggled,
(gpointer)((stream << 16) + 1)); (gpointer)(long)((stream << 16) + 1));
} }
else { else {
label = gtk_label_new(""); label = gtk_label_new("");
@ -499,7 +499,7 @@ static void create_router_frame(GtkWidget *box, int stream, int pos)
radiobutton, FALSE, FALSE, 0); radiobutton, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled", gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
(GtkSignalFunc)patchbay_toggled, (GtkSignalFunc)patchbay_toggled,
(gpointer)((stream << 16) + 2 + idx)); (gpointer)(long)((stream << 16) + 2 + idx));
} }
} }
@ -1548,7 +1548,7 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
gtk_scale_set_digits(GTK_SCALE(vscale), 0); gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed", gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(dac_volume_adjust), GTK_SIGNAL_FUNC(dac_volume_adjust),
(gpointer)(i)); (gpointer)(long)(i));
label = gtk_label_new("000"); label = gtk_label_new("000");
av_dac_volume_label[i] =(GtkLabel *)label; av_dac_volume_label[i] =(GtkLabel *)label;
@ -1566,7 +1566,7 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
gtk_widget_show(radiobutton); gtk_widget_show(radiobutton);
gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled", gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
(GtkSignalFunc)dac_sense_toggled, (GtkSignalFunc)dac_sense_toggled,
(gpointer)((i << 8) + j)); (gpointer)(long)((i << 8) + j));
gtk_box_pack_start(GTK_BOX(vbox), gtk_box_pack_start(GTK_BOX(vbox),
radiobutton, FALSE, TRUE, 0); radiobutton, FALSE, TRUE, 0);
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton)); group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
@ -1605,7 +1605,7 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
gtk_scale_set_digits(GTK_SCALE(vscale), 0); gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed", gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(adc_volume_adjust), GTK_SIGNAL_FUNC(adc_volume_adjust),
(gpointer)(i)); (gpointer)(long)(i));
label = gtk_label_new("000"); label = gtk_label_new("000");
av_adc_volume_label[i] =(GtkLabel *)label; av_adc_volume_label[i] =(GtkLabel *)label;
@ -1622,7 +1622,7 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
gtk_widget_show(radiobutton); gtk_widget_show(radiobutton);
gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled", gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
(GtkSignalFunc)adc_sense_toggled, (GtkSignalFunc)adc_sense_toggled,
(gpointer)((i << 8) + j)); (gpointer)(long)((i << 8) + j));
gtk_box_pack_start(GTK_BOX(vbox), gtk_box_pack_start(GTK_BOX(vbox),
radiobutton, FALSE, TRUE, 0); radiobutton, FALSE, TRUE, 0);
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton)); group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
@ -1661,7 +1661,7 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
gtk_scale_set_digits(GTK_SCALE(vscale), 0); gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed", gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(ipga_volume_adjust), GTK_SIGNAL_FUNC(ipga_volume_adjust),
(gpointer)(i)); (gpointer)(long)(i));
label = gtk_label_new("000"); label = gtk_label_new("000");
av_ipga_volume_label[i] = (GtkLabel *)label; av_ipga_volume_label[i] = (GtkLabel *)label;

12
envy24control/volume.c
View file

@ -208,7 +208,7 @@ void adc_sense_update(int idx)
void dac_volume_adjust(GtkAdjustment *adj, gpointer data) void dac_volume_adjust(GtkAdjustment *adj, gpointer data)
{ {
int idx = (int)data; int idx = (int)(long)data;
snd_ctl_elem_value_t *val; snd_ctl_elem_value_t *val;
int err, ival = -(int)adj->value; int err, ival = -(int)adj->value;
char text[16]; char text[16];
@ -226,7 +226,7 @@ void dac_volume_adjust(GtkAdjustment *adj, gpointer data)
void adc_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; snd_ctl_elem_value_t *val;
int err, ival = -(int)adj->value; int err, ival = -(int)adj->value;
char text[16]; char text[16];
@ -244,7 +244,7 @@ void adc_volume_adjust(GtkAdjustment *adj, gpointer data)
void ipga_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; snd_ctl_elem_value_t *val;
int err, ival = -(int)adj->value; int err, ival = -(int)adj->value;
char text[16]; char text[16];
@ -386,15 +386,15 @@ void analog_volume_postinit(void)
for (i = 0; i < dac_volumes; i++) { for (i = 0; i < dac_volumes; i++) {
dac_volume_update(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++) { for (i = 0; i < adc_volumes; i++) {
adc_volume_update(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++) { for (i = 0; i < ipga_volumes; i++) {
ipga_volume_update(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++) for (i = 0; i < dac_senses; i++)
dac_sense_update(i); dac_sense_update(i);