From 2f91bda393a35fe331d6ff8f2359e4c2d7bf5aba Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Wed, 24 Jul 2013 09:06:19 -0400
Subject: [PATCH] added wavinfo support for @pd_extra
---
externals/ext13/wavinfo.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/externals/ext13/wavinfo.c b/externals/ext13/wavinfo.c
index 9d5c20d5a..47ff9daad 100644
--- a/externals/ext13/wavinfo.c
+++ b/externals/ext13/wavinfo.c
@@ -1,5 +1,6 @@
#include "ext13.h"
#include "m_pd.h"
+#include "s_stuff.h"
#include <sys/stat.h>
#include <stdio.h>
#include <unistd.h>
@@ -76,15 +77,37 @@ static void wavinfo_bang(t_wavinfo *x)
// outlet_float(x->x_obj.ob_outlet, x->x_f);
}
+extern char * canvas_path_replace(
+ char const * const original,
+ char const * const pattern,
+ char const * const replacement
+);
+
static void wavinfo_symbol(t_wavinfo *x, t_symbol *filename)
{
struct stat statbuf;
t_wave* wavinfo;
int result;
char fname[MAXPDSTRING];
- int ok=(stat(filename->s_name, &statbuf) >= 0);
+ char *final_name;
+
+ //check for @sys_extra path and replace
+ if (strstr(filename->s_name, "@pd_extra") != NULL) {
+ t_namelist *path = pd_extrapath;
+ while (path->nl_next)
+ path = path->nl_next;
+ final_name = canvas_path_replace(filename->s_name, "@pd_extra", path->nl_string);
+ }
+ else {
+ final_name = filename->s_name;
+ }
+ //fprintf(stderr," %s %s\n", filename->s_name, final_name);
+
+ int ok=(stat(final_name, &statbuf) >= 0);
if (ok>0) {
- canvas_makefilename(x->x_canvas, filename->s_name,fname, MAXPDSTRING);
+
+ canvas_makefilename(x->x_canvas, final_name,fname, MAXPDSTRING);
+
if ((x->x_fd = open(fname,( O_NONBLOCK | O_RDONLY))) < 0)
{
error("can't open %s",fname);
--
GitLab