diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2007-08-02 00:33:50 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2007-08-02 00:33:50 +0000 |
| commit | d94dbe2eca3ace84a23bfff30c729662a4486a5a (patch) | |
| tree | 5868261a1706a36112b5927f2d013613fe4f5971 /pd/src/s_audio_jack.c | |
| parent | 4e5ef76c3a0a96b04eaf605af434094896984319 (diff) | |
fix name clash in s_audio_jack.c (again) and applied some sourceforge patches
svn path=/trunk/; revision=8342
Diffstat (limited to 'pd/src/s_audio_jack.c')
| -rw-r--r-- | pd/src/s_audio_jack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pd/src/s_audio_jack.c b/pd/src/s_audio_jack.c index a6df3968..92f652e9 100644 --- a/pd/src/s_audio_jack.c +++ b/pd/src/s_audio_jack.c @@ -194,7 +194,7 @@ static int jack_connect_ports(char* client) } -void jack_error_callback(const char *desc) { +void pd_jack_error_callback(const char *desc) { return; } @@ -244,7 +244,7 @@ jack_open_audio(int inchans, int outchans, int rate) jack_set_process_callback (jack_client, process, 0); - jack_set_error_function (jack_error_callback); + jack_set_error_function (pd_jack_error_callback); #ifdef JACK_XRUN jack_set_xrun_callback (jack_client, jack_xrun, NULL); |