Envy24control access to 6Fire controls
PATCH 1/1 Envy24control access to 6Fire controls
Hi,
This patch against the stable version of envy24control gives access to most of the Terratec DMX 6Fire mixer controls. It also changes the lables on the inputs in the monitor mixer to be more useful. It should have no effect on your envy24control if you are using a card other than the 6Fire.
Note that I'm not a programmer, so there might be huge errors in this... Dan
envy24control/envy24control.c +228 -2
@@ -94,6 +94,20 @@GtkWidget *hw_spdif_input_coaxial_radio;GtkWidget *hw_spdif_input_optical_radio; +GtkWidget *input_interface_internal; +GtkWidget *input_interface_front_input; +GtkWidget *input_interface_rear_input; +GtkWidget *input_interface_wavetable; + +GtkWidget *hw_breakbox_led_on_radio; +GtkWidget *hw_breakbox_led_off_radio; + +GtkWidget *hw_phono_input_on_radio; +GtkWidget *hw_phono_input_off_radio; + +GtkWidget *hw_spdif_switch_on_radio; +GtkWidget *hw_spdif_switch_off_radio; +GtkObject *av_dac_volume_adj[10 ];GtkObject *av_adc_volume_adj[10 ];GtkObject *av_ipga_volume_adj[10 ];
@@ -119,6 +133,18 @@if (stream <=10 ) {sprintf (str,"PCM Out %i" , stream); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==11 )) { +sprintf (str,"CD In L" ); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==12 )) { +sprintf (str,"CD In R" ); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==13 )) { +sprintf (str,"Line In L" ); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==14 )) { +sprintf (str,"Line In R" ); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==15 )) { +sprintf (str,"Phono/Mic In L" ); + }else if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) && (stream ==16 )) { +sprintf (str,"Phono/Mic In R" ); }else if (stream <=18 ) {sprintf (str,"H/W In %i" , stream -10 ); }else if (stream ==19 ) {
@@ -1092,7 +1118,7 @@GSList *group =NULL ;int hide =1 ; -if (card_eeprom.subvendor ==ICE1712_SUBDEVICE_DELTADIO2496 ) +if ((card_eeprom.subvendor ==ICE1712_SUBDEVICE_DELTADIO2496 ) || (card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE )) hide =0 ; frame =gtk_frame_new ("S/PDIF Input" );
@@ -1127,11 +1153,202 @@gtk_widget_hide_all (frame); } +static void create_spdif_on_off (GtkWidget *box) +{ +GtkWidget *frame; +GtkWidget *vbox; +GtkWidget *radiobutton; +GSList *group =NULL ; +int hide =1 ; + +if ( card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) + hide =0 ; + + frame =gtk_frame_new ("S/PDIF On/Off" ); +gtk_widget_show (frame); +gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE,0 ); +gtk_container_set_border_width (GTK_CONTAINER (frame),6 ); + + vbox =gtk_vbox_new (FALSE,0 ); +gtk_widget_show (vbox); +gtk_container_add (GTK_CONTAINER (frame), vbox); +gtk_container_set_border_width (GTK_CONTAINER (vbox),6 ); + + radiobutton =gtk_radio_button_new_with_label (group,"On" ); + hw_spdif_switch_on_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )spdif_on_off_toggled, + (gpointer )"On" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Off" ); + hw_spdif_switch_off_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )spdif_on_off_toggled, + (gpointer )"Off" ); + +if (hide) +gtk_widget_hide_all (frame); +} + +static void create_breakbox_led (GtkWidget *box) +{ +GtkWidget *frame; +GtkWidget *vbox; +GtkWidget *radiobutton; +GSList *group =NULL ; +int hide =1 ; + +if ( card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) + hide =0 ; + + frame =gtk_frame_new ("Breakbox LED On/Off" ); +gtk_widget_show (frame); +gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE,0 ); +gtk_container_set_border_width (GTK_CONTAINER (frame),6 ); + + vbox =gtk_vbox_new (FALSE,0 ); +gtk_widget_show (vbox); +gtk_container_add (GTK_CONTAINER (frame), vbox); +gtk_container_set_border_width (GTK_CONTAINER (vbox),6 ); + + radiobutton =gtk_radio_button_new_with_label (group,"On" ); + hw_breakbox_led_on_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )breakbox_led_toggled, + (gpointer )"On" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Off" ); + hw_breakbox_led_off_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )breakbox_led_toggled, + (gpointer )"Off" ); + +if (hide) +gtk_widget_hide_all (frame); +} + +static void create_phono_input (GtkWidget *box) +{ +GtkWidget *frame; +GtkWidget *vbox; +GtkWidget *radiobutton; +GSList *group =NULL ; +int hide =1 ; + +if ( card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) + hide =0 ; + + frame =gtk_frame_new ("Phono Input Switch" ); +gtk_widget_show (frame); +gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE,0 ); +gtk_container_set_border_width (GTK_CONTAINER (frame),6 ); + + vbox =gtk_vbox_new (FALSE,0 ); +gtk_widget_show (vbox); +gtk_container_add (GTK_CONTAINER (frame), vbox); +gtk_container_set_border_width (GTK_CONTAINER (vbox),6 ); + + radiobutton =gtk_radio_button_new_with_label (group,"Phono" ); + hw_phono_input_on_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )phono_input_toggled, + (gpointer )"Phono" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Mic" ); + hw_phono_input_off_radio = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )phono_input_toggled, + (gpointer )"Mic" ); + +if (hide) +gtk_widget_hide_all (frame); +} + +static void create_input_interface (GtkWidget *box) +{ +GtkWidget *frame; +GtkWidget *vbox; +GtkWidget *radiobutton; +GSList *group =NULL ; +int hide =1 ; + +if ( card_eeprom.subvendor ==ICE1712_SUBDEVICE_DMX6FIRE ) + hide =0 ; + + frame =gtk_frame_new ("Line In Selector" ); +gtk_widget_show (frame); +gtk_box_pack_start (GTK_BOX (box), frame, FALSE, TRUE,0 ); +gtk_container_set_border_width (GTK_CONTAINER (frame),6 ); + + vbox =gtk_vbox_new (FALSE,0 ); +gtk_widget_show (vbox); +gtk_container_add (GTK_CONTAINER (frame), vbox); +gtk_container_set_border_width (GTK_CONTAINER (vbox),6 ); + + radiobutton =gtk_radio_button_new_with_label (group,"Internal" ); + input_interface_internal = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )analog_input_select_toggled, + (gpointer )"Internal" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Front Input" ); + input_interface_front_input = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )analog_input_select_toggled, + (gpointer )"Front Input" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Rear Input" ); + input_interface_rear_input = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )analog_input_select_toggled, + (gpointer )"Rear Input" ); + + radiobutton =gtk_radio_button_new_with_label (group,"Wave Table" ); + input_interface_wavetable = radiobutton; + group =gtk_radio_button_group (GTK_RADIO_BUTTON (radiobutton)); +gtk_widget_show (radiobutton); +gtk_box_pack_start (GTK_BOX (vbox), radiobutton, FALSE, FALSE,0 ); +gtk_signal_connect (GTK_OBJECT (radiobutton),"toggled" , + (GtkSignalFunc )analog_input_select_toggled, + (gpointer )"Wave Table" ); + +if (hide) +gtk_widget_hide_all (frame); +} +static void create_hardware (GtkWidget *main,GtkWidget *notebook,int page) {GtkWidget *label;GtkWidget *hbox;GtkWidget *vbox; +GtkWidget *vbox2; hbox =gtk_hbox_new (FALSE,0 );gtk_widget_show (hbox);
@@ -1148,6 +1365,11 @@gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE,0 );gtk_container_set_border_width (GTK_CONTAINER (vbox),6 ); + vbox2 =gtk_vbox_new (FALSE,0 ); +gtk_widget_show (vbox2); +gtk_box_pack_end (GTK_BOX (hbox),vbox2, FALSE, FALSE,0 ); +gtk_container_set_border_width (GTK_CONTAINER (vbox2),6 ); +create_master_clock (vbox);create_rate_state (vbox);create_actual_rate (vbox);
@@ -1155,7 +1377,11 @@create_spdif_output_settings (hbox); -create_spdif_input_select (hbox); +create_spdif_input_select (vbox2); +create_input_interface (vbox2); +create_breakbox_led (vbox2); +create_phono_input (vbox2); +create_spdif_on_off (vbox2); }static void create_about (GtkWidget *main,GtkWidget *notebook,int page)
envy24control/envy24control.h +18 -0
@@ -109,6 +109,19 @@extern GtkWidget *hw_spdif_input_coaxial_radio;extern GtkWidget *hw_spdif_input_optical_radio; +extern GtkWidget *hw_breakbox_led_on_radio; +extern GtkWidget *hw_breakbox_led_off_radio; + +extern GtkWidget *hw_phono_input_on_radio; +extern GtkWidget *hw_phono_input_off_radio; + +extern GtkWidget *hw_spdif_switch_on_radio; +extern GtkWidget *hw_spdif_switch_off_radio; + +extern GtkWidget *input_interface_internal; +extern GtkWidget *input_interface_front_input; +extern GtkWidget *input_interface_rear_input; +extern GtkWidget *input_interface_wavetable;extern GtkObject *av_dac_volume_adj[];extern GtkObject *av_adc_volume_adj[];extern GtkObject *av_ipga_volume_adj[];
@@ -158,6 +171,11 @@void spdif_output_toggled (GtkWidget *togglebutton,gpointer data);void spdif_input_update (void );void spdif_input_toggled (GtkWidget *togglebutton,gpointer data); +void analog_input_select_toggled (GtkWidget *togglebutton,gpointer data); +void breakbox_led_toggled (GtkWidget *togglebutton,gpointer data); +void spdif_on_off_toggled (GtkWidget *togglebutton,gpointer data); +void phono_input_toggled (GtkWidget *togglebutton,gpointer data); +void hardware_init (void );void hardware_postinit (void );void analog_volume_init (void );
envy24control/hardware.c +171 -2
212 lines not on this page · raw message
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
Hi Daniel,
Quoted 2 lines
This patch against the stable version of envy24control gives access to most of the Terratec DMX 6Fire mixer controls. It also changes the lables on the inputs in the monitor mixer to be more useful. It should have no effect on your envy24control if you are using a card other than the 6Fire.
Works fine for me, nice to finally have the input switches available in envy24control. Though envy24control really is flexible, I always wished to have an less complex mixer for the DMX6Fire, but never took the time to write one or patch e24c for that purpuse. So if you ever get in that mood again, it would be nice if you could also change the other labels in the patchbay/router tab and the analog volume tab. (ADC0->In CD L , ADC1->In CD R, ..., IGPA 0 -> Gain CD-L, IPGA 1 -> Gain CD-R ...).
And I really wish I had a mixer that would handle the stereo channels as what they are. Its annoying to have 6 sliders for adjusting the volume of your line-in, for example, but since you're no programmer, you probably won't fix that :)
Quoted 2 lines
Note that I'm not a programmer, so there might be huge errors in this...
Haven't really looked at the code, but it seems to work flawlessly.
gruß,
Steffen
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
At Wed, 29 Oct 2003 23:22:57 +0000,
Quoted 3 lines · Daniel Ankers
Hi,
This patch against the stable version of envy24control gives access to most of the Terratec DMX 6Fire mixer controls. It also changes the lables on the inputs in the monitor mixer to be more useful. It should have no effect on your envy24control if you are using a card other than the 6Fire.
thanks for the patch!
applied to cvs now.
ciao,
Takashi
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/