From 665e0686e5f25ec329bb4bd2e43b93cb480062a7 Mon Sep 17 00:00:00 2001 From: Luciano Iam Date: Sun, 30 Aug 2020 11:56:24 +0200 Subject: [PATCH] WS: noop use a namespace for JSON utilities Instead of a class with static methods Also correct some whitespace to prevent triggering of OCD cycles --- libs/surfaces/websockets/dispatcher.cc | 4 ++-- libs/surfaces/websockets/feedback.cc | 4 ++-- libs/surfaces/websockets/json.h | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/surfaces/websockets/dispatcher.cc b/libs/surfaces/websockets/dispatcher.cc index e8f9da1355..a8e3479787 100644 --- a/libs/surfaces/websockets/dispatcher.cc +++ b/libs/surfaces/websockets/dispatcher.cc @@ -56,7 +56,7 @@ void WebsocketsDispatcher::update_all_nodes (Client client) { for (ArdourMixer::StripMap::iterator it = mixer().strips().begin(); it != mixer().strips().end(); ++it) { - uint32_t strip_id = it->first; + uint32_t strip_id = it->first; ArdourMixerStrip& strip = it->second; AddressVector strip_addr = AddressVector (); @@ -79,7 +79,7 @@ WebsocketsDispatcher::update_all_nodes (Client client) update (client, Node::strip_pan, strip_id, strip.pan ()); for (ArdourMixerStrip::PluginMap::iterator it = strip.plugins ().begin (); it != strip.plugins ().end (); ++it) { - uint32_t plugin_id = it->first; + uint32_t plugin_id = it->first; boost::shared_ptr insert = it->second.insert (); boost::shared_ptr plugin = insert->plugin (); diff --git a/libs/surfaces/websockets/feedback.cc b/libs/surfaces/websockets/feedback.cc index 6aeaa02ad2..c3301723ae 100644 --- a/libs/surfaces/websockets/feedback.cc +++ b/libs/surfaces/websockets/feedback.cc @@ -194,7 +194,7 @@ void ArdourFeedback::observe_mixer () { for (ArdourMixer::StripMap::iterator it = mixer().strips().begin(); it != mixer().strips().end(); ++it) { - uint32_t strip_id = it->first; + uint32_t strip_id = it->first; ArdourMixerStrip& strip = it->second; boost::shared_ptr stripable = strip.stripable (); @@ -219,7 +219,7 @@ void ArdourFeedback::observe_strip_plugins (uint32_t strip_id, ArdourMixerStrip::PluginMap& plugins) { for (ArdourMixerStrip::PluginMap::iterator it = plugins.begin(); it != plugins.end(); ++it) { - uint32_t plugin_id = it->first; + uint32_t plugin_id = it->first; ArdourMixerPlugin& plugin = it->second; boost::shared_ptr insert = plugin.insert (); boost::shared_ptr connections = plugin.connections (); diff --git a/libs/surfaces/websockets/json.h b/libs/surfaces/websockets/json.h index 1bc19d74ca..4db738575a 100644 --- a/libs/surfaces/websockets/json.h +++ b/libs/surfaces/websockets/json.h @@ -19,12 +19,9 @@ #ifndef _ardour_surface_websockets_json_h_ #define _ardour_surface_websockets_json_h_ -class Json +namespace Json { -public: - - static std::string escape (const std::string&); - -}; + std::string escape (const std::string&); +} #endif // _ardour_surface_websockets_json_h_