[Gridflow-cvs] [svn] commit: r5797 - in /trunk/src: gem.cxx gridflow.cxx

[svn-gridflow at artengine.ca]

Author: matju
Date: Tue Jul 27 19:50:59 2010
New Revision: 5797

Log:
...

Modified:
    trunk/src/gem.cxx
    trunk/src/gridflow.cxx

Modified: trunk/src/gem.cxx
==============================================================================
--- trunk/src/gem.cxx (original)
+++ trunk/src/gem.cxx Tue Jul 27 19:50:59 2010
@@ -317,6 +317,10 @@
 	\startall
 }
 
+extern "C" void gridflow_gem9292_setup () {post("GridFlow Gem 9292 module loaded"); startup_gem();}
+extern "C" void gridflow_gem9293_setup () {post("GridFlow Gem 9292 module loaded"); startup_gem();}
+extern "C" void gridflow_gem9393_setup () {post("GridFlow Gem 9292 module loaded"); startup_gem();}
+
 /*
 virtual void processRGBAImage(imageStruct &image) {}
 virtual void processRGBImage (imageStruct &image) {}

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Tue Jul 27 19:50:59 2010
@@ -1025,6 +1025,8 @@
 #ifdef HAVE_GEM
 	struct GemState    {GemState(); char trabant[666];};
 	struct imageStruct {imageStruct(); char lada[666];};
+	extern "C" void sys_load_lib(t_canvas *,const char *);
+	//#define sys_load_lib(A,B) do {post("pre sys_load_lib(%s)",B); sys_load_lib(A,B); post("post sys_load_lib(%s)",B);} while(0)
 #endif
 
 // note: contrary to what m_pd.h says, pd_getfilename() and pd_getdirname()
@@ -1086,10 +1088,9 @@
 	/* note that j==6 is because in 64-bit mode you have one int of padding in GemState92 just before the pixBlock* */
 	bool imageStruct_has_virtual = !!*(long *)new imageStruct();
 	post("imageStruct_has_virtual=%d",imageStruct_has_virtual);
-	void sys_load_lib(t_canvas *,const char *);
-	if (gem==92)                       sys_load_lib(0,"gridflow-gem9292");
-	else if (!imageStruct_has_virtual) sys_load_lib(0,"gridflow-gem9293");
-	else                               sys_load_lib(0,"gridflow-gem9393");
+	if (gem==92)                       sys_load_lib(0,"gridflow_gem9292");
+	else if (!imageStruct_has_virtual) sys_load_lib(0,"gridflow_gem9293");
+	else                               sys_load_lib(0,"gridflow_gem9393");
 #endif
 
 	//sys_gui("bind . <Motion> {puts %W}\n");