From 5d555864abf6a6a0d8d218653dbc2906ad956f64 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Thu, 25 Jul 2013 23:36:34 +0000 Subject: use pdsend proc to support Pd >= 0.43 and #define __STDC_CONSTANT_MACROS 1 on top svn path=/trunk/externals/pdvjtools/; revision=17190 --- videogrid/videogrid.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/videogrid/videogrid.cc b/videogrid/videogrid.cc index 273ab79..e91ed84 100644 --- a/videogrid/videogrid.cc +++ b/videogrid/videogrid.cc @@ -1,3 +1,5 @@ +/* some linux distros need this to compile ffmpeg correctly as cpp */ +#define __STDC_CONSTANT_MACROS 1 extern "C" { @@ -42,7 +44,16 @@ extern "C" #include "pthread.h" /* some linux distros need this to compile ffmpeg correctly as cpp */ - #define __STDC_CONSTANT_MACROS 1 +/* #define __STDC_CONSTANT_MACROS 1 */ + +/* #ifdef __cplusplus + #define __STDC_CONSTANT_MACROS + #ifdef _STDINT_H + #undef _STDINT_H + #endif + # include + #endif +*/ /* ffmpeg includes */ @@ -1294,12 +1305,14 @@ extern "C" sys_gui("global $var_graph_h_cell\n"); sys_gui("set cmd [concat $id dialog [eval concat $$var_graph_name] [eval concat $$var_graph_num_fil] [eval concat $$var_graph_num_col] [eval concat $$var_graph_color_fons] [eval concat $$var_graph_color_marc] [eval concat $$var_graph_color_grasp] [eval concat $$var_graph_format_list] [eval concat $$var_graph_w_cell] [eval concat $$var_graph_h_cell]\\;]\n"); // puts stderr $cmd - sys_gui("pd $cmd\n"); + //sys_gui("pd $cmd\n"); + sys_gui("pdsend $cmd\n"); sys_gui("}\n"); sys_gui("proc videogrid_cancel {id} {\n"); sys_gui("set cmd [concat $id cancel \\;]\n"); // puts stderr $cmd - sys_gui("pd $cmd\n"); + //sys_gui("pd $cmd\n"); + sys_gui("pdsend $cmd\n"); sys_gui("}\n"); sys_gui("proc videogrid_ok {id} {\n"); sys_gui("videogrid_apply $id\n"); -- cgit v1.2.1