summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-08-09 16:40:31 +0000
committerCarl Hetherington <carl@carlh.net>2010-08-09 16:40:31 +0000
commit5b520324ceab2559723b4ef5127301fa61ff4846 (patch)
tree13850a356fabdcbd55ca527fc5faf2fda63cb209 /libs/surfaces
parentaa9fd3334976ceae7e164c3fabc87e55fc921dff (diff)
Allow markers to be glued to bar/beat time. Fixes #1815.
git-svn-id: svn://localhost/ardour2/branches/3.0@7573 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/control_protocol/basic_ui.cc2
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 2c3305e66f..2bea3b529c 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -95,7 +95,7 @@ void
BasicUI::add_marker ()
{
nframes_t when = session->audible_frame();
- session->locations()->add (new Location (when, when, _("unnamed"), Location::IsMark));
+ session->locations()->add (new Location (*session, when, when, _("unnamed"), Location::IsMark));
}
void
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index e9f3223796..72827e9fc9 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1601,7 +1601,7 @@ MackieControlProtocol::marker_press (Button &)
string markername;
nframes_t where = session->audible_frame();
session->locations()->next_available_name(markername,"mcu");
- Location *location = new Location (where, where, markername, Location::IsMark);
+ 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);