diff options
| author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-05-30 03:04:19 +0000 |
|---|---|---|
| committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2005-05-30 03:04:19 +0000 |
| commit | 05607e31243e5e85a3801d4513192bb1f2150b14 (patch) | |
| tree | 0f810a621cb9967e1e53b349410b0d07be0cea13 /pd/src/s_file.c | |
| parent | 47729b52cb85e8a52bf2e6bbf8ee9a810ed331e1 (diff) | |
Remembered to update all the edited files. Should now be in sync... will
have to test it though.
svn path=/trunk/; revision=3092
Diffstat (limited to 'pd/src/s_file.c')
| -rw-r--r-- | pd/src/s_file.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pd/src/s_file.c b/pd/src/s_file.c index 9705bac3..23e94c3f 100644 --- a/pd/src/s_file.c +++ b/pd/src/s_file.c @@ -311,21 +311,25 @@ void sys_loadpreferences( void) naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, advance, 0); /* load MIDI preferences */ - for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) + if (sys_getpreference("nomidiin", prefbuf, MAXPDSTRING)) + nmidiindev = 0; + else for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) { sprintf(keybuf, "midiindev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; - if (sscanf(prefbuf, "%d %d", &midiindev[i], &chindev[i]) < 2) + if (sscanf(prefbuf, "%d", &midiindev[i]) < 1) break; nmidiindev++; } - for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++) + if (sys_getpreference("nomidiout", prefbuf, MAXPDSTRING)) + nmidioutdev = 0; + else for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++) { sprintf(keybuf, "midioutdev%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) break; - if (sscanf(prefbuf, "%d %d", &midioutdev[i], &choutdev[i]) < 2) + if (sscanf(prefbuf, "%d", &midioutdev[i]) < 1) break; nmidioutdev++; } |