benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverted CINELERRA_DIE(msg) to CINELERRA_DIE

Browse source
This commit is contained in:
Christian Thaeter 2007-08-18 05:12:14 +02:00
parent 8c1f324c55
commit 9507fae565
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/error.h
View file

@ -24,7 +24,7 @@
#include <nobug.h> #include <nobug.h>
#include <stdlib.h> #include <stdlib.h>
#define CINELERRA_DIE(message) do { NOBUG_ERROR(NOBUG_ON, message); abort(); } while(0) #define CINELERRA_DIE do { NOBUG_ERROR(NOBUG_ON, "Fatal Error!"); abort(); } while(0)
#define CINELERRA_ERROR_DECLARE(err) \ #define CINELERRA_ERROR_DECLARE(err) \
extern const char* CINELERRA_ERROR_##err extern const char* CINELERRA_ERROR_##err

8
src/lib/plugin.c
View file

@ -140,7 +140,7 @@ cinelerra_plugin_lookup (struct cinelerra_plugin* self, const char* path)
/* got it */ /* got it */
TRACE (cinelerra_plugin, "found %s", pathname); TRACE (cinelerra_plugin, "found %s", pathname);
self->pathname = strdup (pathname); self->pathname = strdup (pathname);
if (!self->pathname) CINELERRA_DIE("out of memory"); if (!self->pathname) CINELERRA_DIE;
self->type = cinelerra_plugin_extensions[i].type; self->type = cinelerra_plugin_extensions[i].type;
return 0; return 0;
} }
@ -163,7 +163,7 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
plugin.name = name; /* for searching */ plugin.name = name; /* for searching */
found = tsearch (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp); found = tsearch (&plugin, &cinelerra_plugin_registry, cinelerra_plugin_name_cmp);
if (!found) CINELERRA_DIE("out of memory"); if (!found) CINELERRA_DIE;
if (*found == &plugin) if (*found == &plugin)
{ {
@ -171,13 +171,13 @@ cinelerra_interface_open (const char* name, const char* interface, size_t min_re
/* now really create new item */ /* now really create new item */
*found = malloc (sizeof (struct cinelerra_plugin)); *found = malloc (sizeof (struct cinelerra_plugin));
if (!*found) CINELERRA_DIE("out of memory"); if (!*found) CINELERRA_DIE;
if (name) /* NULL is main app, no lookup needed */ if (name) /* NULL is main app, no lookup needed */
{ {
/*lookup for $CINELERRA_PLUGIN_PATH*/ /*lookup for $CINELERRA_PLUGIN_PATH*/
(*found)->name = strdup (name); (*found)->name = strdup (name);
if (!(*found)->name) CINELERRA_DIE("out of memory"); if (!(*found)->name) CINELERRA_DIE;
if (!!cinelerra_plugin_lookup (*found, getenv("CINELERRA_PLUGIN_PATH")) if (!!cinelerra_plugin_lookup (*found, getenv("CINELERRA_PLUGIN_PATH"))
#ifdef CINELERRA_PLUGIN_PATH #ifdef CINELERRA_PLUGIN_PATH

4
tests/examples/plugin_main.c
View file

@ -21,7 +21,7 @@ main(int argc, char** argv)
CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de = CINELERRA_INTERFACE_TYPE(hello, 1)* hello_de =
(CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "german_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
if (!hello_de) CINELERRA_DIE("loading plugin failed"); if (!hello_de) CINELERRA_DIE;
hello_de->hello(); hello_de->hello();
@ -29,7 +29,7 @@ main(int argc, char** argv)
CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en = CINELERRA_INTERFACE_TYPE(hello, 1)* hello_en =
(CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1))); (CINELERRA_INTERFACE_TYPE(hello, 1)*) cinelerra_interface_open ("example_plugin", "english_1", sizeof(CINELERRA_INTERFACE_TYPE(hello, 1)));
if (!hello_en) CINELERRA_DIE("loading plugin failed"); if (!hello_en) CINELERRA_DIE;
hello_en->hello(); hello_en->hello();