lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libobs/audio-monitoring/pulse/pulseaudio-output.c
View file

@ -287,7 +287,7 @@ static void pulseaudio_source_info(pa_context *c, const pa_source_info *i,
{
UNUSED_PARAMETER(c);
PULSE_DATA(userdata);
// An error occured
// An error occurred
if (eol < 0) {
data->format = PA_SAMPLE_INVALID;
goto skip;

14
libobs/audio-monitoring/pulse/pulseaudio-wrapper.c
View file

@ -48,10 +48,16 @@ void get_default_id(char **id)
bzalloc(sizeof(struct pulseaudio_default_output));
pulseaudio_get_server_info(
(pa_server_info_cb_t)pulseaudio_default_devices, (void *)pdo);
*id = bzalloc(strlen(pdo->default_sink_name) + 9);
strcat(*id, pdo->default_sink_name);
strcat(*id, ".monitor");
bfree(pdo->default_sink_name);
if (!pdo->default_sink_name || !*pdo->default_sink_name) {
*id = NULL;
} else {
*id = bzalloc(strlen(pdo->default_sink_name) + 9);
strcat(*id, pdo->default_sink_name);
strcat(*id, ".monitor");
bfree(pdo->default_sink_name);
}
bfree(pdo);
pulseaudio_unref();
}

2
libobs/audio-monitoring/pulse/pulseaudio-wrapper.h
View file

@ -79,7 +79,7 @@ void pulseaudio_wait();
/**
* Wait for accept signal from calling thread
*
* This function tells the pulseaudio mainloop wheter the data provided to
* This function tells the pulseaudio mainloop whether the data provided to
* the callback should be retained until the calling thread executes
* pulseaudio_accept()
*