aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2012-11-26 14:41:47 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2012-11-26 14:41:47 +0000
commit5d31d763d060f6851b5274fa8679370ad0dbfc9f (patch)
tree40e6438f35b64539436150a4892cb1d5d23d5db6
parent4f7c9a8d4619b0a9a4e38c2601197a120c646c07 (diff)
use common_parsedriver() rather than sscanf()
svn path=/trunk/externals/iem/mediasettings/; revision=16593
-rw-r--r--midisettings.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/midisettings.c b/midisettings.c
index 37566d9..369e91b 100644
--- a/midisettings.c
+++ b/midisettings.c
@@ -1,9 +1,9 @@
/******************************************************
*
* midisettings - get/set midi preferences from within Pd-patches
- * Copyright (C) 2010 IOhannes m zmölnig
+ * Copyright (C) 2010-2012 IOhannes m zmölnig
*
- * forum::für::umläute
+ * forum::für::umläute
*
* institute of electronic music and acoustics (iem)
* university of music and dramatic arts, graz (kug)
@@ -14,13 +14,7 @@
* license: GNU General Public License v.3 or later
*
******************************************************/
-#include "m_pd.h"
-#include "s_stuff.h"
-#include <stdio.h>
-#include <string.h>
-
-#define MAXNDEV 20
-#define DEVDESCSIZE 80
+#include "mediasettings.h"
#ifndef MAXMIDIINDEV
# define MAXMIDIINDEV 4
@@ -35,8 +29,6 @@
# define MAXMIDIDEV MAXMIDIOUTDEV
#endif
-
-
extern int sys_midiapi;
static t_class *midisettings_class;
@@ -168,8 +160,10 @@ t_ms_symkeys*ms_driverparse(t_ms_symkeys*drivers, const char*buf) {
int length=stop-start;
if(length>=MAXPDSTRING)length=MAXPDSTRING-1;
snprintf(substring, length, "%s", buf+start+1);
-
- if(2==sscanf(substring, "%s %d", drivername, &driverid)) {
+
+ if(common_parsedriver(substring, length,
+ drivername, MAXPDSTRING,
+ &driverid)) {
drivers=ms_symkeys_add(drivers, gensym(drivername), driverid, 0);
} else {
if((start+1)!=(stop)) /* empty APIs string */