Skip to content

Commit

Permalink
Merge pull request kfish#1 from erikd/master
Browse files Browse the repository at this point in the history 
Fix all unsed-but-set-variable warnings.
  • Loading branch information
@kfish
kfish committed Jan 16, 2012
2 parents a6e5839 + f2f4715 commit 3e530ab
Show file tree
Hide file tree
Showing 16 changed files with 439 additions and 511 deletions.
78 changes: 29 additions & 49 deletions src/db_ruler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/


Expand Down Expand Up @@ -57,7 +57,7 @@
static void db_ruler_class_init (DbRulerClass *klass);
static void db_ruler_init (DbRuler *db_ruler);
static void db_ruler_realize (GtkWidget * widget);
static gint
static gint
db_ruler_button_press (GtkWidget * widget, GdkEventButton * event);
static gint
db_ruler_button_release (GtkWidget * widget, GdkEventButton * event);
Expand Down Expand Up @@ -89,7 +89,7 @@ db_ruler_get_type (void)
{
static const GTypeInfo db_ruler_info =
{

sizeof (DbRulerClass),
NULL, /* base_init */
NULL, /* base_finalize */
Expand All @@ -98,7 +98,7 @@ db_ruler_get_type (void)
NULL, /* class_data */
sizeof (DbRuler),
0, /* n_preallocs */
(GInstanceInitFunc) db_ruler_init,
(GInstanceInitFunc) db_ruler_init,

};

Expand All @@ -111,11 +111,9 @@ db_ruler_get_type (void)
static void
db_ruler_class_init (DbRulerClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkRulerClass *ruler_class;

object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass*) klass;
ruler_class = (GtkRulerClass*) klass;

Expand All @@ -135,8 +133,8 @@ db_ruler_class_init (DbRulerClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (DbRulerClass, changed),
NULL,
NULL,
NULL,
NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
klass->changed = NULL;
Expand Down Expand Up @@ -271,7 +269,7 @@ db_ruler_button_press (GtkWidget * widget, GdkEventButton * event)
int y;

gdk_window_get_pointer (event->window, NULL, &y, NULL);

switch (event->button) {
case 1:
DB_RULER(widget)->y = y;
Expand Down Expand Up @@ -299,18 +297,18 @@ db_ruler_scroll_event (GtkWidget *widget, GdkEventScroll *event)
float delta;

if (event->direction == GDK_SCROLL_UP) { /* mouse wheel scroll up */

delta = ruler->upper - ruler->lower;
gtk_ruler_set_range (ruler, ruler->lower + delta/8, ruler->upper - delta/8,
(ruler->upper - ruler->lower)/2.0, 2.0);
(ruler->upper - ruler->lower)/2.0, 2.0);
g_signal_emit_by_name (ruler, "changed");
return TRUE;

} else if (event->direction == GDK_SCROLL_DOWN) { /* mouse wheel scroll down */

delta = ruler->upper - ruler->lower;
gtk_ruler_set_range (ruler, ruler->lower - delta/8, ruler->upper + delta/8,
(ruler->upper - ruler->lower)/2.0, 2.0);
(ruler->upper - ruler->lower)/2.0, 2.0);
g_signal_emit_by_name (ruler, "changed");
return TRUE;
}
Expand All @@ -329,7 +327,7 @@ static void
db_ruler_draw_ticks (GtkRuler *ruler)
{
GtkWidget *widget;
GdkGC *gc, *bg_gc;
GdkGC *gc;
gint i;
gint width, height;
gint xthickness;
Expand All @@ -342,22 +340,19 @@ db_ruler_draw_ticks (GtkRuler *ruler)
gfloat start, end, cur;
gchar unit_str[32];
gint digit_height;
gint digit_offset;
gint text_height;
gint pos;
PangoLayout *layout;
PangoRectangle logical_rect, ink_rect;

g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_DB_RULER (ruler));

if (!GTK_WIDGET_DRAWABLE (ruler))
if (!GTK_WIDGET_DRAWABLE (ruler))
return;

widget = GTK_WIDGET (ruler);

gc = widget->style->fg_gc[GTK_STATE_NORMAL];
bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];

xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
Expand All @@ -368,14 +363,13 @@ db_ruler_draw_ticks (GtkRuler *ruler)

layout = gtk_widget_create_pango_layout (widget, "012456789dBinf-");
pango_layout_get_extents (layout, &ink_rect, &logical_rect);

digit_height = PANGO_PIXELS (ink_rect.height) + 2;
digit_offset = ink_rect.y;

gtk_paint_box (widget->style, ruler->backing_store,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
NULL, widget, "db_ruler",
0, 0,
0, 0,
widget->allocation.width, widget->allocation.height);

gdk_draw_line (ruler->backing_store, gc,
Expand All @@ -384,25 +378,17 @@ db_ruler_draw_ticks (GtkRuler *ruler)
width + xthickness,
height - ythickness);

upper = ruler->upper / ruler->metric->pixels_per_unit;
lower = ruler->lower / ruler->metric->pixels_per_unit;
upper = ruler->upper / ruler->metric->pixels_per_unit;
lower = ruler->lower / ruler->metric->pixels_per_unit;

// upper = ruler->upper;
// lower = ruler->lower;

if ((upper - lower) == 0)
if ((upper - lower) == 0)
return;

increment = (gfloat) height / (upper - lower);
abs_increment = (gfloat) fabs((double)increment);

// * strlen (unit_str)
text_height = digit_height + 1;

for (scale = 0; scale < MAXIMUM_SCALES; scale++)
/* if (ruler->metric->ruler_scale[scale] * fabs(increment) > 2 * text_height)
break;*/
if (ruler_scale[scale] * abs_increment > 2 * digit_height)
if (ruler_scale[scale] * abs_increment > 2 * digit_height)
break;
if (scale == MAXIMUM_SCALES)
scale = MAXIMUM_SCALES - 1;
Expand All @@ -426,9 +412,9 @@ if (ruler_scale[scale] * abs_increment > 2 * digit_height)
length = 0;
for (i = MAXIMUM_SUBDIVIDE - 1; i >= 0; i--)
{
subd_incr = (gfloat) ruler_scale[scale] /
subd_incr = (gfloat) ruler_scale[scale] /
(gfloat) subdivide[i];
if (subd_incr * fabs(increment) <= MINIMUM_INCR)
if (subd_incr * fabs(increment) <= MINIMUM_INCR)
continue;

/* Calculate the length of the tickmarks. Make sure that
Expand Down Expand Up @@ -460,17 +446,17 @@ if (ruler_scale[scale] * abs_increment > 2 * digit_height)
/* draw label */
if (i == 0 && cur < upper && cur > lower) {
float a_cur = fabs(cur), db_cur;

/* ensure inf. stays as 'inf.', not nearby large values */
if (a_cur < subd_incr/2) a_cur = 0.0;
db_cur = 20 * log10 (a_cur);

if (db_cur > -10.0) {
snprintf (unit_str, sizeof (unit_str), "%1.1f", db_cur);
} else {
snprintf (unit_str, sizeof (unit_str), "%2.0f", db_cur);
}

pango_layout_set_text (layout, unit_str, -1);

gtk_paint_layout (widget->style,
Expand All @@ -485,9 +471,9 @@ if (ruler_scale[scale] * abs_increment > 2 * digit_height)
layout);
}
}

}

}

static void
Expand All @@ -497,11 +483,9 @@ db_ruler_draw_pos (GtkRuler *ruler)
GdkGC *gc;
int i;
gint x, y;
gint width, height;
gint width;
gint bs_width, bs_height;
gint xthickness;
gint ythickness;
gfloat increment;

g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_DB_RULER (ruler));
Expand All @@ -512,9 +496,7 @@ db_ruler_draw_pos (GtkRuler *ruler)

gc = widget->style->fg_gc[GTK_STATE_NORMAL];
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
width = widget->allocation.width - xthickness * 2;
height = widget->allocation.height;

bs_height = 7;
bs_width = 4;
Expand All @@ -530,8 +512,6 @@ db_ruler_draw_pos (GtkRuler *ruler)
ruler->xsrc, ruler->ysrc,
bs_width, bs_height);

increment = (gfloat) height / (ruler->upper - ruler->lower);

x = (width - bs_width) + xthickness - 2;
y = DB_RULER(ruler)->y;

Expand Down
14 changes: 5 additions & 9 deletions src/db_slider.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,12 @@ static gint db_slider_signals[LAST_SIGNAL] = { 0 };
static void
db_slider_class_init(DbSliderClass * klass)
{
GtkObjectClass *object_class;

object_class = (GtkObjectClass *) klass;

db_slider_signals[VALUE_CHANGED_SIGNAL] = g_signal_new ("value-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (DbSliderClass, value_changed),
NULL,
NULL,
NULL,
NULL,
g_cclosure_marshal_VOID__FLOAT,
G_TYPE_NONE, 1, G_TYPE_FLOAT);
klass->value_changed = NULL;
Expand All @@ -87,12 +83,12 @@ db_slider_get_type()
NULL, /* class_data */
sizeof (DbSlider),
0,
(GInstanceInitFunc) db_slider_init,
(GInstanceInitFunc) db_slider_init,

};

db_slider_type = g_type_register_static(GTK_TYPE_VBOX, "DbSlider" ,&db_slider_info, 0);

}

return db_slider_type;
Expand Down Expand Up @@ -193,7 +189,7 @@ db_slider_build (GtkWidget * slider, gchar * title, gfloat value)

label = gtk_label_new (range_text);
gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_widget_show (label);
}


Expand Down
29 changes: 14 additions & 15 deletions src/driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pcmio_get_main_dev (void)
main_dev = prefs_get_string (dialog_driver->primary_device_key);

if (main_dev == NULL) return pcmio_get_default_main_dev();

return main_dev;
}

Expand All @@ -123,7 +123,7 @@ pcmio_get_monitor_dev (void)
monitor_dev = prefs_get_string (dialog_driver->monitor_device_key);

if (monitor_dev == NULL) return pcmio_get_default_monitor_dev ();

return monitor_dev;
}

Expand Down Expand Up @@ -255,12 +255,11 @@ update_ok_button (GtkWidget * widget, gpointer data)
GtkWidget * ok_button;
gchar * main_devname, * monitor_devname;
gboolean ok = FALSE;
int driver_index;

ok_button =
GTK_WIDGET(g_object_get_data (G_OBJECT(dialog), "ok_button"));

driver_index = gtk_combo_box_get_active (GTK_COMBO_BOX(driver_combo));
gtk_combo_box_get_active (GTK_COMBO_BOX(driver_combo));

if (monitor_checked (dialog)) {
main_devname = (gchar *)
Expand Down Expand Up @@ -387,7 +386,7 @@ create_drivers_combo (void)
{
GtkWidget * combo;
int k, current=0;

combo = gtk_combo_box_new_text ();

for (k = 0 ; k < ARRAY_LEN (driver_table) && driver_table [k] ; k++) {
Expand All @@ -409,9 +408,9 @@ create_devices_combo (void)

if (dialog_driver->get_names)
cbitems = dialog_driver->get_names();

combo = gtk_combo_new ();

gtk_combo_set_popdown_strings (GTK_COMBO(combo), cbitems);

return combo;
Expand All @@ -436,10 +435,10 @@ device_config (void)
if (dialog == NULL) {

dialog = gtk_dialog_new ();
g_signal_connect ((gpointer) dialog, "destroy",
G_CALLBACK(gtk_widget_destroyed),


g_signal_connect ((gpointer) dialog, "destroy",
G_CALLBACK(gtk_widget_destroyed),
&dialog);

gtk_window_set_title (GTK_WINDOW(dialog), _("Sweep: audio device configuration"));
Expand Down Expand Up @@ -524,16 +523,16 @@ device_config (void)
gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 4);
gtk_widget_show (label);

/* Main output */
/* Main output */
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, TRUE, 8);
gtk_container_set_border_width (GTK_CONTAINER(hbox), 12);
gtk_widget_show (hbox);

label = gtk_label_new (_("Main device:"));
gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

main_combo = create_devices_combo ();
gtk_box_pack_start (GTK_BOX(hbox), main_combo, TRUE, TRUE, 0);
gtk_widget_show (main_combo);
Expand All @@ -560,7 +559,7 @@ device_config (void)
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, TRUE, 8);
gtk_container_set_border_width (GTK_CONTAINER(hbox), 12);
gtk_widget_show (hbox);

label = gtk_label_new (_("Monitor output:"));
gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
Expand Down
Loading

0 comments on commit 3e530ab

Please sign in to comment.