提交 a702d88c 编写于 作者: J jp9000

libobs: Don't track active transitions

This was originally used for calculating audio volume if transitions
were active, but transitions won't work that way so tracking the active
transitions is no longer needed.
上级 fc057f6d
......@@ -283,8 +283,6 @@ struct obs_core_data {
struct obs_view main_view;
volatile long active_transitions;
long long unnamed_index;
volatile bool valid;
......
......@@ -297,9 +297,6 @@ obs_source_t *obs_source_create(enum obs_source_type type, const char *id,
source->flags = source->default_flags;
source->enabled = true;
if (info && info->type == OBS_SOURCE_TYPE_TRANSITION)
os_atomic_inc_long(&obs->data.active_transitions);
return source;
fail:
......@@ -343,9 +340,6 @@ void obs_source_destroy(struct obs_source *source)
if (!obs_source_valid(source, "obs_source_destroy"))
return;
if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
os_atomic_dec_long(&obs->data.active_transitions);
if (source->filter_parent)
obs_source_filter_remove_refless(source->filter_parent, source);
......
......@@ -26,25 +26,6 @@ static inline void calculate_base_volume(struct obs_core_data *data,
{
if (!target->activate_refs) {
target->base_volume = 0.0f;
/* only walk the tree if there are transitions active */
} else if (data->active_transitions) {
float best_vol = 0.0f;
for (size_t i = 0; i < MAX_CHANNELS; i++) {
struct obs_source *source = view->channels[i];
float vol = 0.0f;
if (!source)
continue;
vol = obs_source_get_target_volume(source, target);
if (best_vol < vol)
best_vol = vol;
}
target->base_volume = best_vol;
} else {
target->base_volume = 1.0f;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册