diff --git a/ChangeLog b/ChangeLog index 5a957d5152..274c16a734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-06 Sven Neumann + + * modules/controller_midi.c (midi_set_device): corrected casting. + 2005-11-05 Sven Neumann * app/Makefile.am: removed unused variable scriptdata. diff --git a/modules/controller_midi.c b/modules/controller_midi.c index ffb26fd029..96d302ee64 100644 --- a/modules/controller_midi.c +++ b/modules/controller_midi.c @@ -440,10 +440,10 @@ midi_set_device (ControllerMidi *midi, #ifdef HAVE_ALSA if (! g_ascii_strcasecmp (midi->device, "alsa")) { - GAlsaSource *event_source; - gchar *alsa; - gchar *state; - gint ret; + GSource *event_source; + gchar *alsa; + gchar *state; + gint ret; ret = snd_seq_open (&midi->sequencer, "default", SND_SEQ_OPEN_INPUT, 0); @@ -483,10 +483,12 @@ midi_set_device (ControllerMidi *midi, g_object_set (midi, "state", state, NULL); g_free (state); - event_source = (GAlsaSource *) g_source_new (&alsa_source_funcs, - sizeof (GAlsaSource)); - event_source->controller = midi; - midi->seq_id = g_source_attach ((GSource *) event_source, NULL); + event_source = g_source_new (&alsa_source_funcs, + sizeof (GAlsaSource)); + + ((GAlsaSource *) event_source)->controller = midi; + + midi->seq_id = g_source_attach (event_source, NULL); g_source_unref (event_source); return TRUE;