ardour/livetrax
13
0
Fork 0
Code

Revert "Fix compilation warnings. (gtk2_ardour part)"

Browse Source 
These fixes are wrong, not on their own, but because GtkPiano* should not be
using volatile. I'll fix that separately.

This reverts commit ad35ab78eb.

Conflicts:
	gtk2_ardour/gtk_pianokeyboard.c
This commit is contained in:
Paul Davis 2016-02-22 15:21:50 -05:00
parent 6fa88273aa
commit 52cb196695
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/gtk_pianokeyboard.c
View File

@ -251,7 +251,7 @@ bind_key(PianoKeyboard *pk, const char *key, int note)
{
assert(pk->key_bindings != NULL);
g_hash_table_insert(pk->key_bindings, (gpointer)key, (gpointer)((intptr_t)note));
g_hash_table_insert(pk->key_bindings, (const gpointer)key, (gpointer)((intptr_t)note));
}
static void
@ -687,10 +687,7 @@ piano_keyboard_new(void)
pk->last_key = 0;
pk->monophonic = FALSE;
/* Avoiding memset due to pk->notes being volatile. */
for (int i = 0; i<(int)sizeof(struct PKNote)*NNOTES; i++) {
((volatile int*)pk->notes)[i] = 0;
}
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);