[PATCH] 1/5 echomixer GUI changes

[PATCH] 1/5 echomixer GUI changes

[Giuliano Pochini]

The following patch:

- Adds a frame that will hold many switches.

- Replaces the phantom power toggle button with a checkbutton inside the
frame.



Signed-off-by: Giuliano Pochini <pochini@shiny.it>


--- alsa-tools/echomixer/echomixer.c__orig	Sat Mar  5 14:32:43 2005
+++ alsa-tools/echomixer/echomixer.c	Thu Mar 31 19:57:02 2005
@@ -104,6 +104,7 @@
 int VUwidth, VUheight, Mixwidth, Mixheight;
 
 #define DONT_DRAW (ECHOGAIN_MUTED-1)
+#define DONT_CHANGE (1<<31)
 #define NOPOS 999999
 struct geometry {
   int st;		// window status: 0 = hidden ; 1 = visible ; NOPOS = no stored setting
@@ -188,7 +189,7 @@
 
 GtkWidget *p4dbuOut[ECHO_MAXAUDIOOUTPUTS], *p4dbuIn[ECHO_MAXAUDIOINPUTS];	// +4dBu/-10dBV toggles
 GtkWidget *clocksrc_menuitem[ECHO_CLOCKS];
-GtkWidget *dmodeOpt, *clocksrcOpt, *spdifmodeOpt, *phantomToggle;
+GtkWidget *dmodeOpt, *clocksrcOpt, *spdifmodeOpt, *phantomChkbutton;
 GtkWidget *window, *Mainwindow, *Miscwindow, *LVwindow, *VUwindow, *GMwindow;
 GtkWidget *VUdarea, *Mixdarea;
 gint VUtimer, Mixtimer, clocksrctimer;
@@ -447,7 +448,7 @@
   snd_ctl_elem_value_set_id(control, id);
   if ((err=snd_ctl_elem_read(ctlhandle, control))<0)
     printf("Control %s element read error: %s\n", card, snd_strerror(err));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(phantomToggle), snd_ctl_elem_value_get_integer(control, 0));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(phantomChkbutton), snd_ctl_elem_value_get_integer(control, 0));
 }
 
 
@@ -2142,20 +2143,23 @@
   }
 
 
+  // Switches
   if (phantomId) {
-    // Phantom power switch
-    frame=gtk_frame_new("Phantom power");
+    frame=gtk_frame_new("Switches");
     gtk_widget_show(frame);
     gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, FALSE, 0);
-    hbox=gtk_hbox_new(FALSE, 0);
+    hbox=gtk_vbox_new(FALSE, 0);
     gtk_widget_show(hbox);
     gtk_container_add(GTK_CONTAINER(frame), hbox);
 
-    phantomToggle=gtk_toggle_button_new_with_label("On");
-    gtk_widget_show(phantomToggle);
-    gtk_box_pack_start(GTK_BOX(hbox), phantomToggle, TRUE, FALSE, 0);
-    gtk_signal_connect(GTK_OBJECT(phantomToggle), "toggled", PhantomPower_toggled, (gpointer)0);
-    InitPhantomPowerGUI(phantomId);
+    if (phantomId) {
+      // Phantom power switch
+      phantomChkbutton=gtk_check_button_new_with_label("Phantom power");
+      gtk_widget_show(phantomChkbutton);
+      gtk_box_pack_start(GTK_BOX(hbox), phantomChkbutton, TRUE, FALSE, 0);
+      gtk_signal_connect(GTK_OBJECT(phantomChkbutton), "toggled", PhantomPower_toggled, NULL);
+      InitPhantomPowerGUI(phantomId);
+    }
   }
 
 



--
Giuliano.


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: [PATCH] 1/5 echomixer GUI changes

[Takashi Iwai]

At Sun, 3 Apr 2005 15:42:10 +0200,
Giuliano Pochini wrote:
> 
> 
> The following patch:
> 
> - Adds a frame that will hold many switches.
> 
> - Replaces the phantom power toggle button with a checkbutton inside the
> frame.
> 
> 
> 
> Signed-off-by: Giuliano Pochini <pochini@shiny.it>

Thanks, all patches are applied now.

BTW, the patch 3 was in quoted-printable.  Please avoid it at the next
time.


Takashi


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: [PATCH] 1/5 echomixer GUI changes

[Giuliano Pochini]

On Tue, 05 Apr 2005 19:30:58 +0200
Takashi Iwai <tiwai@suse.de> wrote:

> > Signed-off-by: Giuliano Pochini <pochini@shiny.it>
> 
> Thanks, all patches are applied now.
> 
> BTW, the patch 3 was in quoted-printable.  Please avoid it at the next
> time.

Yes, but I didn't use q-p...

latin-1 *8bit* test: à è é ì ò ù


--
Giuliano.


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id\x14396&op=click

Re: [PATCH] 1/5 echomixer GUI changes

[Clemens Ladisch]

Giuliano Pochini wrote:

> Takashi Iwai <tiwai@suse.de> wrote:
>
> > BTW, the patch 3 was in quoted-printable.  Please avoid it at the next
> > time.
>
> Yes, but I didn't use q-p...
>
> latin-1 *8bit* test: à è é ì ò ù

The mail from the SF list _does_ use quoted-printable.


Clemens



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click