X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fuser_bundle.cc;h=ee98f02858f55bcff5235b579983ca755d166cd5;hb=79f01bc889d6c928345214eaba9016c6396bcfca;hp=b9d115bc400c7473db6b32246e4b732d07dad34b;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc index b9d115bc40..ee98f02858 100644 --- a/libs/ardour/user_bundle.cc +++ b/libs/ardour/user_bundle.cc @@ -1,138 +1,54 @@ -#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" - -ARDOUR::UserBundle::UserBundle (std::string const & n) - : Bundle (n) -{ - -} - -ARDOUR::UserBundle::UserBundle (XMLNode const & x, bool i) - : Bundle (i) -{ - if (set_state (x)) { - throw failed_constructor (); - } -} - -ARDOUR::ChanCount -ARDOUR::UserBundle::nchannels () const -{ - Glib::Mutex::Lock lm (_ports_mutex); - return ChanCount (type(), _ports.size ()); -} +/* + Copyright (C) 2012 Paul Davis -const ARDOUR::PortList& -ARDOUR::UserBundle::channel_ports (uint32_t n) const -{ - assert (n < nchannels ().get (type())); - - 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 ().get (type())); - - 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 ().get (type())); - - 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); -} + 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. -bool -ARDOUR::UserBundle::port_attached_to_channel (uint32_t c, std::string const & p) const -{ - assert (c < nchannels ().get (type())); + 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. - Glib::Mutex::Lock lm (_ports_mutex); - return std::find (_ports[c].begin(), _ports[c].end(), p) != _ports[c].end(); -} + 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. -void -ARDOUR::UserBundle::add_channel () -{ - ConfigurationWillChange (); +*/ - { - Glib::Mutex::Lock lm (_ports_mutex); - _ports.resize (_ports.size() + 1); - } - - ConfigurationHasChanged (); -} +#include "ardour/user_bundle.h" +#include "ardour/types_convert.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 ().get (type())); - - 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) { + std::string str; + if (!node.get_property ("name", str)) { PBD::error << _("Node for Bundle has no \"name\" property") << endmsg; return -1; } - set_name (name->value ()); + set_name (str); XMLNodeList const channels = node.children (); @@ -144,7 +60,18 @@ ARDOUR::UserBundle::set_state (XMLNode const & node) return -1; } - add_channel (); + if (!(*i)->get_property ("name", str)) { + PBD::error << _("Node for Channel has no \"name\" property") << endmsg; + return -1; + } + + DataType type(DataType::NIL); + if (!(*i)->get_property ("type", type)) { + PBD::error << _("Node for Channel has no \"type\" property") << endmsg; + return -1; + } + + add_channel (str, type); XMLNodeList const ports = (*i)->children (); @@ -154,12 +81,12 @@ ARDOUR::UserBundle::set_state (XMLNode const & node) return -1; } - if ((name = (*j)->property ("name")) == 0) { + if (!(*j)->get_property ("name", str)) { PBD::error << _("Node for Port has no \"name\" property") << endmsg; return -1; - } - - add_port_to_channel (n, name->value ()); + } + + add_port_to_channel (n, str); } ++n; @@ -172,26 +99,31 @@ XMLNode& ARDOUR::UserBundle::get_state () { XMLNode *node; - + if (ports_are_inputs ()) { node = new XMLNode ("InputBundle"); } else { node = new XMLNode ("OutputBundle"); } - node->add_property ("name", name ()); + node->set_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->set_property ("name", i->name); + c->set_property ("type", i->type); - 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->set_property ("name", *j); + c->add_child_nocopy (*p); + } - node->add_child_nocopy (*c); + node->add_child_nocopy (*c); + } } return *node;