X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fuser_bundle.cc;h=dda0a6dce75ace1cdf4594496c824cf96ca6c951;hp=471d823496a05a9260659c949a27c5a51572200c;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357 diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc index 471d823496..dda0a6dce7 100644 --- a/libs/ardour/user_bundle.cc +++ b/libs/ardour/user_bundle.cc @@ -1,132 +1,48 @@ -#include -#include -#include -#include -#include "ardour/user_bundle.h" -#include "ardour/port_set.h" -#include "ardour/io.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" -#include "i18n.h" +/* + Copyright (C) 2012 Paul Davis -ARDOUR::UserBundle::UserBundle (std::string const & n) - : Bundle (n) -{ + 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. -ARDOUR::UserBundle::UserBundle (XMLNode const & x, bool i) - : Bundle (i) -{ - if (set_state (x)) { - throw failed_constructor (); - } -} - -uint32_t -ARDOUR::UserBundle::nchannels () const -{ - Glib::Mutex::Lock lm (_ports_mutex); - return _ports.size (); -} + 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. -const ARDOUR::PortList& -ARDOUR::UserBundle::channel_ports (uint32_t n) const -{ - assert (n < nchannels ()); - - Glib::Mutex::Lock lm (_ports_mutex); - return _ports[n]; -} +*/ -void -ARDOUR::UserBundle::add_port_to_channel (uint32_t c, std::string const & p) -{ - assert (c < nchannels ()); - - PortsWillChange (c); - - { - Glib::Mutex::Lock lm (_ports_mutex); - _ports[c].push_back (p); - } - - PortsHaveChanged (c); -} - -void -ARDOUR::UserBundle::remove_port_from_channel (uint32_t c, std::string const & p) -{ - assert (c < nchannels ()); - - PortsWillChange (c); - - { - Glib::Mutex::Lock lm (_ports_mutex); - PortList::iterator i = std::find (_ports[c].begin(), _ports[c].end(), p); - if (i != _ports[c].end()) { - _ports[c].erase (i); - } - } - - PortsHaveChanged (c); -} - -bool -ARDOUR::UserBundle::port_attached_to_channel (uint32_t c, std::string const & p) const -{ - assert (c < nchannels ()); - - Glib::Mutex::Lock lm (_ports_mutex); - return std::find (_ports[c].begin(), _ports[c].end(), p) != _ports[c].end(); -} - -void -ARDOUR::UserBundle::add_channel () -{ - ConfigurationWillChange (); - - { - Glib::Mutex::Lock lm (_ports_mutex); - _ports.resize (_ports.size() + 1); - } - - ConfigurationHasChanged (); -} +#include "ardour/user_bundle.h" +#include "pbd/i18n.h" +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" -void -ARDOUR::UserBundle::set_channels (uint32_t n) +ARDOUR::UserBundle::UserBundle (std::string const & n) + : Bundle (n) { - ConfigurationWillChange (); - - { - Glib::Mutex::Lock lm (_ports_mutex); - _ports.resize (n); - } - ConfigurationHasChanged (); } -void -ARDOUR::UserBundle::remove_channel (uint32_t r) +ARDOUR::UserBundle::UserBundle (XMLNode const & node, bool i) + : Bundle (i) { - assert (r < nchannels ()); - - ConfigurationWillChange (); - - { - Glib::Mutex::Lock lm (_ports_mutex); - _ports.erase (_ports.begin() + r, _ports.begin() + r + 1); + if (set_state (node, Stateful::loading_state_version)) { + throw failed_constructor (); } - - ConfigurationHasChanged (); } int -ARDOUR::UserBundle::set_state (XMLNode const & node) +ARDOUR::UserBundle::set_state (XMLNode const & node, int /*version*/) { XMLProperty const * name; - + if ((name = node.property ("name")) == 0) { PBD::error << _("Node for Bundle has no \"name\" property") << endmsg; return -1; @@ -144,7 +60,18 @@ ARDOUR::UserBundle::set_state (XMLNode const & node) return -1; } - add_channel (); + if ((name = (*i)->property ("name")) == 0) { + PBD::error << _("Node for Channel has no \"name\" property") << endmsg; + return -1; + } + + XMLProperty const * type; + if ((type = (*i)->property ("type")) == 0) { + PBD::error << _("Node for Channel has no \"type\" property") << endmsg; + return -1; + } + + add_channel (name->value (), DataType (type->value())); XMLNodeList const ports = (*i)->children (); @@ -157,8 +84,8 @@ ARDOUR::UserBundle::set_state (XMLNode const & node) if ((name = (*j)->property ("name")) == 0) { PBD::error << _("Node for Port has no \"name\" property") << endmsg; return -1; - } - + } + add_port_to_channel (n, name->value ()); } @@ -172,7 +99,7 @@ XMLNode& ARDOUR::UserBundle::get_state () { XMLNode *node; - + if (ports_are_inputs ()) { node = new XMLNode ("InputBundle"); } else { @@ -181,17 +108,22 @@ ARDOUR::UserBundle::get_state () node->add_property ("name", name ()); - for (std::vector::iterator i = _ports.begin(); i != _ports.end(); ++i) { + { + Glib::Threads::Mutex::Lock lm (_channel_mutex); - XMLNode* c = new XMLNode ("Channel"); + for (std::vector::iterator i = _channel.begin(); i != _channel.end(); ++i) { + XMLNode* c = new XMLNode ("Channel"); + c->add_property ("name", i->name); + c->add_property ("type", i->type.to_string()); - for (PortList::iterator j = i->begin(); j != i->end(); ++j) { - XMLNode* p = new XMLNode ("Port"); - p->add_property ("name", *j); - c->add_child_nocopy (*p); - } + for (PortList::iterator j = i->ports.begin(); j != i->ports.end(); ++j) { + XMLNode* p = new XMLNode ("Port"); + p->add_property ("name", *j); + c->add_child_nocopy (*p); + } - node->add_child_nocopy (*c); + node->add_child_nocopy (*c); + } } return *node;