From 433196a83ac5500291ab2dbadf15a25b1b74335d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 Dec 2010 22:35:43 +0000 Subject: [PATCH] removed files git-svn-id: svn://localhost/ardour2/branches/3.0@8188 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/osc_route_observer.h | 55 ------------------- libs/ardour/osc_route_observer.cc | 71 ------------------------- 2 files changed, 126 deletions(-) delete mode 100644 libs/ardour/ardour/osc_route_observer.h delete mode 100644 libs/ardour/osc_route_observer.cc diff --git a/libs/ardour/ardour/osc_route_observer.h b/libs/ardour/ardour/osc_route_observer.h deleted file mode 100644 index 779640af40..0000000000 --- a/libs/ardour/ardour/osc_route_observer.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - Copyright (C) 2009 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __osc_oscrouteobserver_h__ -#define __osc_oscrouteobserver_h__ - -#include -#include -#include -#include - -#include "pbd/controllable.h" -#include "pbd/stateful.h" -#include "ardour/types.h" - -namespace ARDOUR { - class Route; -} - -class OSCRouteObserver -{ - - public: - OSCRouteObserver (lo_address addr, const std::string& path, boost::shared_ptr); - ~OSCRouteObserver (); - - boost::shared_ptr route() const { return _route; } - - private: - boost::shared_ptr _route; - - PBD::ScopedConnection changed_connection; - lo_address addr; - std::string path; - - void name_changed (const PBD::PropertyChange& what_changed); -}; - -#endif /* __osc_oscrouteobserver_h__ */ diff --git a/libs/ardour/osc_route_observer.cc b/libs/ardour/osc_route_observer.cc deleted file mode 100644 index 3a5a835b5e..0000000000 --- a/libs/ardour/osc_route_observer.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* - Copyright (C) 2009 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include /* for sprintf, sigh */ -#include - -#include "boost/lambda/lambda.hpp" - -#include "pbd/error.h" -#include "pbd/xml++.h" - -#include "ardour/route.h" - -#include "osc.h" -#include "osc_route_observer.h" - -#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) - -using namespace sigc; -using namespace PBD; -using namespace ARDOUR; - - -OSCRouteObserver::OSCRouteObserver (lo_address a, const std::string& p, boost::shared_ptr r) - : _route (r) -{ - addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); - _route->PropertyChanged.connect (changed_connection, MISSING_INVALIDATOR, ui_bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance()); -} - -OSCRouteObserver::~OSCRouteObserver () -{ - changed_connection.disconnect(); - lo_address_free (addr); -} - -void -OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed) -{ - if (!what_changed.contains (ARDOUR::Properties::name)) { - return; - } - - if (!_route) { - return; - } - - lo_message msg = lo_message_new (); - - lo_message_add_int32 (msg, _route->remote_control_id()); - lo_message_add_string (msg, _route->name().c_str()); - - lo_send_message (addr, "/route/name", msg); - lo_message_free (msg); -}