aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-08-20 03:34:39 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-08-20 03:34:39 +0000
commit3432310ae834f0f5761887578d63e00f38718fcf (patch)
tree1e69ac59a45cde825617676024ea35c899b08fd5
parent5e9d109a0fa32c67a5a1f6d22bf4828d9a2b07ba (diff)
accepted in git commit 05b4b22c2d70dee18187de8a9f9b5a5e59a72a40
svn path=/trunk/; revision=13858
-rw-r--r--packages/patches/makefilename_scanformat-0.41.0-test04.patch95
1 files changed, 0 insertions, 95 deletions
diff --git a/packages/patches/makefilename_scanformat-0.41.0-test04.patch b/packages/patches/makefilename_scanformat-0.41.0-test04.patch
deleted file mode 100644
index d2c8ab2b..00000000
--- a/packages/patches/makefilename_scanformat-0.41.0-test04.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: x_connective.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v
-retrieving revision 1.9
-diff -u -w -r1.9 x_connective.c
---- x_connective.c 24 Aug 2006 15:23:52 -0000 1.9
-+++ x_connective.c 30 Jul 2007 18:15:23 -0000
-@@ -1202,34 +1202,86 @@
- {
- t_object x_obj;
- t_symbol *x_format;
-+ t_atomtype x_accept;
-+ int x_intconvert;
- } t_makefilename;
-
-+static void makefilename_scanformat(t_makefilename *x)
-+{
-+ int num=0, infmt=0;
-+ char *str,*chr;
-+ if (!x->x_format) return;
-+ x->x_accept = A_NULL;
-+ for (str=x->x_format->s_name; *str; str++) {
-+ if (!infmt && *str=='%') {
-+ infmt=1;
-+ continue;
-+ }
-+ if (infmt) {
-+ if (strchr("-.#0123456789",*str)!=0)
-+ continue;
-+ if (*str=='s') {
-+ x->x_accept = A_SYMBOL;
-+ x->x_intconvert = 0;
-+ break;
-+ }
-+ if (strchr("fgGeE",*str)!=0) {
-+ x->x_accept = A_FLOAT;
-+ x->x_intconvert = 0;
-+ break;
-+ }
-+ if (strchr("xXdiou",*str)!=0) {
-+ x->x_accept = A_FLOAT;
-+ x->x_intconvert = 1;
-+ break;
-+ }
-+ infmt=0;
-+ }
-+ }
-+}
-+
- static void *makefilename_new(t_symbol *s)
- {
- t_makefilename *x = (t_makefilename *)pd_new(makefilename_class);
-- if (!s->s_name) s = gensym("file.%d");
-+ if (!s || !s->s_name) s = gensym("file.%d");
- outlet_new(&x->x_obj, &s_symbol);
- x->x_format = s;
-+ x->x_accept = A_NULL;
-+ x->x_intconvert = 0;
-+ makefilename_scanformat(x);
- return (x);
- }
-
- static void makefilename_float(t_makefilename *x, t_floatarg f)
- {
- char buf[MAXPDSTRING];
-+ if (x->x_accept == A_FLOAT) {
-+ if (x->x_intconvert)
- sprintf(buf, x->x_format->s_name, (int)f);
-+ else
-+ sprintf(buf, x->x_format->s_name, f);
-+ }
-+ else
-+ sprintf(buf, x->x_format->s_name, "");
-+ if (buf[0]!=0)
- outlet_symbol(x->x_obj.ob_outlet, gensym(buf));
- }
-
- static void makefilename_symbol(t_makefilename *x, t_symbol *s)
- {
- char buf[MAXPDSTRING];
-+ if (x->x_accept == A_SYMBOL)
- sprintf(buf, x->x_format->s_name, s->s_name);
-+ else
-+ sprintf(buf, x->x_format->s_name, 0);
-+ if (buf[0]!=0)
- outlet_symbol(x->x_obj.ob_outlet, gensym(buf));
- }
-
- static void makefilename_set(t_makefilename *x, t_symbol *s)
- {
- x->x_format = s;
-+ makefilename_scanformat(x);
- }
-
- static void makefilename_setup(void)