diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-23 03:40:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-23 03:43:04 +0200 |
| commit | ca48fffd72df21d7298bf00d1e73b1381d0ec0e3 (patch) | |
| tree | b18434b2e8399430a2d03183147f11cf815a38c8 /gtk2_ardour | |
| parent | c6a3d6bc48ea766a55d0b848d7bff16daa013b41 (diff) | |
avoid name conflict with Note (gtk2_ardour/note.h)
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/gtk_pianokeyboard.c | 2 | ||||
| -rw-r--r-- | gtk2_ardour/gtk_pianokeyboard.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 8d91626a2b..de12de043b 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -677,7 +677,7 @@ piano_keyboard_new(void) pk->enable_keyboard_cue = 0; pk->octave = 4; pk->note_being_pressed_using_mouse = -1; - memset((void *)pk->notes, 0, sizeof(struct Note) * NNOTES); + memset((void *)pk->notes, 0, sizeof(struct PKNote) * NNOTES); pk->key_bindings = g_hash_table_new(g_str_hash, g_str_equal); bind_keys_qwerty(pk); diff --git a/gtk2_ardour/gtk_pianokeyboard.h b/gtk2_ardour/gtk_pianokeyboard.h index 9241caf894..f4407fae5f 100644 --- a/gtk2_ardour/gtk_pianokeyboard.h +++ b/gtk2_ardour/gtk_pianokeyboard.h @@ -40,7 +40,7 @@ typedef struct _PianoKeyboardClass PianoKeyboardClass; #define OCTAVE_MIN -1 #define OCTAVE_MAX 7 -struct Note { +struct PKNote { int pressed; /* 1 if key is in pressed down state. */ int sustained; /* 1 if note is sustained. */ int x; /* Distance between the left edge of the key @@ -59,7 +59,7 @@ struct _PianoKeyboard int octave; int widget_margin; int note_being_pressed_using_mouse; - volatile struct Note notes[NNOTES]; + volatile struct PKNote notes[NNOTES]; /* Table used to translate from PC keyboard character to MIDI note number. */ GHashTable *key_bindings; }; |