jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made the getframe function a bit more safe and modified a few names for clarity

Browse Source
This commit is contained in:
jp9000
2013-11-22 16:18:31 -07:00
parent d8b49034c9
commit 93dd3cec50
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libobs/obs.c
View File

@@ -291,7 +291,7 @@ bool obs_reset_audio(struct audio_info *ai)
return true;
}
bool obs_enum_inputs(size_t idx, const char **name)
bool obs_enum_input_types(size_t idx, const char **name)
{
if (idx >= obs->input_types.num)
return false;
@@ -299,7 +299,7 @@ bool obs_enum_inputs(size_t idx, const char **name)
return true;
}
bool obs_enum_filters(size_t idx, const char **name)
bool obs_enum_filter_types(size_t idx, const char **name)
{
if (idx >= obs->filter_types.num)
return false;
@@ -307,7 +307,7 @@ bool obs_enum_filters(size_t idx, const char **name)
return true;
}
bool obs_enum_transitions(size_t idx, const char **name)
bool obs_enum_transition_types(size_t idx, const char **name)
{
if (idx >= obs->transition_types.num)
return false;
@@ -315,7 +315,7 @@ bool obs_enum_transitions(size_t idx, const char **name)
return true;
}
bool obs_enum_outputs(size_t idx, const char **name)
bool obs_enum_output_types(size_t idx, const char **name)
{
if (idx >= obs->output_types.num)
return false;
@@ -345,8 +345,12 @@ bool obs_add_source(obs_source_t source)
obs_source_t obs_get_output_source(uint32_t channel)
{
struct obs_source *source;
assert(channel < MAX_CHANNELS);
return obs->data.channels[channel];
source = obs->data.channels[channel];
obs_source_addref(source);
return source;
}
void obs_set_output_source(uint32_t channel, obs_source_t source)
@@ -362,3 +366,16 @@ void obs_set_output_source(uint32_t channel, obs_source_t source)
if (prev_source)
obs_source_release(prev_source);
}
void obs_enum_sources(ENUM_SOURCES_PROC enum_proc, void *param)
{
struct obs_data *data = &obs->data;
size_t i;
pthread_mutex_lock(&data->sources_mutex);
for (i = 0; i < data->sources.num; i++)
enum_proc(data->sources.array[i], param);
pthread_mutex_unlock(&data->sources_mutex);
}