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

libobs: Do not set presentation volume on children

Browse Source 
When the presentation volume is set for a source, it's set for all of
its children and their children.  The original intention for doing this
was to be able to use it for transitioning, but honestly it's just bad
design, and I feel there are better ways to handle transitioning volume.
This commit is contained in:
jp9000 2014-12-27 21:11:56 -08:00
parent fb6f8721e2
commit 48210d41a6
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libobs/obs-source.c
View File

@ -1858,16 +1858,8 @@ static void set_tree_preset_vol(obs_source_t *parent, obs_source_t *child,
void obs_source_set_present_volume(obs_source_t *source, float volume)
{
if (source) {
if (source)
source->present_volume = volume;
/* don't set the presentation volume of the tree if a
* transition source, let the transition handle presentation
* volume for the child sources itself. */
if (source->info.type != OBS_SOURCE_TYPE_TRANSITION)
obs_source_enum_tree(source, set_tree_preset_vol,
&volume);
}
}
float obs_source_get_volume(const obs_source_t *source)