opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-29 19:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more volume options

Browse Source 
Added a "master" volume for the entire audio subsystem.

Also, added a "presentation" volume for both the master volume and for
each invidiaul source.  The presentation volume is used to control
things like transitioning volumes, preventing sources from outputting
any audio when they're inactive, as well as some other uses in the
future.
This commit is contained in:
jp9000
2014-02-20 15:56:51 -07:00
parent 27b851c06e
commit 579f026c5b
5 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/obs-source.c
+16 -4
View File
@@ -93,7 +93,8 @@ bool obs_source_init(struct obs_source *source,
const struct obs_source_info *info)
{
source->refs = 1;
source->volume = 1.0f;
source->user_volume = 1.0f;
source->present_volume = 1.0f;
pthread_mutex_init_value(&source->filter_mutex);
pthread_mutex_init_value(&source->video_mutex);
pthread_mutex_init_value(&source->audio_mutex);
@@ -388,7 +389,8 @@ static void source_output_audio_line(obs_source_t source,
return;
in.timestamp += source->timing_adjust;
in.volume = source->volume;
in.volume = source->user_volume * source->present_volume *
obs->audio.user_volume * obs->audio.present_volume;
audio_line_output(source->audio_line, &in);
}
@@ -1129,10 +1131,20 @@ proc_handler_t obs_source_prochandler(obs_source_t source)
void obs_source_setvolume(obs_source_t source, float volume)
{
source->volume = volume;
source->user_volume = volume;
}
void obs_source_set_present_volume(obs_source_t source, float volume)
{
source->present_volume = volume;
}
float obs_source_getvolume(obs_source_t source)
{
return source->volume;
return source->user_volume;
}
float obs_source_get_present_volume(obs_source_t source)
{
return source->present_volume;
}