diff options
author | Lukas Rusak <lorusak@gmail.com> | 2023-01-15 20:18:15 -0800 |
---|---|---|
committer | Lukas Rusak <lorusak@gmail.com> | 2023-02-22 22:40:12 -0800 |
commit | 0c93b94231e10d91638b415cf60a2d8af24cfeba (patch) | |
tree | 23c4ff073507c1ce3bfaa12b907652739cf13ce2 | |
parent | 1ccebf0f28d83f9b12b50109627b6662f763077d (diff) |
CPipewireRegistry: change proxy -> node in global struct
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
3 files changed, 4 insertions, 5 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp index 1781e65d3b..1b831a1b3f 100644 --- a/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp +++ b/xbmc/cores/AudioEngine/Sinks/pipewire/AESinkPipewire.cpp @@ -317,8 +317,7 @@ void CAESinkPipewire::EnumerateDevicesEx(AEDeviceInfoList& list, bool force) std::for_each(defaultSampleRates.cbegin(), defaultSampleRates.cend(), [&device](const auto& rate) { device.m_sampleRates.emplace_back(rate); }); - auto proxy = global.second->proxy.get(); - auto node = static_cast<PIPEWIRE::CPipewireNode*>(proxy); + auto node = global.second->node.get(); node->EnumerateFormats(); diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp index e332692b11..f8a7a84e4d 100644 --- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp +++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.cpp @@ -73,7 +73,7 @@ void CPipewireRegistry::OnGlobalAdded(void* userdata, globals[id]->type = std::string(type); globals[id]->version = version; globals[id]->properties.reset(pw_properties_new_dict(props)); - globals[id]->proxy = std::make_unique<CPipewireNode>(registry, id, type); + globals[id]->node = std::make_unique<CPipewireNode>(registry, id, type); } void CPipewireRegistry::OnGlobalRemoved(void* userdata, uint32_t id) diff --git a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h index 645b13fad7..136bd048c5 100644 --- a/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h +++ b/xbmc/cores/AudioEngine/Sinks/pipewire/PipewireRegistry.h @@ -21,7 +21,7 @@ namespace PIPEWIRE { class CPipewireCore; -class CPipewireProxy; +class CPipewireNode; class CPipewireRegistry { @@ -48,7 +48,7 @@ public: std::string type; uint32_t version; std::unique_ptr<pw_properties, PipewirePropertiesDeleter> properties; - std::unique_ptr<CPipewireProxy> proxy; + std::unique_ptr<CPipewireNode> node; }; std::map<uint32_t, std::unique_ptr<global>>& GetGlobals() { return m_globals; } |