fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

[ardour.git] / gtk2_ardour / gtk_pianokeyboard.c

diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c
index f9ab9068e45b317564a802a7c8a4129584b0e1a1..7332299bfbff40c5fe40b4778bf4476b8b6085d4 100644 (file)
--- a/gtk2_ardour/gtk_pianokeyboard.c
+++ b/gtk2_ardour/gtk_pianokeyboard.c
@@ -92,7 +92,7 @@ queue_note_draw (PianoKeyboard* pk, int note)
        }
 }
 
-static void 
+static void
 draw_note(PianoKeyboard *pk, cairo_t* cr, int note)
 {
        int             is_white = pk->notes[note].white;
@@ -102,17 +102,21 @@ draw_note(PianoKeyboard *pk, cairo_t* cr, int note)
        int             h = pk->notes[note].h;
 
        if (pk->notes[note].pressed || pk->notes[note].sustained) {
-               is_white = !is_white;
+               if (is_white) {
+                       cairo_set_source_rgb (cr, 0.60f, 0.60f, 0.60f);
+               } else {
+                       cairo_set_source_rgb (cr, 0.50f, 0.50f, 0.50f);
+               }
+       } else {
+               if (is_white) {
+                       cairo_set_source_rgb (cr, 1.0f, 1.0f, 1.0f);
+               } else {
+                       cairo_set_source_rgb (cr, 0.0f, 0.0f, 0.0f);
+               }
        }
 
        cairo_set_line_width (cr, 1.0);
 
-       if (is_white) {
-               cairo_set_source_rgb (cr, 1.0f, 1.0f, 1.0f);
-       } else {
-               cairo_set_source_rgb (cr, 0.0f, 0.0f, 0.0f);
-       }
-
        cairo_rectangle (cr, x, 0, w, h);
        cairo_fill (cr);
 
@@ -134,7 +138,7 @@ draw_note(PianoKeyboard *pk, cairo_t* cr, int note)
        }
 }
 
-static int 
+static int
 press_key(PianoKeyboard *pk, int key)
 {
        assert(key >= 0);
@@ -159,7 +163,7 @@ press_key(PianoKeyboard *pk, int key)
        return 1;
 }
 
-static int 
+static int
 release_key(PianoKeyboard *pk, int key)
 {
        assert(key >= 0);
@@ -188,9 +192,9 @@ static void
 rest (PianoKeyboard* pk)
 {
        g_signal_emit_by_name(GTK_WIDGET(pk), "rest");
-}        
+}
 
-static void 
+static void
 stop_unsustained_notes(PianoKeyboard *pk)
 {
        int             i;
@@ -204,7 +208,7 @@ stop_unsustained_notes(PianoKeyboard *pk)
        }
 }
 
-static void 
+static void
 stop_sustained_notes(PianoKeyboard *pk)
 {
        int             i;
@@ -251,7 +255,7 @@ clear_notes(PianoKeyboard *pk)
        g_hash_table_remove_all(pk->key_bindings);
 }
 
-static void 
+static void
 bind_keys_qwerty(PianoKeyboard *pk)
 {
        clear_notes(pk);
@@ -294,7 +298,7 @@ bind_keys_qwerty(PianoKeyboard *pk)
        bind_key(pk, "p", 40);
 }
 
-static void 
+static void
 bind_keys_qwertz(PianoKeyboard *pk)
 {
        bind_keys_qwerty(pk);
@@ -347,8 +351,8 @@ bind_keys_azerty(PianoKeyboard *pk)
        bind_key(pk, "p", 40);
 }
 
-static gint 
-keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused)
+static gint
+keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer ignored)
 {
        int             note;
        char            *key;
@@ -382,7 +386,7 @@ keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused)
                if (event->type == GDK_KEY_RELEASE) {
                        rest (pk);
                }
-                        
+
                return TRUE;
        }
 
@@ -401,7 +405,7 @@ keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused)
        return TRUE;
 }
 
-static int 
+static int
 get_note_for_xy(PianoKeyboard *pk, int x, int y)
 {
        int             height = GTK_WIDGET(pk)->allocation.height;
@@ -428,8 +432,8 @@ get_note_for_xy(PianoKeyboard *pk, int x, int y)
        return -1;
 }
 
-static gboolean 
-mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer notused)
+static gboolean
+mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer ignored)
 {
        int             x = event->x;
        int             y = event->y;
@@ -468,8 +472,8 @@ mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer no
        return TRUE;
 }
 
-static gboolean 
-mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer notused)
+static gboolean
+mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer ignored)
 {
        int             note;
 
@@ -479,7 +483,7 @@ mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer no
        note = get_note_for_xy(pk, event->x, event->y);
 
        if (note != pk->note_being_pressed_using_mouse && note >= 0) {
-               
+
                if (pk->note_being_pressed_using_mouse >= 0)
                        release_key(pk, pk->note_being_pressed_using_mouse);
                press_key(pk, note);
@@ -495,7 +499,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event)
        int i;
        PianoKeyboard *pk = PIANO_KEYBOARD(widget);
        cairo_t* cr = gdk_cairo_create (GDK_DRAWABLE (GTK_WIDGET(pk)->window));
-       
+
        gdk_cairo_region (cr, event->region);
        cairo_clip (cr);
 
@@ -522,7 +526,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event)
        return TRUE;
 }
 
-static void 
+static void
 piano_keyboard_size_request(GtkWidget* widget, GtkRequisition *requisition)
 {
        requisition->width = PIANO_KEYBOARD_DEFAULT_WIDTH;
@@ -609,7 +613,7 @@ piano_keyboard_class_init(PianoKeyboardClass *klass)
                 G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
                 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
-       widget_klass = (GtkWidgetClass*) klass; 
+       widget_klass = (GtkWidgetClass*) klass;
 
        widget_klass->expose_event = piano_keyboard_expose;
        widget_klass->size_request = piano_keyboard_size_request;
@@ -687,7 +691,7 @@ piano_keyboard_sustain_press(PianoKeyboard *pk)
        }
 }
 
-void   
+void
 piano_keyboard_sustain_release(PianoKeyboard *pk)
 {
        if (pk->maybe_stop_sustained_notes)
@@ -744,4 +748,3 @@ piano_keyboard_set_keyboard_layout(PianoKeyboard *pk, const char *layout)
 
        return FALSE;
 }
-