oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/pipewire: switch from pw_main_loop to pw_thread_loop

Browse Source 
We need this for pw_thread_loop_lock().
This commit is contained in:
Max Kellermann
2021-07-30 13:32:58 +02:00
parent cdca27e6bb
commit 6975d3ca4b
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/output/plugins/PipeWireOutputPlugin.cxx
View File

@@ -21,7 +21,6 @@
//#include "lib/pipewire/MainLoop.hxx" //#include "lib/pipewire/MainLoop.hxx"
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "../Error.hxx" #include "../Error.hxx"
#include "thread/Thread.hxx"
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
@@ -43,8 +42,9 @@
#include <stdexcept> #include <stdexcept>
class PipeWireOutput final : AudioOutput { class PipeWireOutput final : AudioOutput {
Thread thread{BIND_THIS_METHOD(RunThread)}; const char *const name;
struct pw_main_loop *loop;
struct pw_thread_loop *thread_loop;
struct pw_stream *stream; struct pw_stream *stream;
std::byte buffer[1024]; std::byte buffer[1024];
@@ -83,10 +83,6 @@ private:
o.Process(); o.Process();
} }
void RunThread() noexcept {
pw_main_loop_run(loop);
}
/* virtual methods from class AudioOutput */ /* virtual methods from class AudioOutput */
void Enable() override; void Enable() override;
void Disable() noexcept override; void Disable() noexcept override;
@@ -110,6 +106,7 @@ static constexpr auto stream_events = PipeWireOutput::MakeStreamEvents();
inline inline
PipeWireOutput::PipeWireOutput(const ConfigBlock &block) PipeWireOutput::PipeWireOutput(const ConfigBlock &block)
:AudioOutput(FLAG_ENABLE_DISABLE), :AudioOutput(FLAG_ENABLE_DISABLE),
name(block.GetBlockValue("name", "pipewire")),
target_id(block.GetBlockValue("target", unsigned(PW_ID_ANY))) target_id(block.GetBlockValue("target", unsigned(PW_ID_ANY)))
{ {
} }
@@ -117,25 +114,17 @@ PipeWireOutput::PipeWireOutput(const ConfigBlock &block)
void void
PipeWireOutput::Enable() PipeWireOutput::Enable()
{ {
loop = pw_main_loop_new(nullptr); thread_loop = pw_thread_loop_new(name, nullptr);
if (loop == nullptr) if (thread_loop == nullptr)
throw std::runtime_error("pw_main_loop_new() failed"); throw std::runtime_error("pw_thread_loop_new() failed");
try { pw_thread_loop_start(thread_loop);
thread.Start();
} catch (...) {
pw_main_loop_destroy(loop);
throw;
}
} }
void void
PipeWireOutput::Disable() noexcept PipeWireOutput::Disable() noexcept
{ {
pw_main_loop_quit(loop); pw_thread_loop_destroy(thread_loop);
thread.Join();
pw_main_loop_destroy(loop);
} }
static constexpr enum spa_audio_format static constexpr enum spa_audio_format
@@ -198,7 +187,7 @@ PipeWireOutput::Open(AudioFormat &audio_format)
PW_KEY_NODE_NAME, "mpd", PW_KEY_NODE_NAME, "mpd",
nullptr); nullptr);
stream = pw_stream_new_simple(pw_main_loop_get_loop(loop), stream = pw_stream_new_simple(pw_thread_loop_get_loop(thread_loop),
"mpd", "mpd",
props, props,
&stream_events, &stream_events,