ardour/livetrax
13
0
Fork 0
Code

avoid name conflict with Note (gtk2_ardour/note.h)

Browse Source
This commit is contained in:
Robin Gareus 2014-10-23 03:40:44 +02:00
parent c6a3d6bc48
commit ca48fffd72
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/gtk_pianokeyboard.c
View File

@ -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);

4
gtk2_ardour/gtk_pianokeyboard.h
View File

@ -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;
};