X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmodule.h;h=ec06be37ee50733372222f44c06eb499b9541814;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=d51bdedd7145839bea37992647394b86b67bef80;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/module.h b/synfig-core/trunk/src/synfig/module.h
index d51bded..ec06be3 100644
--- a/synfig-core/trunk/src/synfig/module.h
+++ b/synfig-core/trunk/src/synfig/module.h
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file module.h
+/*!	\file synfig/module.h
 **	\brief writeme
 **
-**	$Id: module.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -31,6 +32,7 @@
 #include <ETL/handle>
 #include <map>
 #include "string.h"
+#include "releases.h"
 #include <utility>
 #include "vector.h"
 #include "color.h"
@@ -42,7 +44,7 @@
 /* === M A C R O S ========================================================= */
 
 //! Marks the start of a module description
-#define MODULE_DESC_BEGIN(x) struct x##_modclass : public synfig::Module { x##_modclass(synfig::ProgressCallback *callback=NULL); 
+#define MODULE_DESC_BEGIN(x) struct x##_modclass : public synfig::Module { x##_modclass(synfig::ProgressCallback *callback=NULL);
 
 //! Sets the localized name of the module
 #define MODULE_NAME(x) 			virtual const char * Name() { return x; }
@@ -75,23 +77,23 @@
 	synfig::Module* _##x##_LTX_new_instance(synfig::ProgressCallback *cb) \
 	{ if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\
 	if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \
-	}; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { 
+	}; x##_modclass::x##_modclass(synfig::ProgressCallback */*cb*/) {
 #else
 //! Marks the start of a module's inventory
 #define MODULE_INVENTORY_BEGIN(x)  extern "C" {		\
 	synfig::Module* x##_LTX_new_instance(synfig::ProgressCallback *cb) \
 	{ if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\
 	if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \
-	}; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { 
+	}; x##_modclass::x##_modclass(synfig::ProgressCallback */*cb*/) {
 #endif
 
 //! Marks the start of the layers in the module's inventory
 #define BEGIN_LAYERS {
 
-//! DEPRECATED - use @INCLUDE_LAYER()
+//! DEPRECATED - use #INCLUDE_LAYER(class)
+#define LAYER(class)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,class::name__,dgettext("synfig",class::local_name__),dgettext("synfig",class::category__),class::cvs_id__,class::version__));
 //#define LAYER(x) synfig::Layer::book()[synfig::String(x::name__)]=x::create;
-#define LAYER(class)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__));
-#define LAYER_ALIAS(class,alias)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__));
+#define LAYER_ALIAS(class,alias)  	synfig::Layer::register_in_book(synfig::Layer::BookEntry(class::create,alias,alias,CATEGORY_DO_NOT_USE,class::cvs_id__,class::version__));
 
 //! Marks the end of the layers in the module's inventory
 #define END_LAYERS }
@@ -99,7 +101,11 @@
 //! Marks the start of the targets in the module's inventory
 #define BEGIN_TARGETS {
 
-#define TARGET(x) synfig::Target::book()[synfig::String(x::name__)]=std::pair<synfig::Target::Factory,synfig::String>(x::create,synfig::String(x::ext__));synfig::Target::ext_book()[synfig::String(x::ext__)]=x::name__;
+#define TARGET(x)																				\
+	synfig::Target::book()[synfig::String(x::name__)]=											\
+		std::pair<synfig::Target::Factory,synfig::String>										\
+			(x::create,synfig::String(x::ext__));												\
+	synfig::Target::ext_book()[synfig::String(x::ext__)]=x::name__;
 
 #define TARGET_EXT(x,y) synfig::Target::ext_book()[synfig::String(y)]=x::name__;
 
@@ -116,6 +122,18 @@
 //! Marks the end of the importers in the module's inventory
 #define END_IMPORTERS }
 
+//! Marks the start of the valuenodes in the module's inventory
+#define BEGIN_VALUENODES { synfig::LinkableValueNode::Book &book(synfig::LinkableValueNode::book());
+
+#define VALUENODE(class,name,local,version)														\
+	book[name].factory=reinterpret_cast<synfig::LinkableValueNode::Factory>(&class::create);	\
+	book[name].check_type=&class::check_type;													\
+	book[name].local_name=local;																\
+	book[name].release_version=version;
+
+//! Marks the end of the valuenodes in the module's inventory
+#define END_VALUENODES }
+
 //! Marks the end of a module's inventory
 #define MODULE_INVENTORY_END	}
 
@@ -133,13 +151,13 @@ class ProgressCallback;
 class Module : public etl::shared_object
 {
 public:
-	bool constructor_(synfig::ProgressCallback *cb) { return true; }
+	bool constructor_(synfig::ProgressCallback */*cb*/) { return true; }
 	virtual void destructor_() { }
-	
+
 	typedef etl::handle<Module> Handle;
 	typedef etl::loose_handle<Module> LooseHandle;
 	typedef etl::handle<const Module> ConstHandle;
-	
+
 public:
 	typedef Module*(*constructor_type)(ProgressCallback *);
 	typedef std::map<String, Handle > Book;
@@ -155,7 +173,7 @@ public:
 	static void Register(Handle mod);
 	static bool Register(const String &module_name, ProgressCallback *cb=NULL);
 	static inline void Register(Module *mod) { Register(Handle(mod)); }
-	
+
 	virtual const char * Name() { return " "; }
 	virtual const char * Desc() { return " "; }
 	virtual const char * Author() { return " "; }