Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-11-22 03:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

PulseAudio: Improve iterator loop

Browse source 
We now store sthe pa_operation and check if they were done'd, cancelled or still running.
This commit is contained in:
scorpion-26 2023-02-21 22:46:40 +01:00
parent 16933c24ff
commit f5adfebfe9
1 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/PulseAudio.h
View file

@ -5,21 +5,39 @@
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
#include <list>
namespace PulseAudio namespace PulseAudio
{ {
static pa_mainloop* mainLoop; static pa_mainloop* mainLoop;
static pa_context* context; static pa_context* context;
static int32_t pending = 0; static std::list<pa_operation*> pendingOperations;
inline void FlushLoop() inline void FlushLoop()
{ {
while (pending > 0) while (pendingOperations.size() > 0)
{ {
pa_mainloop_iterate(mainLoop, 0, nullptr); pa_mainloop_iterate(mainLoop, 0, nullptr);
// Remove done or cancelled operations
pendingOperations.remove_if(
[](pa_operation* op)
{
pa_operation_state_t state = pa_operation_get_state(op);
if (state == PA_OPERATION_DONE)
{
pa_operation_unref(op);
return true;
}
else if (state == PA_OPERATION_CANCELLED)
{
LOG("Warning: Cancelled pa_operation!");
pa_operation_unref(op);
return true;
}
return false;
});
} }
pending = 0;
} }
inline void Init() inline void Init()
@ -30,7 +48,8 @@ namespace PulseAudio
context = pa_context_new(api, "gBar PA context"); context = pa_context_new(api, "gBar PA context");
int res = pa_context_connect(context, nullptr, PA_CONTEXT_NOAUTOSPAWN, nullptr); int res = pa_context_connect(context, nullptr, PA_CONTEXT_NOAUTOSPAWN, nullptr);
auto stateCallback = [](pa_context* c, void*) bool ready = false;
auto stateCallback = [](pa_context* c, void* ready)
{ {
switch (pa_context_get_state(c)) switch (pa_context_get_state(c))
{ {
@ -43,17 +62,17 @@ namespace PulseAudio
// Don't care // Don't care
break; break;
case PA_CONTEXT_READY: case PA_CONTEXT_READY:
// Prevent pending from going negative when PA_CONTEXT_READY is called multiple times LOG("PulseAudio: Context is ready!");
if (pending > 0) *(bool*)ready = true;
pending--;
break; break;
} }
}; };
pa_context_set_state_callback(context, +stateCallback, &ready);
pa_context_set_state_callback(context, +stateCallback, nullptr); while (!ready)
pending++; {
pa_mainloop_iterate(mainLoop, 0, nullptr);
FlushLoop(); }
ASSERT(res >= 0, "pa_context_connect failed!"); ASSERT(res >= 0, "pa_context_connect failed!");
} }
@ -65,12 +84,15 @@ namespace PulseAudio
// 1. Get default sink // 1. Get default sink
auto serverInfo = [](pa_context*, const pa_server_info* info, void* sink) auto serverInfo = [](pa_context*, const pa_server_info* info, void* sink)
{ {
pending--; if (!info)
return;
*(const char**)sink = info->default_sink_name; *(const char**)sink = info->default_sink_name;
}; };
pa_context_get_server_info(context, +serverInfo, &defaultSink); pa_operation* op = pa_context_get_server_info(context, +serverInfo, &defaultSink);
pending++; pa_operation_ref(op);
pendingOperations.push_back(op);
FlushLoop(); FlushLoop();
@ -85,11 +107,12 @@ namespace PulseAudio
out->volume = vol; out->volume = vol;
out->muted = info->mute; out->muted = info->mute;
pending--;
}; };
pa_context_get_sink_info_by_name(context, defaultSink, +sinkInfo, &info); op = pa_context_get_sink_info_by_name(context, defaultSink, +sinkInfo, &info);
pa_operation_ref(op);
pendingOperations.push_back(op);
pending++;
FlushLoop(); FlushLoop();
return info; return info;