Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libobs/build/libobs.core+.h.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "libobs/obs-set-locale.c.h"
#include "libobs/obs-set-output-source-fields.c.h"
#include "libobs/obs-shutdown-detach.c.h"
#include "libobs/obs-type-catalog-enum.c.h"
#include "libobs/obs-ui-task-handler-fields.c.h"
#include "libobs/obs-video-info-query.c.h"
#include "libobs/obs-video-level-queries.c.h"
Expand Down
49 changes: 49 additions & 0 deletions libobs/obs-type-catalog-enum.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "libobs/build/libobs.pch.h"

bool obs_enum_input_types(size_t idx, const char **id)
{
if (idx >= obs->input_types.num)
return false;
*id = obs->input_types.array[idx].id;
return true;
}

bool obs_enum_filter_types(size_t idx, const char **id)
{
if (idx >= obs->filter_types.num)
return false;
*id = obs->filter_types.array[idx].id;
return true;
}

bool obs_enum_transition_types(size_t idx, const char **id)
{
if (idx >= obs->transition_types.num)
return false;
*id = obs->transition_types.array[idx].id;
return true;
}

bool obs_enum_output_types(size_t idx, const char **id)
{
if (idx >= obs->output_types.num)
return false;
*id = obs->output_types.array[idx].id;
return true;
}

bool obs_enum_encoder_types(size_t idx, const char **id)
{
if (idx >= obs->encoder_types.num)
return false;
*id = obs->encoder_types.array[idx].id;
return true;
}

bool obs_enum_service_types(size_t idx, const char **id)
{
if (idx >= obs->service_types.num)
return false;
*id = obs->service_types.array[idx].id;
return true;
}
48 changes: 0 additions & 48 deletions libobs/obs.c.h
Original file line number Diff line number Diff line change
Expand Up @@ -1745,14 +1745,6 @@ bool obs_get_audio_info2(struct obs_audio_info2 *oai2)
}
}

bool obs_enum_input_types(size_t idx, const char **id)
{
if (idx >= obs->input_types.num)
return false;
*id = obs->input_types.array[idx].id;
return true;
}

const char *obs_get_latest_input_type_id(const char *unversioned_id)
{
struct obs_source_info *latest = NULL;
Expand All @@ -1777,46 +1769,6 @@ const char *obs_get_latest_input_type_id(const char *unversioned_id)
return latest->id;
}

bool obs_enum_filter_types(size_t idx, const char **id)
{
if (idx >= obs->filter_types.num)
return false;
*id = obs->filter_types.array[idx].id;
return true;
}

bool obs_enum_transition_types(size_t idx, const char **id)
{
if (idx >= obs->transition_types.num)
return false;
*id = obs->transition_types.array[idx].id;
return true;
}

bool obs_enum_output_types(size_t idx, const char **id)
{
if (idx >= obs->output_types.num)
return false;
*id = obs->output_types.array[idx].id;
return true;
}

bool obs_enum_encoder_types(size_t idx, const char **id)
{
if (idx >= obs->encoder_types.num)
return false;
*id = obs->encoder_types.array[idx].id;
return true;
}

bool obs_enum_service_types(size_t idx, const char **id)
{
if (idx >= obs->service_types.num)
return false;
*id = obs->service_types.array[idx].id;
return true;
}

void obs_enter_graphics(void)
{
if (obs->video.graphics)
Expand Down
23 changes: 23 additions & 0 deletions test/cmocka/build/test-graph.json
Original file line number Diff line number Diff line change
Expand Up @@ -18497,6 +18497,15 @@
"libobs/data"
]
},
"test_type_catalog_enum": {
"sources": [
"test/cmocka/test_type_catalog_enum.c"
],
"libraries": [
"OBS::libobs",
"OBS::native-test-cmocka"
]
},
"test_ui_task_handler": {
"sources": [
"test/cmocka/test_ui_task_handler.c"
Expand Down Expand Up @@ -27595,6 +27604,20 @@
"working_directory": "${runtime}",
"timeout_seconds": 120
},
"test_type_catalog_enum": {
"target": "test_type_catalog_enum",
"command": [
"${target}"
],
"optional_prefixes": [
[
"xvfb-run",
"-a",
"-s",
"-screen 0 1280x1024x24 -noreset"
]
]
},
"test_ui_task_handler": {
"target": "test_ui_task_handler",
"command": [
Expand Down
Loading
Loading