aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2015-03-20 23:05:12 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2015-03-20 23:05:12 +0000
commitf7298d60c6d9870ecc09a48152379038f289b61c (patch)
tree9ac10a0fbcb46c1929c85b51dde1aaf96e4d0311
parent31839b6a33a87889e43abadb307ce81c83580492 (diff)
Gem 136832db9e7bc7721b329539d6756e51b5f02abe linux/amd64
built 'master:136832db9e7bc7721b329539d6756e51b5f02abe' for linux/amd64
-rwxr-xr-xGem/Gem.pd_linuxbin27007590 -> 27134523 bytes
-rw-r--r--Gem/develop/include/Gem/Base/CPPExtern.h10
-rw-r--r--Gem/develop/include/Gem/Base/GemBase.h2
-rw-r--r--Gem/develop/include/Gem/Base/GemWindow.h7
-rwxr-xr-xGem/gemglxwindow.pd_linuxbin204120 -> 204376 bytes
-rwxr-xr-xGem/pix_drum.pd_linuxbin92612 -> 92698 bytes
-rwxr-xr-xGem/pix_fiducialtrack.pd_linuxbin250132 -> 250242 bytes
-rwxr-xr-xGem/pix_hit.pd_linuxbin62377 -> 62503 bytes
-rwxr-xr-xGem/pix_mano.pd_linuxbin144271 -> 144357 bytes
9 files changed, 18 insertions, 1 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux
index 0f424b2..a0f8880 100755
--- a/Gem/Gem.pd_linux
+++ b/Gem/Gem.pd_linux
Binary files differ
diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h
index 0350681..ddacc54 100644
--- a/Gem/develop/include/Gem/Base/CPPExtern.h
+++ b/Gem/develop/include/Gem/Base/CPPExtern.h
@@ -122,6 +122,12 @@ class GEM_EXTERN CPPExtern
// Creation callback
static void real_obj_setupCallback(t_class *) {}
+ ///////////
+ // called directly before the destructor
+ // normally you should not override this (use the dtor!)
+ // if you do override this, make sure that you call the parent as well
+ virtual void beforeDeletion();
+
private:
//////////
@@ -157,7 +163,9 @@ class GEM_EXTERN CPPExtern
#define CPPEXTERN_HEADER(NEW_CLASS, PARENT_CLASS) \
public: \
static void obj_freeCallback(void *data) \
-{ CPPExtern *mydata = ((Obj_header *)data)->data; delete mydata; \
+{ CPPExtern *mydata = ((Obj_header *)data)->data; \
+ GetMyClass(data)->beforeDeletion(); \
+ delete mydata; \
((Obj_header *)data)->Obj_header::~Obj_header(); } \
static void real_obj_setupCallback(t_class *classPtr) \
{ PARENT_CLASS::real_obj_setupCallback(classPtr); \
diff --git a/Gem/develop/include/Gem/Base/GemBase.h b/Gem/develop/include/Gem/Base/GemBase.h
index 09e6a8f..9b0d362 100644
--- a/Gem/develop/include/Gem/Base/GemBase.h
+++ b/Gem/develop/include/Gem/Base/GemBase.h
@@ -128,6 +128,8 @@ class GEM_EXTERN GemBase : public CPPExtern
protected:
enum RenderState getState(void);
+
+ virtual void beforeDeletion(void);
};
#endif // for header file
diff --git a/Gem/develop/include/Gem/Base/GemWindow.h b/Gem/develop/include/Gem/Base/GemWindow.h
index c5105c4..18ad28f 100644
--- a/Gem/develop/include/Gem/Base/GemWindow.h
+++ b/Gem/develop/include/Gem/Base/GemWindow.h
@@ -30,6 +30,7 @@ DESCRIPTION
namespace gem {
class Context;
};
+class GemBase;
class GEM_EXTERN GemWindow : public CPPExtern
{
@@ -86,6 +87,12 @@ class GEM_EXTERN GemWindow : public CPPExtern
*/
static gem::Context*destroyContext(gem::Context*);
+ /*
+ * call stopRendering() of a given objects for all valid contexts
+ * (this will make each context current, call obj->stopRendering and switch back to the original context)
+ */
+ static void stopInAllContexts(GemBase*obj);
+
/* this MUST be called from the derived classes
* as it will eventually establish a new GemContext (if m_context is non-NULL)
* if you want to share GemContext's you MUST call
diff --git a/Gem/gemglxwindow.pd_linux b/Gem/gemglxwindow.pd_linux
index 35d4d3e..e346591 100755
--- a/Gem/gemglxwindow.pd_linux
+++ b/Gem/gemglxwindow.pd_linux
Binary files differ
diff --git a/Gem/pix_drum.pd_linux b/Gem/pix_drum.pd_linux
index 53dfdc6..46ee9f7 100755
--- a/Gem/pix_drum.pd_linux
+++ b/Gem/pix_drum.pd_linux
Binary files differ
diff --git a/Gem/pix_fiducialtrack.pd_linux b/Gem/pix_fiducialtrack.pd_linux
index ea569f2..4f2e989 100755
--- a/Gem/pix_fiducialtrack.pd_linux
+++ b/Gem/pix_fiducialtrack.pd_linux
Binary files differ
diff --git a/Gem/pix_hit.pd_linux b/Gem/pix_hit.pd_linux
index 9c5973f..bdde5b7 100755
--- a/Gem/pix_hit.pd_linux
+++ b/Gem/pix_hit.pd_linux
Binary files differ
diff --git a/Gem/pix_mano.pd_linux b/Gem/pix_mano.pd_linux
index 234a9fc..3aa6345 100755
--- a/Gem/pix_mano.pd_linux
+++ b/Gem/pix_mano.pd_linux
Binary files differ