added support for jansson, added new output files, made some adjustments to the API, fixed a UI subclass issue

This commit is contained in:
jp9000
2013-11-13 06:24:20 -07:00
parent db5aca1ab5
commit 146e9a7dbd
23 changed files with 206 additions and 19 deletions

View File

@@ -1,5 +1,10 @@
#include "test-filter.h"
const char *test_getname(const char *locale)
{
return "Test";
}
struct test_filter *test_create(const char *settings, obs_source_t source)
{
struct test_filter *tf = bmalloc(sizeof(struct test_filter));

View File

@@ -12,6 +12,8 @@ struct test_filter {
texrender_t texrender;
};
EXPORT const char *test_getname(const char *locale);
EXPORT struct test_filter *test_create(const char *settings, obs_source_t source);
EXPORT void test_destroy(struct test_filter *rt);
EXPORT uint32_t test_get_output_flags(struct test_filter *rt);

View File

@@ -6,6 +6,7 @@
extern "C" {
#endif
EXPORT uint32_t module_version(uint32_t in_version);
EXPORT bool enum_inputs(size_t idx, const char **name);
EXPORT bool enum_filters(size_t idx, const char **name);

View File

@@ -1,8 +1,14 @@
#include "obs.h"
#include "test-input-exports.h"
const char *inputs[] = {"random"};
const char *filters[] = {"test"};
uint32_t module_version(uint32_t in_version)
{
return LIBOBS_API_VER;
}
bool enum_inputs(size_t idx, const char **name)
{
if (idx >= (sizeof(inputs)/sizeof(const char*)))

View File

@@ -1,6 +1,11 @@
#include <stdlib.h>
#include "test-random.h"
const char *random_getname(const char *locale)
{
return "Random;";
}
struct random_tex *random_create(const char *settings, obs_source_t source)
{
struct random_tex *rt = bmalloc(sizeof(struct random_tex));

View File

@@ -11,6 +11,8 @@ struct random_tex {
effect_t whatever;
};
EXPORT const char *random_getname(const char *locale);
EXPORT struct random_tex *random_create(const char *settings, obs_source_t source);
EXPORT void random_destroy(struct random_tex *rt);
EXPORT uint32_t random_get_output_flags(struct random_tex *rt);