Networking with osc #122

…message_level() (friend function for OscHandler). Changing add_client to use a MessageLevel parameter. Line wraps. src/networking/oscreceiver.cpp: Style changes for string compare in start(). Updating callback handler for /subscribe message to also be able to set an inital message_level for the client subscribing. Prettifying VERBOSE output in /subscribe callback handler. Adding callback handler for /message_level, enabling clients to set their own message_level (the amount of messages received from the server, defaults to MessageLevel::CLIENT - which is a lot of messages (some unneeded probably) already).

…client() to use an additional parameter for MessageLevel. Adding set_client_message_level(). src/networking/oscsender.cpp: Adding implementation of set_client_message_level(). Changing add_client() to use the MessageLevel provided as parameter. Updating VERBOSE output for add_client().

…evel. Updating friend function add_client() to include MessageLevel parameter. adding friend function set_message_level(). src/networking/oschandler.cpp: Updating call to add_client() in constructor and implementation of add_client() to incorporate MessageLevel parameter. Adding implementation of friend function set_message_level().

…) into several functions, so they can be applied to server objects as well. src/networking/oscreceiver.cpp: Splitting the implementation of callback handler adding into several functions, so they can be more easily applied fine-grained to server objects as well.

…2string representations. Adding bool_to_message_type() and bool_to_string() to public interface for VERBOSE messages used throughout OscSender and OscReceiver. src/networking/oschandler.cpp: Adding implementation of bool_to_message_type() and bool_to_string().

… bool_to_message_type. src/networking/oscsender.cpp: Removing implementation of bool_to_message_type() and replacing all calls to it by the version now held by OscHandler.

…ty of all source related VERBOSE messages by adding more relevant output derived from incoming message.

…ion of is_server() and is_client().

…_client() by the versions from OscHandler. Removing is_client() and is_server() declarations and implementations.

…start(). Improving VERBOSE output of reference, reference_offset, scene, processing and transport message handlers by adding information on caller and displaying whole message sent properly.

…all source related mentions of volume to gain to be consistent with the Publisher/Subscriber interface.

…eption handling in is_new_source(). Erasing source information from _new_sources after the /source/new message has been sent to clients.

…he assembled /source/new message has been sent out to clients. TODO about exception handling in is_new_source().

…rking-with-osc * 'networking-with-osc' of github.com:dvzrv/ssr: src/networking/oscreceiver.cpp: Minor fixes in comments. TODO for exception handling in is_new_source(). Erasing source information from _new_sources after the /source/new message has been sent to clients.

…ll message frequency in milliseconds. Removing commented, now obsolete function bool_to_message_type().

… interface.

…file_channel. Renaming all channel variables to file_channel for consistency. src/networking/oscsender.cpp: Renaming all channel variables to file_channel for consistency.

…back handlers more readable, adhering to the output of the other handlers. Fixing line wraps.

…eed to access its functions.

…lback...' instead of 'Added method...' for each callback add.

…etically for readability. Unifying output style of message types.

…() to alphabetical location. Changing VERBOSE messages in /subscribe and /message_level callbacks to adhere to style standard. Raising VERBOSE messages for /transport/seek and /transport/state messages to VERBOSE3.

…s call to unitialized variable in /message_level callback handler. Adding First prototype of variable string for client/server VERBOSE message.

…t in set_message_level(). src/networking/oscreceiver.cpp: Adding /message_level ssi callback handler. src/networking/oschandler.h: Changing definition of set_message_level friend function to use std::string types for hostname and port instead of a lo::Address. src/networking/oschandler.cpp: Changing OscReceiver::set_message_level() parameters to use std::strings for hostname and port instead of a lo::Address and updating documentation for the function.

… Rewriting add_client() and deactivate_client() to use std::string for hostname and port instead of a lo::Address object.

…type OscClient, to have easier control over MessageLevel of the server for clients, using the same functionality. Refactoring all involved functions. Making all setters for the lo::Address fields use reference type parameters.

…cing all calls to it by calls to _clients. Adding set_server_message_level(), to set the MessageLevel of a clients representation of a server. Minor fixes.

…level() in OscHandler/OscReceiver in alignment with set_client_message_level() in OscSender for better readability.

…_message_level.

…ssages only meant for GUI updates. Making int representation implicit.

…ients, when trying to send to server from GUI_CLIENT to GUI_SERVER.

…, std::string& port) to OscSender::is_server(std::string& hostname, std::string& port) for better readability. Changing in all of its use-cases.

…er_to_client_methods(). Making /source/new callback more robust, by only initializing with OSC message types, once the understood type tags have been found. Minor line break fix.

… returning a const std::string, depending on whether the handler is server or client. Implementing from_is() in all VERBOSE messages in client/server callbacks.

… to OscReceiver by OscHandler friend function) to check for MessageLevel of a client defined by hostname and port. Applying checks to whether caller of a message is the server currently setup (client mode) or if a client exists with a MessageLevel::SERVER (server mode) to be able to shut out unsolicited OSC messages to clients and servers. This way clients only listen to servers subscribed to and servers only to clients with a MessageLevel of SERVER.

…terface.

…scReceiver::client_has_message_level() friend function implementation.

… with MessageLevel GUI_CLIENT. Adding callback for /source/file_name_or_port_number. Adding callback for /source/level. Adding callback for /scene/amplitude_reference_distance, /scene/auto_rotate_sources, /scene/decay_exponent. Adding callback for /update/scene/master_signal_level. src/networking/oscsender.cpp: Updating check for MessageLevel in ssr:OscSender::client_has_message_level() to check if client is active. Adding server-side implementation to ssr::OscSender::set_cpu_load(). Removing server-side implementation from ssr::OscSender::set_sample_rate(). Sending messages only to GUI_CLIENT clients in set_source_signal_level(), set_master_signal_level(). Removing obsolete TODOs. Minor fixes.

…essageLevel. Moving SERVER and GUI_SERVER to the top values.

…te and /update/source/position_fixed more robust. Switching to VERBOSE2 (from VERBOSE3) in callback handlers for all non-rapid messages.

…er property to within statement checking for new_source in OscSender::set_source_mute (preventing accidental sending on server, before source is created). Moving check for file_channel property to within statement checking for new source in OscSender::set_source_properties_file (preventing accidental sending on server, before source is created). Moving check for file_channel > 0 to within statement checking for new source in OscSender::set_source_file_channel to prevent an unfinished source in _new_sources. Setting client check to <= GUI_CLIENT for OscSender::set_transport_state and to == GUI_CLIENT for OscSender::set_source_signal_level. Using std::string reference directly in VERBOSE messages of functions having string parameters and c_str() representation for sending OSC messages to not initialize an unneeded variable every time.

… client controlling the server' and 'sclang mimics a server, controls a client'.

…ed and not subscribed).

…dding sourceTestAdding to source movement test. Making sourceTestMoving function use a Routine to move n sources randomly for 100 seconds, each 100ms.

…a source on the logarithmic scale (to be coherent with the IP interface and how /source/gain handles things).

… about hostname:port in ''. Minor linewrap fixes.

…tomatically after 10 seconds. No more messages will be sent to them, as long as they don't subscribe again.

…eceiver implicitely copy by value.

src/networking/*: Making assignment of client/server MessageLevel sane.

… from a char. If chosen port is < 0, a well-known port, or not in the range of IANA suggested ephemeral ports, the standard port 50001 will be used.

… the ServerThread could not be initialized (most likely due to port already being in use).

… related callbacks.

…networking-with-osc" This reverts commit b8c0747, reversing changes made to 7f102e6.

…garithmic scale for setting source gain. A range form 0.0 - inf is used, where 1.0 signifies 100% source level.

…rence orientation through orientation sensor and two sources through multi-touch interface.

… Introducing /alive message on receiving /poll from server. Controlling /reference/orientation with /orientation/X from Sensors2OSC. Deactivating verbose printout on each received message.

… have unique keys.

…k clients and ports from flag or configuration file. Adding flags for network-mode, network-port-receive, network-port-send and network-clients.

…ly bracket to next line in parse_network_clients.

…mes, adding VERBOSE2 messages about which clients are added. Moving remove_whitespace to ssr namespace. src/configuration.h: Defining remove_whitespace in ssr namespace.

…ference. Fixing a missing comma in the help output of ssr.

…of osc-port. Using only hyphen instead of underscore for option strings.

… osc_port.

…of OSC_PORT (which defaults to 50001). Updating NETWORK_CLIENTS example accordingly. Clarifying NETWORK_MODE comment.

… from a char. If chosen port is < 0, a well-known port, or not in the range of IANA suggested ephemeral ports, the standard port 50001 will be used.

…nderer_params.set().

…rface.

…ng and receiving.

…member and to client/server constructor.

…for initializing OscSender.

…ng new source. Implementing proper use of LO_TRUE and LO_FALSE types in all callback functions. Minor fixes to some VERBOSE2 output in callback functions.

…ler to OscSender constructors. Adding start/stop functionality that subscribes/unsubscribes OscSender with/from the controller.

…rt numbers in use.

…d mode() methods.

…claration.

… Adding/updating documentation.

…ll_clients(), send_to_server() methods.

…n for send_to_server(), _mode string, _source_level and _master_level. Updating server constructor to include OscHandler reference and client_addresses vector.

…ce. Updating call to constructor of OSCHandler to include _conf.network_clients and _conf.network_port_send.

…rt of namespace ssr. Changing constructor to be more explicit.

…ore explicit. Adding friend functions to be able to send lo::Messages and lo::Bundles to clients/server in callbacks.

… to all clients, server or specific client. Fixing all send methods to use a path std::string, where needed. Making all methods part of namespace ssr. Adding poll_all_clients method to send periodical '/poll' messages to all clients to make them subscribe to the server. Adding std::thread poll_thread to call poll_all_clients in a thread.

…ll_clients method. Adding send_to_client and send_to_all_clients public methods.

… Initializing _osc_sender in body instead of initializer list. Fixing call to set_server_address in friend function. Adding friend functions for sending to client(s) and server for OscReceiver.

… OscHandler. Adding friend functions for OscReceiver to send messages/bundles to server and client(s).

…OSC messages (especially source/properties_file) and the naming of variables (especially file_name_or_port_number). Fixing typo in OSC message for reference/orientation and reference_offset/orientation.

…s_server, is_new_source, is_complete_source, send_new_source_message_from_id and a map for the collection of source message parts (_new_sources), requiring the adding of apf/parameter_map.h.

…_server and all Subscriber interface functions.

…to server OSC messages. Fixing typos in server to client callback functions. Renaming processing/state and transport/{state,seek} for clearer interface.

…rs function. Fixing copy stupidity in set_source_signal_level and changing to new OSC message format in set_transport_state and set_processing_state.

…lization in Constructor.

…p in constructor.

…initializer list.

…ng during make.

…s members were wrongly named and the function declaration insufficient.

…ress to the vector of clients.

…izer list. Adding list of clients to _osc_sender (as lo::Address objects), if server mode is selected. Removing todo about reorder warning.

…mbers of _osc_sender. Clearly defining function heads for set_server_for_client and server_address to use ssr:OscHandler.

…all_clients functions. Properly implementing mode(), OscReceiver::server_address. Fixing access to _osc_sender member.

… functions.

…OSE messages.

…e std::string.

…r added to arguments, initializer list reorganized). Set check for client/server mode to use _handler instance. Fixing typo in add_client_to_server_methods, calling agrv instead of argv.

…utput, where needed. Avoiding unused parameter warning with argv in some lambda functions. Using << in VERBOSE instead of <.

…s of lo::Message objects to std::string. Using apf::str::S2A for Source::model_t editing. Adding *this pointer to lambda functions, that require access to _controller.

…a switch in the lambda responsible for setting up a new source. Initializing all dependant types earlier.

… use. Adding this pointer capture to remaining functions needing it. Explicitely converting lo::Message members of type std::string using apf::str::A2S.

…ers around to reflect Constructor implementation.

…h}.h to includes. Removing server specific constructor to reflect header. Fixing initializer list. Fixing Destructor. Fixing start() function VERBOSE printouts. Fixing calls to _handler.mode(). Introducing int32_t for id_t types, when sending OSC messages with id. Various small typo fixes.

…pe for _poll_thread. Removing public function poll_clients() (unused).

…g all clients instead of joinable std::thread. Making this a server-exclusive feature.

… Removing useless CPPFLAGS from header check for liblo.

…eiver.stop() implementation, which wasn't there yet.

… and start().

…Fixing _server_address initialization by adding a port.

…structor and destructor, start() and stop(). Adding ssr::OscReceiver::send_to_server again, after accidentally deleting it.

…, destructor, start() and stop(). Adding VERBOSE message for each callback method. Adding leading / to all callback listeners (every high-level language, such as SuperCollider and Pd use it that way).

…ding / to the path of every send_to_all_clients and send_to_server function call. Making all lo::Message.add() calls type explicit to circumvent ambiguity.

… clauses, checking for default server. Using lo:Address hostname() and port() functions to create new addresses. Copying by value in server_address(), to prevent double free.

…ters to lo::Address objects. Remodelling add_client() to use std::string for hostname and port instead of a lo::Address. Properly dereferencing all calls to member functions of client objects in _client_addresses. Setting sleep time for poll thread to 1s.

…lients. Adding clients using the new add_client() function.

….osc_port.

…o reflect change in configuration branch (only one OSC port needed). Replacing port_in/port_out parameters from Constructor with port. Adding public function declaration for getting a reference to _server.

…verThread in OscHandler. Removing port_{in,out} usage in constructor. Starting lo::ServerThread in start() implementation. Starting _server after starting _osc_{receiver,sender}. Implementing server() function to return a reference to OscHandler's _server.

…scReceiver. Removing port_in argument to constructor.

…tor. Removing initialization of a lo::ServerThread in OscReceiver. Replacing all calls to _receiver with _handler.server().

…cSender. Removing obsolete OscSender Constructor. Removing port_out argument of remaining constructor.

…ctor. Updating default server_address to use port 50001. Removing initialization of lo::ServerThread in OscSender. Replacing all calls to _send_from with _handler.server().

…atic.

…tatic.

…r. Adding initialization of lo::ServerThread reference to add_client_to_server_methods() and add_server_to_client_methods() to properly access the OscHandler's _server member.

…ng the type of OSC messages sent (very verbose). This should ultimately be a client address based setting, so clients can subscribe to several layers of messages. Adding message_leve() function for returning _message_level. Adding friend functions add_client(), remove_client() for OscReceiver to add and remove clients from the list of clients in OscSender.

…s friend functions add_client() and remove_client(). Adding implementation of message_level() function.

…e_client() to add and remove clients on OscSender.

…be message (adds client to the list of clients). Updating comments for start() and stop(). Changing the /poll callback to use /subscribe by directly calling send_from() on the calling address, instead of using the friend function. Using references for all calls to strings from a lo::Message argument list. Fixing typo in /transport/seek callback function.

…_type_false and _message_type_true const std::strings. Adding function server_is_default(), bool_to_message_type(), remove_all_clients() and remove_client().

…fault(), bool_to_message_type(), remove_client() and remove_all_clients(). Changing all subscriber interface functions to directly send OSC messages to server/clients (this is very redundant, but needed, as lo::Message loses scope of some data types, if used as before - bug?). Adding VERBOSE messaging to all subscriber interface functions. Adding several layers of OSC message sending verbosity (ultimately planend to be settable by each client individually).

…n for OSC client, which is defined by a lo::Address and an enum class defining the message level.

…rom OscClient.

…d start().

…ic functions to retrieve the _active state of OscClient objects and deactivating them.

…ate of OscClient objects to true on initialization. Adding implementation to retrieve the object's _active state. Adding function to deactivate instances of the objects.

…sageLevel. Changing _address to be non-const. Returning _address by reference in address().

…Changing return type of address() to be a lo::Address reference.

@param

…leting false @param documentation for deactivate().

… to deactivate_client().

…nt() to deactivate_client().

…to deactivate_client. src/networking/oscreceiver.cpp: Changing call to remove_client() to deactivate_client().

… and adding std::vector<OscClient*> _clients, (making the std::vector<lo::Address*> _client_addresses obsolete. Replacing remove_all_client_addresses() by remove_all_clients(). Replacing remove_client() by deactivate_client(). Fixing line wrap.

…dresses() with remove_all_clients(). Sending /poll only to activated clients. Rewriting add_client() to use _clients, reusing clients that were once subscribed and otherwise adding a new OscClient with MessageLevel::CLIENT. Replacing remove_client() by deactivate_client(), which only deactivates the client object, but never deletes it (this is somewhat a memory leak, if too many clients subscribe, that never reconnect again, as clients are only added to the list/reused from the list, but never deleted). Rewriting all functions in Subscriber interface (that require it) to use _clients instead _client_addresses. This makes proper checks to the client objects activate state (and checks for MessageLevel in the future) possible.

…inter. Changing all calls to clients to use ->

…urce(). Implementing send_new_source_message_from_id(). Fixing various calls to _new_sources, as it would otherwise trigger multiple calls to send_new_source_message_from_id(). Removing server-side execution in set_port_name(), as port_name is a local setting and depends on port_name prefix (which must always be kept local).

…d message_level(). src/networking/oschandler.cpp: Removing implementation of message_level().

…o store a clients level of messages sent towards their server. This can be set with the set_message_level() function, defined here.

…/is_server(). Switching to using _message_level of OscSender instead of (now deleted) OscHandler in all very fast client to server messages.

…SE and MessageLevel. Removing enum class MessageLevel (now in ssr_global). src/networking/oscclient.cpp: Removing include for ssr_global.h (now in header).