merge changes from trunk

git-svn-id: svn://localhost/ardour2/branches/2.0.1@1790 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-05-07 04:41:08 +00:00
parent 6959b1728e
commit 653c6d61f9
5 changed files with 35 additions and 34 deletions

View file

@ -38,12 +38,19 @@ ControlProtocol::ControlProtocol (Session& s, string str)
_name (str)
{
_active = false;
session->RouteAdded.connect (mem_fun(*this, &ControlProtocol::add_strip));
}
ControlProtocol::~ControlProtocol ()
{
}
void
ControlProtocol::add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >)
{
route_list_changed();
}
void
ControlProtocol::next_track (uint32_t initial_id)
{