janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Session manager doesn't retrieve the remote sources in case the automatic Sinks update is disabled.

Browse Source
This commit is contained in:
Andrea Bondavalli 2023-01-15 10:59:04 +01:00
parent 603b767f06
commit d1708d6ee3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/session_manager.cpp
View File

@ -1054,9 +1054,10 @@ std::list<StreamSink> SessionManager::get_updated_sinks(
return sinks_list; return sinks_list;
} }
void SessionManager::update_sinks(const std::list<RemoteSource>& sources_list) { void SessionManager::update_sinks() {
if (config_->get_auto_sinks_update()) { if (config_->get_auto_sinks_update()) {
auto sinks_list = get_updated_sinks(sources_list); std::list<RemoteSource> remote_sources = browser_->get_remote_sources();
auto sinks_list = get_updated_sinks(remote_sources);
for (auto& sink : sinks_list) { for (auto& sink : sinks_list) {
// Re-add sink with new SDP, since the sink.id is the same there will be // Re-add sink with new SDP, since the sink.id is the same there will be
// an update // an update
@ -1214,10 +1215,7 @@ bool SessionManager::worker() {
<< sap_interval << " secs"; << sap_interval << " secs";
} }
/* Use a newer version of source if the current version isn't available update_sinks();
* anymore. This typically happens when equipment is restarted. */
std::list<RemoteSource> remote_sources = browser_->get_remote_sources();
update_sinks(remote_sources);
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
} }

2
daemon/session_manager.hpp
View File

@ -170,7 +170,7 @@ class SessionManager {
std::list<StreamSink> get_updated_sinks( std::list<StreamSink> get_updated_sinks(
const std::list<RemoteSource>& sources_list); const std::list<RemoteSource>& sources_list);
void update_sinks(const std::list<RemoteSource>& sources_list); void update_sinks();
void on_add_source(const StreamSource& source, const StreamInfo& info); void on_add_source(const StreamSource& source, const StreamInfo& info);
void on_remove_source(const StreamInfo& info); void on_remove_source(const StreamInfo& info);