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

minor optimization changes

Browse Source
This commit is contained in:
Andrea Bondavalli 2020-01-31 10:45:41 -08:00
parent abb07d687a
commit 0b1a9c2688
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/json.cpp
View File

@ -30,8 +30,7 @@
static inline std::string remove_undesired_chars(const std::string& s) { static inline std::string remove_undesired_chars(const std::string& s) {
std::regex html_regex("[^ A-Za-z0-9:~._/=%\()\\r\\n\\t\?#-]?"); std::regex html_regex("[^ A-Za-z0-9:~._/=%\()\\r\\n\\t\?#-]?");
std::string r = std::regex_replace(s, html_regex, ""); return std::regex_replace(s, html_regex, "");
return r;
} }
static std::string escape_json(const std::string& js) { static std::string escape_json(const std::string& js) {
@ -328,7 +327,7 @@ StreamSource json_to_source(const std::string& id, const std::string& json) {
ALSA output channels used to playing */ ALSA output channels used to playing */
BOOST_FOREACH (boost::property_tree::ptree::value_type& v, BOOST_FOREACH (boost::property_tree::ptree::value_type& v,
pt.get_child("map")) { pt.get_child("map")) {
source.map.push_back(std::stoi(v.second.data())); source.map.emplace_back(std::stoi(v.second.data()));
} }
source.max_samples_per_packet = pt.get<uint32_t>("max_samples_per_packet"); source.max_samples_per_packet = pt.get<uint32_t>("max_samples_per_packet");
source.codec = remove_undesired_chars(pt.get<std::string>("codec")); source.codec = remove_undesired_chars(pt.get<std::string>("codec"));
@ -374,7 +373,7 @@ StreamSink json_to_sink(const std::string& id, const std::string& json) {
ALSA input channels used to recording */ ALSA input channels used to recording */
BOOST_FOREACH (boost::property_tree::ptree::value_type& v, BOOST_FOREACH (boost::property_tree::ptree::value_type& v,
pt.get_child("map")) { pt.get_child("map")) {
sink.map.push_back(std::stoi(v.second.data())); sink.map.emplace_back(std::stoi(v.second.data()));
} }
} catch (boost::property_tree::json_parser::json_parser_error& je) { } catch (boost::property_tree::json_parser::json_parser_error& je) {
throw std::runtime_error("error parsing JSON at line " + throw std::runtime_error("error parsing JSON at line " +
@ -425,9 +424,9 @@ static void parse_json_sources(boost::property_tree::ptree& pt,
ALSA output channels used to playing */ ALSA output channels used to playing */
BOOST_FOREACH (const boost::property_tree::ptree::value_type& vm, BOOST_FOREACH (const boost::property_tree::ptree::value_type& vm,
v.second.get_child("map")) { v.second.get_child("map")) {
source.map.push_back(std::stoi(vm.second.data())); source.map.emplace_back(std::stoi(vm.second.data()));
} }
sources.push_back(source); sources.emplace_back(std::move(source));
} }
} }
@ -465,9 +464,9 @@ static void parse_json_sinks(boost::property_tree::ptree& pt,
ALSA input channels used to recording */ ALSA input channels used to recording */
BOOST_FOREACH (const boost::property_tree::ptree::value_type& vm, BOOST_FOREACH (const boost::property_tree::ptree::value_type& vm,
v.second.get_child("map")) { v.second.get_child("map")) {
sink.map.push_back(std::stoi(vm.second.data())); sink.map.emplace_back(std::stoi(vm.second.data()));
} }
sinks.push_back(sink); sinks.emplace_back(std::move(sink));
} }
} }

6
daemon/session_manager.cpp
View File

@ -759,7 +759,7 @@ std::error_code SessionManager::get_sink_status(
return DaemonErrc::invalid_stream_id; return DaemonErrc::invalid_stream_id;
} }
std::unique_lock sinks_lock(sinks_mutex_); std::shared_lock sinks_lock(sinks_mutex_);
auto const it = sinks_.find(id); auto const it = sinks_.find(id);
if (it == sinks_.end()) { if (it == sinks_.end()) {
BOOST_LOG_TRIVIAL(error) BOOST_LOG_TRIVIAL(error)
@ -851,12 +851,12 @@ size_t SessionManager::process_sap() {
} }
} }
// check for sources that are no more announced and send deletion/s // check for sources that are no longer announced and send deletion/s
for (auto const& [msg_id_hash, pair] : announced_sources_) { for (auto const& [msg_id_hash, pair] : announced_sources_) {
const auto &id = pair.first; const auto &id = pair.first;
const auto &src_addr = pair.second; const auto &src_addr = pair.second;
// check if this source is no more announced // check if this source is no longer announced
if (active_sources.find(msg_id_hash) == if (active_sources.find(msg_id_hash) ==
active_sources.end()) { active_sources.end()) {
// retrieve deleted source SDP // retrieve deleted source SDP