smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 05:36:31 +01:00
Code Issues Projects Releases Wiki Activity

SG: merge 3.0 from 11783-12096

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-26 17:06:21 +00:00
parent 85a27910cb
commit 9c8b57aab0
385 changed files with 14193 additions and 18198 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -19,6 +19,7 @@
*/
#include "pbd/pthread_utils.h"
#include "pbd/memento_command.h"
#include "ardour/session.h"
#include "ardour/location.h"
@ -91,22 +92,29 @@ BasicUI::goto_end ()
}
void
BasicUI::add_marker ()
BasicUI::add_marker (const std::string& markername)
{
framepos_t when = session->audible_frame();
session->locations()->add (new Location (*session, when, when, _("unnamed"), Location::IsMark));
framepos_t where = session->audible_frame();
Location *location = new Location (*session, where, where, markername, Location::IsMark);
session->begin_reversible_command (_("add marker"));
XMLNode &before = session->locations()->get_state();
session->locations()->add (location, true);
XMLNode &after = session->locations()->get_state();
session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
session->commit_reversible_command ();
}
void
BasicUI::rewind ()
{
session->request_transport_speed (-2.0f);
std::cerr << "request transport speed of " << session->transport_speed() - 1.5 << std::endl;
session->request_transport_speed (session->transport_speed() - 1.5);
}
void
BasicUI::ffwd ()
{
session->request_transport_speed (2.0f);
session->request_transport_speed (session->transport_speed() + 1.5);
}
void