allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

implement remover_marker, jump_by_bars, and jump_by_seconds

Browse Source
This commit is contained in:
Ben Loftis
2016-01-15 16:40:46 -06:00
committed by Robin Gareus
parent 5a55ac582d
commit f0d9295dd6
4 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libs/surfaces/control_protocol/basic_ui.cc
View File

@@ -23,6 +23,7 @@
#include "ardour/session.h"
#include "ardour/location.h"
#include "ardour/tempo.h"
#include "control_protocol/basic_ui.h"
@@ -124,6 +125,34 @@ BasicUI::add_marker (const std::string& markername)
session->commit_reversible_command ();
}
void
BasicUI::remove_marker_at_playhead ()
{
if (session) {
//set up for undo
XMLNode &before = session->locations()->get_state();
bool removed = false;
//find location(s) at this time
Locations::LocationList locs;
session->locations()->find_all_between (session->audible_frame(), session->audible_frame()+1, locs, Location::Flags(0));
for (Locations::LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
if ((*i)->is_mark()) {
session->locations()->remove (*i);
removed = true;
}
}
//store undo
if (removed) {
session->begin_reversible_command (_("remove marker"));
XMLNode &after = session->locations()->get_state();
session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
session->commit_reversible_command ();
}
}
}
void
BasicUI::rewind ()
{
@@ -286,6 +315,36 @@ BasicUI::locate (framepos_t where, bool roll_after_locate)
session->request_locate (where, roll_after_locate);
}
void
BasicUI::jump_by_seconds (double secs)
{
framepos_t current = session->transport_frame();
double s = (double) current / (double) session->nominal_frame_rate();
s+= secs;
if (s < 0) current = 0;
s = s * session->nominal_frame_rate();
session->request_locate ( floor(s) );
}
void
BasicUI::jump_by_bars (double bars)
{
Timecode::BBT_Time bbt;
TempoMap& tmap (session->tempo_map());
tmap.bbt_time (session->transport_frame(), bbt);
bars += bbt.bars;
if (bars < 0) bars = 0;
AnyTime any;
any.type = AnyTime::BBT;
any.bbt.bars = bars;
session->request_locate ( session->convert_to_frames (any) );
}
bool
BasicUI::locating ()
{