smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

WS: noop use a namespace for JSON utilities

Browse source 
Instead of a class with static methods

Also correct some whitespace to prevent triggering of OCD cycles
This commit is contained in:
Luciano Iam 2020-08-30 11:56:24 +02:00 • committed by Robin Gareus
parent aa38491b7d
commit 665e0686e5
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/surfaces/websockets/dispatcher.cc
View file

@ -56,7 +56,7 @@ void
WebsocketsDispatcher::update_all_nodes (Client client) WebsocketsDispatcher::update_all_nodes (Client client)
{ {
for (ArdourMixer::StripMap::iterator it = mixer().strips().begin(); it != mixer().strips().end(); ++it) { 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; ArdourMixerStrip& strip = it->second;
AddressVector strip_addr = AddressVector (); AddressVector strip_addr = AddressVector ();
@ -79,7 +79,7 @@ WebsocketsDispatcher::update_all_nodes (Client client)
update (client, Node::strip_pan, strip_id, strip.pan ()); update (client, Node::strip_pan, strip_id, strip.pan ());
for (ArdourMixerStrip::PluginMap::iterator it = strip.plugins ().begin (); it != strip.plugins ().end (); ++it) { 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<PluginInsert> insert = it->second.insert (); boost::shared_ptr<PluginInsert> insert = it->second.insert ();
boost::shared_ptr<Plugin> plugin = insert->plugin (); boost::shared_ptr<Plugin> plugin = insert->plugin ();

4
libs/surfaces/websockets/feedback.cc
View file

@ -194,7 +194,7 @@ void
ArdourFeedback::observe_mixer () ArdourFeedback::observe_mixer ()
{ {
for (ArdourMixer::StripMap::iterator it = mixer().strips().begin(); it != mixer().strips().end(); ++it) { 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; ArdourMixerStrip& strip = it->second;
boost::shared_ptr<Stripable> stripable = strip.stripable (); boost::shared_ptr<Stripable> stripable = strip.stripable ();
@ -219,7 +219,7 @@ void
ArdourFeedback::observe_strip_plugins (uint32_t strip_id, ArdourMixerStrip::PluginMap& plugins) ArdourFeedback::observe_strip_plugins (uint32_t strip_id, ArdourMixerStrip::PluginMap& plugins)
{ {
for (ArdourMixerStrip::PluginMap::iterator it = plugins.begin(); it != plugins.end(); ++it) { 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; ArdourMixerPlugin& plugin = it->second;
boost::shared_ptr<PluginInsert> insert = plugin.insert (); boost::shared_ptr<PluginInsert> insert = plugin.insert ();
boost::shared_ptr<PBD::ScopedConnectionList> connections = plugin.connections (); boost::shared_ptr<PBD::ScopedConnectionList> connections = plugin.connections ();

9
libs/surfaces/websockets/json.h
View file

@ -19,12 +19,9 @@
#ifndef _ardour_surface_websockets_json_h_ #ifndef _ardour_surface_websockets_json_h_
#define _ardour_surface_websockets_json_h_ #define _ardour_surface_websockets_json_h_
class Json namespace Json
{ {
public: std::string escape (const std::string&);
}
static std::string escape (const std::string&);
};
#endif // _ardour_surface_websockets_json_h_ #endif // _ardour_surface_websockets_json_h_