Yair K. wrote:
Hi,
Attached are two patches to ossxmix.
The first patch (-cmerge) has some more cleanups:
1. update manpage to latest changes.
2. staticize all global variables.
3. check all mallocs for failure.
4. merge issues:
A. Declare prototype for create_widgets.
B. Is setting val twice in gang_change correct? This isn't what the code
did before the previous merge, so I undid that.
5. Some other changes.
Re. 4.B
No need to create an extra variable (aval) just move set_value function
call between val assignments.
apply attached diff after cmerge.diff
kind regards,
Clive
--- cmd/ossxmix/ossxmix.c 2008-02-03 01:13:20.000000000 +0000
+++ cmd/ossxmix/ossxmix.c 2008-02-03 01:10:06.000000000 +0000
@@ -565,7 +565,7 @@
gang_change (GtkToggleButton * but, gpointer data)
{
ctlrec_t *srec = (ctlrec_t *) data;
- int val, aval, lval, rval;
+ int val, lval, rval;
int mask = 0xff, shift = 8;
if (!but->active)
@@ -586,11 +586,11 @@
}
val = lval | (lval << shift);
- aval = srec->mixext->maxvalue - (val & mask);
-
- gtk_adjustment_set_value (GTK_ADJUSTMENT (srec->left), aval);
- gtk_adjustment_set_value (GTK_ADJUSTMENT (srec->right), aval);
set_value (srec->mixext, val);
+ val = srec->mixext->maxvalue - (val & mask);
+
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (srec->left), val);
+ gtk_adjustment_set_value (GTK_ADJUSTMENT (srec->right), val);
}
/*ARGSUSED*/
_______________________________________________
oss-devel mailing list
oss-devel@mailman.opensound.com
http://mailman.opensound.com/mailman/listinfo/oss-devel
