mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 09:39:15 +00:00
make scene items use linked list rather than array (containers are a bad habit), add a few functions for getting scene item information, also use a mutex to prevent race conditions when using the linked list
This commit is contained in:
parent
96448d7361
commit
966c091078
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -41,6 +41,7 @@ ltmain.sh
|
||||||
|
|
||||||
.depend
|
.depend
|
||||||
tags
|
tags
|
||||||
|
*.trace
|
||||||
*.swp
|
*.swp
|
||||||
*.dat
|
*.dat
|
||||||
*.clbin
|
*.clbin
|
||||||
|
|
|
@ -27,8 +27,14 @@ static const char *scene_getname(const char *locale)
|
||||||
static void *scene_create(const char *settings, struct obs_source *source)
|
static void *scene_create(const char *settings, struct obs_source *source)
|
||||||
{
|
{
|
||||||
struct obs_scene *scene = bmalloc(sizeof(struct obs_scene));
|
struct obs_scene *scene = bmalloc(sizeof(struct obs_scene));
|
||||||
scene->source = source;
|
scene->source = source;
|
||||||
da_init(scene->items);
|
scene->first_item = NULL;
|
||||||
|
|
||||||
|
if (pthread_mutex_init(&scene->mutex, NULL) != 0) {
|
||||||
|
blog(LOG_ERROR, "scene_create: Couldn't initialize mutex");
|
||||||
|
bfree(scene);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
return scene;
|
return scene;
|
||||||
}
|
}
|
||||||
|
@ -36,16 +42,18 @@ static void *scene_create(const char *settings, struct obs_source *source)
|
||||||
static void scene_destroy(void *data)
|
static void scene_destroy(void *data)
|
||||||
{
|
{
|
||||||
struct obs_scene *scene = data;
|
struct obs_scene *scene = data;
|
||||||
size_t i;
|
struct obs_scene_item *item = scene->first_item;
|
||||||
|
|
||||||
for (i = 0; i < scene->items.num; i++) {
|
while (item) {
|
||||||
struct obs_scene_item *item = scene->items.array[i];
|
struct obs_scene_item *del_item = item;
|
||||||
if (item->source)
|
item = item->next;
|
||||||
obs_source_release(item->source);
|
|
||||||
bfree(item);
|
if (del_item->source)
|
||||||
|
obs_source_release(del_item->source);
|
||||||
|
bfree(del_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
da_free(scene->items);
|
pthread_mutex_destroy(&scene->mutex);
|
||||||
bfree(scene);
|
bfree(scene);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,17 +62,46 @@ static uint32_t scene_get_output_flags(void *data)
|
||||||
return SOURCE_VIDEO;
|
return SOURCE_VIDEO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void detach_sceneitem(struct obs_scene_item *item)
|
||||||
|
{
|
||||||
|
if (item->prev)
|
||||||
|
item->prev->next = item->next;
|
||||||
|
else
|
||||||
|
item->parent->first_item = item->next;
|
||||||
|
|
||||||
|
if (item->next)
|
||||||
|
item->next->prev = item->prev;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void attach_sceneitem(struct obs_scene_item *item,
|
||||||
|
struct obs_scene_item *prev)
|
||||||
|
{
|
||||||
|
item->prev = prev;
|
||||||
|
|
||||||
|
if (prev) {
|
||||||
|
item->next = prev->next;
|
||||||
|
if (prev->next)
|
||||||
|
prev->next->prev = item;
|
||||||
|
prev->next = item;
|
||||||
|
} else {
|
||||||
|
item->next = item->parent->first_item;
|
||||||
|
item->parent->first_item = item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void scene_video_render(void *data)
|
static void scene_video_render(void *data)
|
||||||
{
|
{
|
||||||
struct obs_scene *scene = data;
|
struct obs_scene *scene = data;
|
||||||
size_t i;
|
struct obs_scene_item *item = scene->first_item;
|
||||||
|
|
||||||
for (i = scene->items.num; i > 0; i--) {
|
pthread_mutex_lock(&scene->mutex);
|
||||||
struct obs_scene_item *item = scene->items.array[i-1];
|
|
||||||
|
|
||||||
|
while (item) {
|
||||||
if (obs_source_removed(item->source)) {
|
if (obs_source_removed(item->source)) {
|
||||||
obs_source_release(item->source);
|
struct obs_scene_item *del_item = item;
|
||||||
da_erase(scene->items, i--);
|
item = item->next;
|
||||||
|
|
||||||
|
obs_sceneitem_destroy(del_item);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +114,11 @@ static void scene_video_render(void *data)
|
||||||
obs_source_video_render(item->source);
|
obs_source_video_render(item->source);
|
||||||
|
|
||||||
gs_matrix_pop();
|
gs_matrix_pop();
|
||||||
|
|
||||||
|
item = item->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pthread_mutex_unlock(&scene->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t scene_getsize(void *data)
|
static uint32_t scene_getsize(void *data)
|
||||||
|
@ -105,6 +146,8 @@ obs_scene_t obs_scene_create(const char *name)
|
||||||
memset(source, 0, sizeof(struct obs_source));
|
memset(source, 0, sizeof(struct obs_source));
|
||||||
|
|
||||||
source->data = scene;
|
source->data = scene;
|
||||||
|
|
||||||
|
assert(source->data);
|
||||||
if (!source->data) {
|
if (!source->data) {
|
||||||
bfree(source);
|
bfree(source);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -144,9 +187,50 @@ obs_scene_t obs_scene_fromsource(obs_source_t source)
|
||||||
return source->data;
|
return source->data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
obs_sceneitem_t obs_scene_findsource(obs_scene_t scene, const char *name)
|
||||||
|
{
|
||||||
|
struct obs_scene_item *item;
|
||||||
|
|
||||||
|
pthread_mutex_lock(&scene->mutex);
|
||||||
|
|
||||||
|
item = scene->first_item;
|
||||||
|
while (item) {
|
||||||
|
if (strcmp(item->source->name, name) == 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
item = item->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
pthread_mutex_unlock(&scene->mutex);
|
||||||
|
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
void obs_scene_enum_items(obs_scene_t scene,
|
||||||
|
bool (*callback)(obs_scene_t, obs_sceneitem_t, void*),
|
||||||
|
void *param)
|
||||||
|
{
|
||||||
|
struct obs_scene_item *item;
|
||||||
|
|
||||||
|
pthread_mutex_lock(&scene->mutex);
|
||||||
|
|
||||||
|
item = scene->first_item;
|
||||||
|
while (item) {
|
||||||
|
if (!callback(scene, item, param))
|
||||||
|
break;
|
||||||
|
|
||||||
|
item = item->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
pthread_mutex_unlock(&scene->mutex);
|
||||||
|
}
|
||||||
|
|
||||||
obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source)
|
obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source)
|
||||||
{
|
{
|
||||||
|
struct obs_scene_item *last;
|
||||||
struct obs_scene_item *item = bmalloc(sizeof(struct obs_scene_item));
|
struct obs_scene_item *item = bmalloc(sizeof(struct obs_scene_item));
|
||||||
|
|
||||||
memset(item, 0, sizeof(struct obs_scene_item));
|
memset(item, 0, sizeof(struct obs_scene_item));
|
||||||
item->source = source;
|
item->source = source;
|
||||||
item->visible = true;
|
item->visible = true;
|
||||||
|
@ -156,18 +240,32 @@ obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source)
|
||||||
if (source)
|
if (source)
|
||||||
obs_source_addref(source);
|
obs_source_addref(source);
|
||||||
|
|
||||||
da_push_back(scene->items, &item);
|
pthread_mutex_lock(&scene->mutex);
|
||||||
|
|
||||||
|
last = scene->first_item;
|
||||||
|
if (!last) {
|
||||||
|
scene->first_item = item;
|
||||||
|
} else {
|
||||||
|
while (last->next)
|
||||||
|
last = last->next;
|
||||||
|
|
||||||
|
last->next = item;
|
||||||
|
item->prev = last;
|
||||||
|
}
|
||||||
|
|
||||||
|
pthread_mutex_unlock(&scene->mutex);
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
int obs_sceneitem_destroy(obs_sceneitem_t item)
|
int obs_sceneitem_destroy(obs_sceneitem_t item)
|
||||||
{
|
{
|
||||||
int ref = 0;
|
int ref = 0;
|
||||||
|
|
||||||
if (item) {
|
if (item) {
|
||||||
|
detach_sceneitem(item);
|
||||||
if (item->source)
|
if (item->source)
|
||||||
ref = obs_source_release(item->source);
|
ref = obs_source_release(item->source);
|
||||||
|
|
||||||
da_erase_item(item->parent->items, item);
|
|
||||||
bfree(item);
|
bfree(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,26 +301,32 @@ void obs_sceneitem_setorder(obs_sceneitem_t item, enum order_movement movement)
|
||||||
{
|
{
|
||||||
struct obs_scene *scene = item->parent;
|
struct obs_scene *scene = item->parent;
|
||||||
|
|
||||||
|
pthread_mutex_lock(&scene->mutex);
|
||||||
|
|
||||||
|
detach_sceneitem(item);
|
||||||
|
|
||||||
if (movement == ORDER_MOVE_UP) {
|
if (movement == ORDER_MOVE_UP) {
|
||||||
size_t idx = da_find(scene->items, &item, 0);
|
attach_sceneitem(item, item->prev);
|
||||||
if (idx > 0)
|
|
||||||
da_move_item(scene->items, idx, idx-1);
|
|
||||||
|
|
||||||
} else if (movement == ORDER_MOVE_DOWN) {
|
} else if (movement == ORDER_MOVE_DOWN) {
|
||||||
size_t idx = da_find(scene->items, &item, 0);
|
attach_sceneitem(item, item->next);
|
||||||
if (idx < (scene->items.num-1))
|
|
||||||
da_move_item(scene->items, idx, idx+1);
|
|
||||||
|
|
||||||
} else if (movement == ORDER_MOVE_TOP) {
|
} else if (movement == ORDER_MOVE_TOP) {
|
||||||
size_t idx = da_find(scene->items, &item, 0);
|
struct obs_scene_item *last = item->next;
|
||||||
if (idx > 0)
|
if (!last) {
|
||||||
da_move_item(scene->items, idx, 0);
|
last = item->prev;
|
||||||
|
} else {
|
||||||
|
while (last->next)
|
||||||
|
last = last->next;
|
||||||
|
}
|
||||||
|
|
||||||
} else if (movement == ORDER_MOVE_TOP) {
|
attach_sceneitem(item, last);
|
||||||
size_t idx = da_find(scene->items, &item, 0);
|
|
||||||
if (idx < (scene->items.num-1))
|
} else if (movement == ORDER_MOVE_BOTTOM) {
|
||||||
da_move_item(scene->items, idx, scene->items.num-1);
|
attach_sceneitem(item, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pthread_mutex_unlock(&scene->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
void obs_sceneitem_getpos(obs_sceneitem_t item, struct vec2 *pos)
|
void obs_sceneitem_getpos(obs_sceneitem_t item, struct vec2 *pos)
|
||||||
|
|
|
@ -23,17 +23,23 @@
|
||||||
/* how obs scene! */
|
/* how obs scene! */
|
||||||
|
|
||||||
struct obs_scene_item {
|
struct obs_scene_item {
|
||||||
obs_scene_t parent;
|
struct obs_scene *parent;
|
||||||
obs_source_t source;
|
struct obs_source *source;
|
||||||
bool visible;
|
bool visible;
|
||||||
|
|
||||||
struct vec2 origin;
|
struct vec2 origin;
|
||||||
struct vec2 pos;
|
struct vec2 pos;
|
||||||
struct vec2 scale;
|
struct vec2 scale;
|
||||||
float rot;
|
float rot;
|
||||||
|
|
||||||
|
/* would do **prev_next, but not really great for resorting */
|
||||||
|
struct obs_scene_item *prev;
|
||||||
|
struct obs_scene_item *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct obs_scene {
|
struct obs_scene {
|
||||||
obs_source_t source;
|
struct obs_source *source;
|
||||||
DARRAY(struct obs_scene_item*) items;
|
|
||||||
|
pthread_mutex_t mutex;
|
||||||
|
struct obs_scene_item *first_item;
|
||||||
};
|
};
|
||||||
|
|
|
@ -456,6 +456,15 @@ EXPORT obs_source_t obs_scene_getsource(obs_scene_t scene);
|
||||||
/** Gets the scene from its source, or NULL if not a scene */
|
/** Gets the scene from its source, or NULL if not a scene */
|
||||||
EXPORT obs_scene_t obs_scene_fromsource(obs_source_t source);
|
EXPORT obs_scene_t obs_scene_fromsource(obs_source_t source);
|
||||||
|
|
||||||
|
/** Determines whether a source is within a scene */
|
||||||
|
EXPORT obs_sceneitem_t obs_scene_findsource(obs_scene_t scene,
|
||||||
|
const char *name);
|
||||||
|
|
||||||
|
/** Enumerates sources within a scene */
|
||||||
|
EXPORT void obs_scene_enum_items(obs_scene_t scene,
|
||||||
|
bool (*callback)(obs_scene_t, obs_sceneitem_t, void*),
|
||||||
|
void *param);
|
||||||
|
|
||||||
/** Adds/creates a new scene item for a source */
|
/** Adds/creates a new scene item for a source */
|
||||||
EXPORT obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source);
|
EXPORT obs_sceneitem_t obs_scene_add(obs_scene_t scene, obs_source_t source);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue