diff --git a/src/common/config_interface.c b/src/common/config_interface.c index 9f83b3e56..6dedcca69 100644 --- a/src/common/config_interface.c +++ b/src/common/config_interface.c @@ -38,28 +38,28 @@ LUMIERA_EXPORT( NULL, NULL, NULL, - LUMIERA_INTERFACE_MAP (load, "\177\002\314\014\245\001\056\246\317\203\322\346\114\061\262\366", + LUMIERA_INTERFACE_MAP (load, lumiera_config_load), - LUMIERA_INTERFACE_MAP (save, "\271\141\152\017\060\312\103\343\342\063\007\142\374\201\163\334", + LUMIERA_INTERFACE_MAP (save, lumiera_config_save), - LUMIERA_INTERFACE_MAP (purge, "\321\275\170\140\010\075\323\340\371\050\345\131\267\070\076\130", + LUMIERA_INTERFACE_MAP (purge, lumiera_config_purge), - LUMIERA_INTERFACE_MAP (dump, "\317\357\304\076\137\035\100\023\130\021\327\253\314\237\311\045", + LUMIERA_INTERFACE_MAP (dump, lumiera_config_dump), - LUMIERA_INTERFACE_INLINE (setdefault, "\344\337\116\131\101\037\175\227\310\151\216\240\125\316\241\115", + LUMIERA_INTERFACE_INLINE (setdefault, int, (const char* line), {return !!lumiera_config_setdefault (line);} ), - LUMIERA_INTERFACE_MAP (reset, "\337\143\274\052\364\362\256\353\165\161\352\267\026\204\154\231", + LUMIERA_INTERFACE_MAP (reset, lumiera_config_reset), - LUMIERA_INTERFACE_MAP (info, "\355\305\326\372\236\302\122\253\114\024\376\010\326\055\132\130", + LUMIERA_INTERFACE_MAP (info, lumiera_config_info), - LUMIERA_INTERFACE_MAP (wordlist_get_nth, "\151\224\043\353\244\134\360\125\361\352\236\267\225\371\020\173", + LUMIERA_INTERFACE_MAP (wordlist_get_nth, lumiera_config_wordlist_get_nth), - LUMIERA_INTERFACE_MAP (wordlist_find, "\276\103\153\017\257\171\300\277\311\352\027\054\174\017\321\213", + LUMIERA_INTERFACE_MAP (wordlist_find, lumiera_config_wordlist_find), - LUMIERA_INTERFACE_INLINE (wordlist_replace, "\365\115\171\203\374\371\236\246\212\021\121\003\161\364\060\011", + LUMIERA_INTERFACE_INLINE (wordlist_replace, int, (const char* key, const char* value, const char* subst1, @@ -67,70 +67,70 @@ LUMIERA_EXPORT( const char* delims), {return !!lumiera_config_wordlist_replace (key, value, subst1, subst2, delims);} ), - LUMIERA_INTERFACE_INLINE (wordlist_add, "\133\255\034\074\300\073\374\067\241\145\302\067\256\301\206\034", + LUMIERA_INTERFACE_INLINE (wordlist_add, int, (const char* key, const char* value, const char* delims), {return !!lumiera_config_wordlist_add (key, value, delims);} ), - LUMIERA_INTERFACE_INLINE (link_get, "\062\177\332\266\004\256\323\102\252\064\153\054\313\151\124\361", + LUMIERA_INTERFACE_INLINE (link_get, int, (const char* key, const char** value), {return !!lumiera_config_link_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (link_set, "\303\273\325\021\071\344\270\041\342\341\233\072\262\216\333\100", + LUMIERA_INTERFACE_INLINE (link_set, int, (const char* key, const char** value), {return !!lumiera_config_link_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (number_get, "\300\070\066\026\154\053\052\176\212\021\376\240\314\224\235\300", + LUMIERA_INTERFACE_INLINE (number_get, int, (const char* key, long long* value), {return !!lumiera_config_number_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (number_set, "\231\142\147\006\243\203\002\354\152\237\147\074\115\363\345\127", + LUMIERA_INTERFACE_INLINE (number_set, int, (const char* key, long long* value), {return !!lumiera_config_number_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (real_get, "\356\335\127\112\365\220\056\000\051\077\247\013\046\210\164\120", + LUMIERA_INTERFACE_INLINE (real_get, int, (const char* key, long double* value), {return !!lumiera_config_real_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (real_set, "\205\011\020\140\014\112\134\076\232\352\246\025\274\227\347\047", + LUMIERA_INTERFACE_INLINE (real_set, int, (const char* key, long double* value), {return !!lumiera_config_real_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (string_get, "\215\104\350\103\163\245\065\235\373\237\364\155\312\225\027\304", + LUMIERA_INTERFACE_INLINE (string_get, int, (const char* key, const char** value), {return !!lumiera_config_string_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (string_set, "\014\003\357\020\117\035\073\353\302\026\231\351\037\051\163\346", + LUMIERA_INTERFACE_INLINE (string_set, int, (const char* key, const char** value), {return !!lumiera_config_string_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (wordlist_get, "\000\276\355\321\257\366\166\247\246\141\224\304\142\306\047\131", + LUMIERA_INTERFACE_INLINE (wordlist_get, int, (const char* key, const char** value), {return !!lumiera_config_wordlist_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (wordlist_set, "\340\352\216\303\161\056\354\264\121\162\003\061\345\001\306\265", + LUMIERA_INTERFACE_INLINE (wordlist_set, int, (const char* key, const char** value), {return !!lumiera_config_wordlist_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (word_get, "\057\337\302\110\276\332\307\172\035\012\246\315\370\203\226\135", + LUMIERA_INTERFACE_INLINE (word_get, int, (const char* key, const char** value), {return !!lumiera_config_word_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (word_set, "\151\276\334\165\173\165\333\224\076\264\352\371\205\174\105\013", + LUMIERA_INTERFACE_INLINE (word_set, int, (const char* key, const char** value), {return !!lumiera_config_word_set (key, value);} ), - LUMIERA_INTERFACE_INLINE (bool_get, "\204\254\234\117\147\323\210\236\102\234\123\323\124\221\305\234", + LUMIERA_INTERFACE_INLINE (bool_get, int, (const char* key, int* value), {return !!lumiera_config_bool_get (key, value);} ), - LUMIERA_INTERFACE_INLINE (bool_set, "\215\151\207\006\032\117\354\053\311\035\261\141\120\117\310\007", + LUMIERA_INTERFACE_INLINE (bool_set, int, (const char* key, int* value), {return !!lumiera_config_bool_set (key, value);} ), diff --git a/src/common/interface.c b/src/common/interface.c index 71cf71e96..865ef86dd 100644 --- a/src/common/interface.c +++ b/src/common/interface.c @@ -316,11 +316,11 @@ LUMIERA_EXPORT( NULL, NULL, NULL, - LUMIERA_INTERFACE_MAP (open, "\322\165\227\133\252\355\125\104\157\167\253\267\117\273\174\022", + LUMIERA_INTERFACE_MAP (open, lumiera_interface_open), - LUMIERA_INTERFACE_MAP (close, "\264\037\253\243\312\273\024\104\030\007\076\006\154\071\340\102", + LUMIERA_INTERFACE_MAP (close, lumiera_interface_close), - LUMIERA_INTERFACE_MAP (version, "\004\272\070\214\006\235\047\212\007\165\115\221\146\274\217\324", + LUMIERA_INTERFACE_MAP (version, lumiera_interface_version), ) ) diff --git a/src/common/interface.h b/src/common/interface.h index 82dabddf3..08d2c86fa 100644 --- a/src/common/interface.h +++ b/src/common/interface.h @@ -21,7 +21,6 @@ #ifndef LUMIERA_INTERFACE_H #define LUMIERA_INTERFACE_H -#include "lib/luid.h" #include "lib/ppmpl.h" #include "lib/psplay.h" @@ -66,8 +65,8 @@ * the following form: * \code * LUMIERA_INTERFACE_INSTANCE(iname, version, name, descriptor, acquire, release, - * LUMIERA_INTERFACE_MAP (slot, luid, function), - * LUMIERA_INTERFACE_INLINE (slot, luid, ret, params, {body}), + * LUMIERA_INTERFACE_MAP (slot, function), + * LUMIERA_INTERFACE_INLINE (slot, ret, params, {body}), * ... * ) * \endcode @@ -80,7 +79,7 @@ * ... * ) // Exporting from the core * - * LUMIERA_PLUGIN(descriptor, acquire, release, luid, + * LUMIERA_PLUGIN(descriptor, acquire, release, * LUMIERA_INTERFACE_DEFINE(...), * ... * ) // Exporting from an interface @@ -184,7 +183,6 @@ LUMIERA_INTERFACE_TYPE(name, version) \ */ #define PPMPL_FOREACH_LUMIERA_INTERFACE_SLOT(ret, name, params) \ ret (*name) params; \ - lumiera_uid name##_uid; /* @@ -221,28 +219,26 @@ PPMPL_FOREACH(_P2_, __VA_ARGS__) /** * Map a function to a interface slot * @param slot name of the slot to be mapped - * @param luid unique identifier for this function, use the magic word LUIDGEN here and run the - * lumiera uuid generator tool (to be written) over the source file to generate luid's automatically * @param function name of the function to be mapped on slot * * @note C++ requires that all mappings are in the same order than defined in the interface declaration, * this would be good style for C too anyways */ -#define PPMPL_FOREACH_P1_LUMIERA_INTERFACE_MAP(slot, luid, function) +#define PPMPL_FOREACH_P1_LUMIERA_INTERFACE_MAP(slot, function) #ifdef __cplusplus -#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_MAP(slot, luid, function) \ - function, LUMIERA_UID_INITIALIZER (luid), +#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_MAP(slot, function) \ + function,\ + #else -#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_MAP(slot, luid, function) \ - .slot = function, .slot##_uid = LUMIERA_UID_INITIALIZER (luid), +#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_MAP(slot, function) \ + .slot = function,\ + #endif /** * Map a inline defined function to a interface slot * @param slot name of the slot to be mapped - * @param luid unique identifier for this function, use the magic word LUIDGEN here and run the - * lumiera uuid generator tool (to be written) over the source file to generate luid's automatically * @param ret return type of the inline function * @param params parentized list of parameters given to the function * @param ... braced function body @@ -250,17 +246,19 @@ PPMPL_FOREACH(_P2_, __VA_ARGS__) * @note C++ requires that all mappings are in the same order than defined in the interface declaration, * this would be good style for C too anyways */ -#define PPMPL_FOREACH_P1_LUMIERA_INTERFACE_INLINE(slot, luid, ret, params, ...) \ +#define PPMPL_FOREACH_P1_LUMIERA_INTERFACE_INLINE(slot, ret, params, ...) \ static ret \ LUMIERA_INTERFACE_INLINE_NAME(slot) params \ __VA_ARGS__ #ifdef __cplusplus -#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_INLINE(slot, luid, ret, params, ...) \ - LUMIERA_INTERFACE_INLINE_NAME(slot), LUMIERA_UID_INITIALIZER (luid), +#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_INLINE(slot, ret, params, ...) \ + LUMIERA_INTERFACE_INLINE_NAME(slot),\ + #else -#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_INLINE(slot, luid, ret, params, ...) \ - .slot = LUMIERA_INTERFACE_INLINE_NAME(slot), .slot##_uid = LUMIERA_UID_INITIALIZER (luid), +#define PPMPL_FOREACH_P2_LUMIERA_INTERFACE_INLINE(slot, ret, params, ...) \ + .slot = LUMIERA_INTERFACE_INLINE_NAME(slot),\ + #endif #define LUMIERA_INTERFACE_INLINE_NAME(slot) PPMPL_CAT(lumiera_##slot##_l, __LINE__) @@ -318,7 +316,6 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg__plugin, 0, NULL, \ NULL, \ LUMIERA_INTERFACE_MAP (plugin_interfaces, \ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", \ lumiera_plugin_interfaces) \ ); #define LUMIERA_INTERFACE_REGISTEREXPORTED @@ -382,7 +379,6 @@ typedef lumiera_interface* LumieraInterface; struct lumiera_interfaceslot_struct { void (*func)(void); - lumiera_uid uid; }; diff --git a/src/gui/display-service.cpp b/src/gui/display-service.cpp index 96600bf3b..c63b8c267 100644 --- a/src/gui/display-service.cpp +++ b/src/gui/display-service.cpp @@ -41,31 +41,31 @@ namespace gui { LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0 ,lumieraorg_DisplayFacade_descriptor , NULL, NULL, NULL - , LUMIERA_INTERFACE_INLINE (name, "\323\343\324\023\064\216\120\201\073\056\366\020\110\263\060\023", + , LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface ifa), { (void)ifa; return "Display"; } ) - , LUMIERA_INTERFACE_INLINE (brief, "\305\026\070\133\033\357\014\202\203\270\174\072\341\256\226\235", + , LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface ifa), { (void)ifa; return "UI Interface: service for outputting frames to a viewer or display"; } ) - , LUMIERA_INTERFACE_INLINE (homepage, "\170\104\246\175\123\144\332\312\315\263\071\170\164\213\024\275", + , LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface ifa), { (void)ifa; return "http://www.lumiera.org/develompent.html" ;} ) - , LUMIERA_INTERFACE_INLINE (version, "\265\343\045\346\110\241\276\111\217\120\155\246\230\341\344\124", + , LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface ifa), { (void)ifa; return "0.1~pre"; } ) - , LUMIERA_INTERFACE_INLINE (author, "\302\027\122\045\301\166\046\236\257\253\144\035\105\166\070\103", + , LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface ifa), { (void)ifa; return "Hermann Vosseler"; } ) - , LUMIERA_INTERFACE_INLINE (email, "\074\013\020\161\075\135\302\265\260\000\301\147\116\355\035\261", + , LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface ifa), { (void)ifa; return "Ichthyostega@web.de"; } ) - , LUMIERA_INTERFACE_INLINE (copyright, "\037\232\153\100\114\103\074\342\164\132\370\210\372\164\115\275", + , LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface ifa), { (void)ifa; @@ -74,7 +74,7 @@ namespace gui { " 2009 Hermann Vosseler "; } ) - , LUMIERA_INTERFACE_INLINE (license, "\026\243\334\056\125\245\315\311\155\375\262\344\007\076\341\254", + , LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface ifa), { (void)ifa; @@ -94,11 +94,11 @@ namespace gui { "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; } ) - , LUMIERA_INTERFACE_INLINE (state, "\243\302\332\160\060\272\155\334\212\256\303\141\160\063\164\154", + , LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface ifa), {(void)ifa; return LUMIERA_INTERFACE_EXPERIMENTAL; } ) - , LUMIERA_INTERFACE_INLINE (versioncmp, "\363\125\123\060\231\147\053\017\131\341\105\157\231\273\334\136", + , LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ////////////////////////////////////////////TODO define version ordering ) @@ -120,7 +120,7 @@ namespace gui { , LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_DisplayFacade_descriptor) , NULL /* on open */ , NULL /* on close */ - , LUMIERA_INTERFACE_INLINE (allocate, "\177\221\146\253\255\161\160\137\015\005\263\362\307\022\243\365", + , LUMIERA_INTERFACE_INLINE (allocate, void, (LumieraDisplaySlot slotHandle), { if (!_instance) @@ -137,7 +137,7 @@ namespace gui { catch (lumiera::Error&){ /* error state remains set */ } } ) - , LUMIERA_INTERFACE_INLINE (release, "\166\374\106\313\011\142\115\161\111\110\376\016\346\115\240\364", + , LUMIERA_INTERFACE_INLINE (release, void, (LumieraDisplaySlot slotHandle), { if (!_instance) @@ -150,7 +150,7 @@ namespace gui { _instance->allocate (slotHandle,false); } ) - , LUMIERA_INTERFACE_INLINE (put, "\340\062\234\227\152\131\370\272\146\207\224\015\361\070\252\135", + , LUMIERA_INTERFACE_INLINE (put, void, (LumieraDisplaySlot slotHandle, LumieraDisplayFrame frame), { //skipping full checks for performance reasons diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp index 61c0b81ad..59b3d6edf 100644 --- a/src/gui/guistart.cpp +++ b/src/gui/guistart.cpp @@ -169,31 +169,31 @@ extern "C" { /* ================== define an lumieraorg_Gui instance =========== LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0 ,lumieraorg_GuiStarterPlugin_descriptor , NULL, NULL, NULL - , LUMIERA_INTERFACE_INLINE (name, "\126\247\365\337\126\254\173\037\130\310\337\345\200\347\323\136", + , LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface ifa), { (void)ifa; return "GuiStarterPlugin"; } ) - , LUMIERA_INTERFACE_INLINE (brief, "\056\346\322\365\344\104\232\232\355\213\367\056\301\144\051\021", + , LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface ifa), { (void)ifa; return "entry point to start up the Lumiera GTK GUI contained in this dynamic module"; } ) - , LUMIERA_INTERFACE_INLINE (homepage, "\357\056\117\165\320\066\273\130\113\100\367\022\221\350\236\256", + , LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface ifa), { (void)ifa; return "http://www.lumiera.org/develompent.html" ;} ) - , LUMIERA_INTERFACE_INLINE (version, "\013\117\366\210\070\320\274\076\253\230\032\116\271\161\027\354", + , LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface ifa), { (void)ifa; return "0.1~pre"; } ) - , LUMIERA_INTERFACE_INLINE (author, "\371\262\024\273\170\105\163\261\351\240\051\003\153\040\256\155", + , LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface ifa), { (void)ifa; return "Joel Holdsworth, Christian Thaeter, Hermann Vosseler"; } ) - , LUMIERA_INTERFACE_INLINE (email, "\353\242\247\130\056\242\314\145\053\162\003\060\200\357\303\214", + , LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface ifa), { (void)ifa; return "Lumiera@lists.lumiera.org"; } ) - , LUMIERA_INTERFACE_INLINE (copyright, "\172\325\335\304\015\222\377\372\343\151\255\020\030\103\320\101", + , LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface ifa), { (void)ifa; @@ -204,7 +204,7 @@ extern "C" { /* ================== define an lumieraorg_Gui instance =========== " Hermann Vosseler "; } ) - , LUMIERA_INTERFACE_INLINE (license, "\016\264\202\005\160\305\033\227\037\077\143\363\263\011\167\257", + , LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface ifa), { (void)ifa; @@ -224,11 +224,11 @@ extern "C" { /* ================== define an lumieraorg_Gui instance =========== "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; } ) - , LUMIERA_INTERFACE_INLINE (state, "\006\070\035\065\267\073\016\107\376\027\355\035\135\176\107\064", + , LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface ifa), {(void)ifa; return LUMIERA_INTERFACE_EXPERIMENTAL; } ) - , LUMIERA_INTERFACE_INLINE (versioncmp, "\224\077\275\040\357\244\311\244\112\030\042\163\061\166\245\325", + , LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ////////////////////////////////////////////TODO define version ordering ) @@ -242,7 +242,7 @@ extern "C" { /* ================== define an lumieraorg_Gui instance =========== , LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_GuiStarterPlugin_descriptor) , NULL /* on open */ , NULL /* on close */ - , LUMIERA_INTERFACE_INLINE (kickOff, "\255\142\006\244\057\170\152\312\301\372\220\323\230\026\200\065", + , LUMIERA_INTERFACE_INLINE (kickOff, bool, (void* termSig), { return gui::kickOff (*reinterpret_cast (termSig)); diff --git a/src/gui/notification-service.cpp b/src/gui/notification-service.cpp index 366a3e13a..1447d893a 100644 --- a/src/gui/notification-service.cpp +++ b/src/gui/notification-service.cpp @@ -65,31 +65,31 @@ namespace gui { LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0 ,lumieraorg_GuiNotificationFacade_descriptor , NULL, NULL, NULL - , LUMIERA_INTERFACE_INLINE (name, "\044\117\156\365\344\056\362\220\166\350\320\214\115\221\302\177", + , LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface ifa), { (void)ifa; return "GuiNotification"; } ) - , LUMIERA_INTERFACE_INLINE (brief, "\160\240\102\325\175\145\270\140\350\241\163\303\331\343\253\142", + , LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface ifa), { (void)ifa; return "GUI Interface: push state update and notification of events into the GUI"; } ) - , LUMIERA_INTERFACE_INLINE (homepage, "\217\232\066\101\042\116\054\217\070\233\253\241\166\145\234\133", + , LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface ifa), { (void)ifa; return "http://www.lumiera.org/develompent.html" ;} ) - , LUMIERA_INTERFACE_INLINE (version, "\350\365\121\052\037\022\300\021\171\357\017\367\270\071\266\376", + , LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface ifa), { (void)ifa; return "0.1~pre"; } ) - , LUMIERA_INTERFACE_INLINE (author, "\117\007\006\234\153\206\000\344\303\043\027\261\045\320\166\133", + , LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface ifa), { (void)ifa; return "Hermann Vosseler"; } ) - , LUMIERA_INTERFACE_INLINE (email, "\356\243\022\137\345\275\016\034\337\144\031\260\303\050\140\327", + , LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface ifa), { (void)ifa; return "Ichthyostega@web.de"; } ) - , LUMIERA_INTERFACE_INLINE (copyright, "\365\220\260\051\267\345\330\046\145\134\331\320\115\157\332\356", + , LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface ifa), { (void)ifa; @@ -98,7 +98,7 @@ namespace gui { " 2008 Hermann Vosseler "; } ) - , LUMIERA_INTERFACE_INLINE (license, "\155\335\361\364\221\012\115\325\306\046\153\152\002\117\075\077", + , LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface ifa), { (void)ifa; @@ -118,11 +118,11 @@ namespace gui { "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; } ) - , LUMIERA_INTERFACE_INLINE (state, "\227\170\230\144\310\330\131\175\367\152\327\324\113\275\223\245", + , LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface ifa), {(void)ifa; return LUMIERA_INTERFACE_EXPERIMENTAL; } ) - , LUMIERA_INTERFACE_INLINE (versioncmp, "\253\066\335\233\025\161\135\347\377\156\121\135\347\313\130\014", + , LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ////////////////////////////////////////////TODO define version ordering ) @@ -144,7 +144,7 @@ namespace gui { , LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_GuiNotificationFacade_descriptor) , NULL /* on open */ , NULL /* on close */ - , LUMIERA_INTERFACE_INLINE (displayInfo, "\366\075\213\163\207\040\221\233\010\366\174\374\317\126\331\205", + , LUMIERA_INTERFACE_INLINE (displayInfo, void, (const char* text), { if (!_instance) lumiera_error_set(LUMIERA_ERROR_FACADE_LIFECYCLE, text); @@ -152,7 +152,7 @@ namespace gui { _instance->displayInfo(text); } ) - , LUMIERA_INTERFACE_INLINE (triggerGuiShutdown, "\267\043\244\065\107\314\370\175\063\330\264\257\302\146\326\303", + , LUMIERA_INTERFACE_INLINE (triggerGuiShutdown, void, (const char* cause), { if (!_instance) lumiera_error_set(LUMIERA_ERROR_FACADE_LIFECYCLE, cause); diff --git a/src/lib/luid.h b/src/lib/luid.h index 41c2db330..3037f8f5d 100644 --- a/src/lib/luid.h +++ b/src/lib/luid.h @@ -63,6 +63,7 @@ C++ can't initialize arrays from string literals with the trailing \0 cropped C can't initialize non constant members, there we go + ////////////////////////////////TODO 3/2014 possibly not used anymore, after removing LUIDs from the Interface descriptors (see #925) */ #ifdef __cplusplus #define LUMIERA_UID_INITIALIZER(l) \ diff --git a/src/proc/play/dummy-player-service.cpp b/src/proc/play/dummy-player-service.cpp index 9669af14a..0ce067655 100644 --- a/src/proc/play/dummy-player-service.cpp +++ b/src/proc/play/dummy-player-service.cpp @@ -103,31 +103,31 @@ namespace proc { LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0 ,lumieraorg_DummyPlayerFacade_descriptor , NULL, NULL, NULL - , LUMIERA_INTERFACE_INLINE (name, "\305\162\202\240\075\316\146\100\314\152\075\343\372\065\226\307", + , LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface ifa), { (void)ifa; return "DummyPlayer"; } ) - , LUMIERA_INTERFACE_INLINE (brief, "\317\045\366\076\064\072\156\274\220\346\262\207\062\367\057\232", + , LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface ifa), { (void)ifa; return "Proc Interface: dummy player to test integration with the GUI"; } ) - , LUMIERA_INTERFACE_INLINE (homepage, "\136\225\033\362\161\251\300\256\117\072\171\102\235\004\235\200", + , LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface ifa), { (void)ifa; return "http://www.lumiera.org/develompent.html" ;} ) - , LUMIERA_INTERFACE_INLINE (version, "\212\146\344\127\124\116\101\205\211\174\322\241\162\122\023\165", + , LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface ifa), { (void)ifa; return "0.1~pre"; } ) - , LUMIERA_INTERFACE_INLINE (author, "\064\226\072\300\054\345\042\357\337\226\155\025\306\051\117\105", + , LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface ifa), { (void)ifa; return "Hermann Vosseler"; } ) - , LUMIERA_INTERFACE_INLINE (email, "\041\075\220\112\246\304\261\135\003\135\060\202\230\327\303\206", + , LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface ifa), { (void)ifa; return "Ichthyostega@web.de"; } ) - , LUMIERA_INTERFACE_INLINE (copyright, "\232\305\163\271\174\025\270\075\012\201\331\256\327\375\066\210", + , LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface ifa), { (void)ifa; @@ -136,7 +136,7 @@ namespace proc { " 2009 Hermann Vosseler "; } ) - , LUMIERA_INTERFACE_INLINE (license, "\136\136\073\173\145\357\151\062\040\013\323\272\051\352\305\060", + , LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface ifa), { (void)ifa; @@ -156,11 +156,11 @@ namespace proc { "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; } ) - , LUMIERA_INTERFACE_INLINE (state, "\224\251\004\001\165\140\116\246\126\311\115\234\023\026\331\350", + , LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface ifa), {(void)ifa; return LUMIERA_INTERFACE_EXPERIMENTAL; } ) - , LUMIERA_INTERFACE_INLINE (versioncmp, "\267\155\303\046\353\222\323\014\145\027\043\100\370\311\257\126", + , LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ////////////////////////////////////////////TODO define version ordering ) @@ -183,7 +183,7 @@ namespace proc { , LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_DummyPlayerFacade_descriptor) , NULL /* on open */ , NULL /* on close */ - , LUMIERA_INTERFACE_INLINE (startPlay, "\143\323\102\155\051\006\235\004\037\310\354\121\176\142\342\210", + , LUMIERA_INTERFACE_INLINE (startPlay, LumieraPlayProcess, (LumieraDisplaySlot viewerHandle), { if (!_instance) @@ -195,7 +195,7 @@ namespace proc { return static_cast (_instance->start(viewerHandle)); } ) - , LUMIERA_INTERFACE_INLINE (togglePlay, "\275\157\316\220\210\053\226\134\057\016\273\265\240\053\112\307", + , LUMIERA_INTERFACE_INLINE (togglePlay, void, (LumieraPlayProcess handle, bool doPlay), { if (!_instance) @@ -210,7 +210,7 @@ namespace proc { proc->doPlay(doPlay); } ) - , LUMIERA_INTERFACE_INLINE (terminate, "\005\265\115\021\076\143\010\215\373\252\370\174\235\136\340\004", + , LUMIERA_INTERFACE_INLINE (terminate, void, (LumieraPlayProcess handle), { if (!_instance) diff --git a/tests/core/application/test-interfaces.c b/tests/core/application/test-interfaces.c index 8d4e9ff12..f756a176d 100644 --- a/tests/core/application/test-interfaces.c +++ b/tests/core/application/test-interfaces.c @@ -85,31 +85,31 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_tests_descriptor), testacquire, testrelease, - LUMIERA_INTERFACE_INLINE (name, "\073\003\054\127\344\046\324\321\221\262\232\026\376\123\125\243", + LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface iface), {return "LumieraTest";} ), - LUMIERA_INTERFACE_INLINE (brief, "\241\337\035\172\323\377\355\036\171\326\323\163\177\242\364\172", + LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface iface), {return "Lumiera Test suite examples";} ), - LUMIERA_INTERFACE_INLINE (homepage, "\030\374\031\152\024\167\154\346\303\372\177\353\304\306\275\247", + LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface iface), {return "http://www.lumiera.org/develompent.html";} ), - LUMIERA_INTERFACE_INLINE (version, "\271\330\345\066\304\217\211\065\157\120\031\365\304\363\364\074", + LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface iface), {return "No Version";} ), - LUMIERA_INTERFACE_INLINE (author, "\367\160\342\065\147\007\237\371\141\335\371\131\025\030\257\232", + LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface iface), {return "Christian Thaeter";} ), - LUMIERA_INTERFACE_INLINE (email, "\334\272\125\312\140\347\121\020\155\047\226\352\244\141\107\363", + LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface iface), {return "ct@pipapo.org";} ), - LUMIERA_INTERFACE_INLINE (copyright, "\163\106\344\014\251\125\111\252\236\322\174\120\335\225\333\245", + LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface iface), { return @@ -117,7 +117,7 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, " 2008 Christian Thaeter "; } ), - LUMIERA_INTERFACE_INLINE (license, "\343\031\207\122\225\217\014\163\015\023\243\101\165\377\222\350", + LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface iface), { return @@ -137,12 +137,12 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, } ), - LUMIERA_INTERFACE_INLINE (state, "\364\002\115\170\361\321\301\244\350\322\270\362\010\231\207\334", + LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface iface), {return LUMIERA_INTERFACE_EXPERIMENTAL;} ), - LUMIERA_INTERFACE_INLINE (versioncmp, "\136\037\234\304\100\247\244\342\324\353\072\060\161\053\077\263", + LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ) @@ -259,9 +259,9 @@ LUMIERA_EXPORT ( LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_tests_descriptor), testacquire, testrelease, - LUMIERA_INTERFACE_MAP (foo1, "\214\310\136\372\003\344\163\377\075\100\070\200\375\221\227\324", + LUMIERA_INTERFACE_MAP (foo1, testfunc), - LUMIERA_INTERFACE_MAP (bar1, "\262\253\067\211\157\052\212\140\114\334\231\250\340\075\214\030", + LUMIERA_INTERFACE_MAP (bar1, testfunc) ), LUMIERA_INTERFACE_DEFINE (lumieraorg_testexample_two, 0, @@ -269,9 +269,9 @@ LUMIERA_EXPORT ( LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_tests_descriptor), testacquire, testrelease, - LUMIERA_INTERFACE_MAP (foo2, "\110\152\002\271\363\052\324\272\373\045\132\270\277\000\271\217", + LUMIERA_INTERFACE_MAP (foo2, testfunc), - LUMIERA_INTERFACE_MAP (bar2, "\376\042\027\336\355\113\132\233\350\312\170\077\377\370\356\167", + LUMIERA_INTERFACE_MAP (bar2, testfunc) ), LUMIERA_INTERFACE_DEFINE (lumieraorg_testexample_void, 0, diff --git a/tests/plugin/test-c-plugin/example_plugin.c b/tests/plugin/test-c-plugin/example_plugin.c index 5e9ee257f..2585b79f3 100644 --- a/tests/plugin/test-c-plugin/example_plugin.c +++ b/tests/plugin/test-c-plugin/example_plugin.c @@ -100,31 +100,31 @@ void yeahbabe (void) LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, lumieraorg_exampleplugin_descriptor, NULL, NULL, NULL, - LUMIERA_INTERFACE_INLINE (name, "\003\307\005\305\201\304\175\377\120\105\332\016\136\354\251\022", + LUMIERA_INTERFACE_INLINE (name, const char*, (LumieraInterface iface), {return "LumieraTest";} ), - LUMIERA_INTERFACE_INLINE (brief, "\303\047\265\010\242\210\365\340\024\030\350\310\067\171\170\260", + LUMIERA_INTERFACE_INLINE (brief, const char*, (LumieraInterface iface), {return "Lumiera Test suite examples";} ), - LUMIERA_INTERFACE_INLINE (homepage, "\363\125\352\312\056\255\274\322\351\245\051\350\120\024\115\263", + LUMIERA_INTERFACE_INLINE (homepage, const char*, (LumieraInterface iface), {return "http://www.lumiera.org/develompent.html";} ), - LUMIERA_INTERFACE_INLINE (version, "\114\043\133\175\354\011\232\002\117\240\107\141\234\157\217\176", + LUMIERA_INTERFACE_INLINE (version, const char*, (LumieraInterface iface), {return "No Version";} ), - LUMIERA_INTERFACE_INLINE (author, "\313\300\055\156\126\320\144\247\140\023\261\002\270\367\017\267", + LUMIERA_INTERFACE_INLINE (author, const char*, (LumieraInterface iface), {return "Christian Thaeter";} ), - LUMIERA_INTERFACE_INLINE (email, "\163\051\312\276\137\317\267\305\237\274\133\012\276\006\255\160", + LUMIERA_INTERFACE_INLINE (email, const char*, (LumieraInterface iface), {return "ct@pipapo.org";} ), - LUMIERA_INTERFACE_INLINE (copyright, "\160\246\161\204\123\262\375\351\157\276\333\073\355\036\062\341", + LUMIERA_INTERFACE_INLINE (copyright, const char*, (LumieraInterface iface), { return @@ -132,7 +132,7 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, " 2008 Christian Thaeter "; } ), - LUMIERA_INTERFACE_INLINE (license, "\007\311\044\214\064\223\201\326\331\111\233\356\055\264\211\201", + LUMIERA_INTERFACE_INLINE (license, const char*, (LumieraInterface iface), { return @@ -152,12 +152,12 @@ LUMIERA_INTERFACE_INSTANCE (lumieraorg_interfacedescriptor, 0, } ), - LUMIERA_INTERFACE_INLINE (state, "\331\353\126\162\067\376\340\242\232\175\167\105\122\177\306\354", + LUMIERA_INTERFACE_INLINE (state, int, (LumieraInterface iface), {return LUMIERA_INTERFACE_EXPERIMENTAL;} ), - LUMIERA_INTERFACE_INLINE (versioncmp, "\363\145\363\224\325\104\177\057\344\023\367\111\376\221\152\135", + LUMIERA_INTERFACE_INLINE (versioncmp, int, (const char* a, const char* b), {return 0;} ) @@ -170,9 +170,9 @@ LUMIERA_EXPORT( LUMIERA_INTERFACE_REF (lumieraorg_interfacedescriptor, 0, lumieraorg_exampleplugin_descriptor), myopen, myclose, - LUMIERA_INTERFACE_MAP (hello, "\167\012\306\023\031\151\006\362\026\003\125\017\170\022\100\333", + LUMIERA_INTERFACE_MAP (hello, hallo), - LUMIERA_INTERFACE_MAP (goodbye, "\324\267\214\166\340\213\155\053\157\125\064\264\167\235\020\223", + LUMIERA_INTERFACE_MAP (goodbye, tschuess) ), LUMIERA_INTERFACE_DEFINE (lumieraorg_testhello, 0, @@ -180,9 +180,9 @@ LUMIERA_EXPORT( LUMIERA_INTERFACE_REF (lumieraorg_interfacedescriptor, 0, lumieraorg_exampleplugin_descriptor), myopen, myclose, - LUMIERA_INTERFACE_MAP (hello, "\326\247\370\247\032\103\223\357\262\007\356\042\051\330\073\116", + LUMIERA_INTERFACE_MAP (hello, hello), - LUMIERA_INTERFACE_MAP (goodbye, "\365\141\371\047\101\230\050\106\071\231\022\235\325\112\354\241", + LUMIERA_INTERFACE_MAP (goodbye, bye) ), LUMIERA_INTERFACE_DEFINE (lumieraorg_testtest, 0, @@ -190,7 +190,7 @@ LUMIERA_EXPORT( LUMIERA_INTERFACE_REF (lumieraorg_interfacedescriptor, 0, lumieraorg_exampleplugin_descriptor), myopen, myclose, - LUMIERA_INTERFACE_MAP (testit, "\101\060\122\277\370\023\164\257\347\247\164\325\157\266\323\370", + LUMIERA_INTERFACE_MAP (testit, yeahbabe) ) ) diff --git a/tests/plugin/test-cpp-plugin/example_plugin.cpp b/tests/plugin/test-cpp-plugin/example_plugin.cpp index d55f5c960..345aaf475 100644 --- a/tests/plugin/test-cpp-plugin/example_plugin.cpp +++ b/tests/plugin/test-cpp-plugin/example_plugin.cpp @@ -109,9 +109,9 @@ extern "C" { /* ================== define two lumieraorg_testhello instance ==== , NULL /* no descriptor given */ , ExamplePlugin::myopen , ExamplePlugin::myclose - , LUMIERA_INTERFACE_MAP (hello, "\300\244\125\265\235\312\175\263\335\044\371\047\247\263\015\322", + , LUMIERA_INTERFACE_MAP (hello, ExamplePlugin_de::griazi) - , LUMIERA_INTERFACE_MAP (goodbye, "\115\365\126\102\201\104\012\257\153\232\006\210\010\346\076\070", + , LUMIERA_INTERFACE_MAP (goodbye, ExamplePlugin_de::servus) ), LUMIERA_INTERFACE_DEFINE (lumieraorg_testhello, 0 @@ -119,9 +119,9 @@ extern "C" { /* ================== define two lumieraorg_testhello instance ==== , NULL /* no descriptor given */ , ExamplePlugin::myopen , ExamplePlugin::myclose - , LUMIERA_INTERFACE_MAP (hello, "\303\367\107\154\077\063\237\066\034\034\050\136\170\220\260\226", + , LUMIERA_INTERFACE_MAP (hello, ExamplePlugin_en::hello) - , LUMIERA_INTERFACE_MAP (goodbye, "\107\207\072\105\101\102\150\201\322\043\104\110\232\023\205\161", + , LUMIERA_INTERFACE_MAP (goodbye, ExamplePlugin_en::bye) ) );