[xiph-cvs] cvs commit: postfish mainpanel.c version.h

[Monty]

xiphmont    03/10/16 18:11:12

  Modified:    .        mainpanel.c version.h
  Log:
  connect master activation toggle

Revision  Changes    Path
1.14      +10 -4     postfish/mainpanel.c

Index: mainpanel.c
===================================================================
RCS file: /usr/local/cvsroot/postfish/mainpanel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mainpanel.c	16 Oct 2003 22:03:36 -0000	1.13
+++ mainpanel.c	16 Oct 2003 22:11:12 -0000	1.14
@@ -152,14 +152,17 @@
 }
 
 sig_atomic_t master_att;
-static void masterdB_change(GtkRange *r, gpointer in){
+static void masterdB_change(GtkWidget *dummy, gpointer in){
   postfish_mainpanel *p=in;
   char buf[80];
-  gdouble val=gtk_range_get_value(r);
+  gdouble val=gtk_range_get_value(GTK_RANGE(p->masterdB_s));
   sprintf(buf,"%.1f dB",val);
   readout_set(READOUT(p->masterdB_r),buf);
 
-  master_att=rint(val*10);
+  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p->masterdB_a)))
+    master_att=rint(val*10);
+  else
+    master_att=0;
 }
 
 static gboolean timeevent_unselect(GtkWidget *widget,
@@ -560,6 +563,9 @@
 
       g_signal_connect_after (G_OBJECT(panel->masterdB_s), "value-changed",
                         G_CALLBACK(masterdB_change), (gpointer)panel);
+
+      g_signal_connect_after (G_OBJECT(panel->masterdB_a), "clicked",
+			G_CALLBACK(masterdB_change), (gpointer)panel);
     }
 
     /* master action bar */
@@ -729,7 +735,7 @@
       
       multibar_set(MULTIBAR(panel->inbar),rms,peak,n);
       input_cursor_to_time(time_cursor,buffer);
-      readout_set(panel->cue,buffer);
+      readout_set(READOUT(panel->cue),buffer);
 
       if(pull_output_feedback(peak,rms,&n)){
         for(i=0;i<n;i++){

<p><p>1.11      +2 -2      postfish/version.h

Index: version.h
===================================================================
RCS file: /usr/local/cvsroot/postfish/version.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- version.h	16 Oct 2003 22:03:36 -0000	1.10
+++ version.h	16 Oct 2003 22:11:12 -0000	1.11
@@ -1,2 +1,2 @@
-#define VERSION "$Id: version.h,v 1.10 2003/10/16 22:03:36 xiphmont Exp $ "
-/* DO NOT EDIT: Automated versioning hack [Thu Oct 16 18:02:10 EDT 2003] */
+#define VERSION "$Id: version.h,v 1.11 2003/10/16 22:11:12 xiphmont Exp $ "
+/* DO NOT EDIT: Automated versioning hack [Thu Oct 16 18:10:11 EDT 2003] */

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.