*/
#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
#include "ardour/session.h"
#include "ardour/location.h"
#include "i18n.h"
using namespace ARDOUR;
-using ARDOUR::nframes_t;
PBD::Signal2<void,std::string,std::string> BasicUI::AccessAction;
}
void
-BasicUI::add_marker ()
+BasicUI::add_marker (const std::string& markername)
{
- nframes_t when = session->audible_frame();
- session->locations()->add (new Location (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);
+ 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
}
}
-nframes_t
+framepos_t
BasicUI::transport_frame ()
{
return session->transport_frame();
}
void
-BasicUI::locate (nframes_t where, bool roll_after_locate)
+BasicUI::locate (framepos_t where, bool roll_after_locate)
{
session->request_locate (where, roll_after_locate);
}
return session->transport_locked ();
}
-nframes_t
+ARDOUR::framecnt_t
BasicUI::timecode_frames_per_hour ()
{
return session->timecode_frames_per_hour ();
}
void
-BasicUI::timecode_time (nframes_t where, Timecode::Time& timecode)
+BasicUI::timecode_time (framepos_t where, Timecode::Time& timecode)
{
session->timecode_time (where, *((Timecode::Time *) &timecode));
}
void
-BasicUI::timecode_to_sample (Timecode::Time& timecode, nframes_t& sample, bool use_offset, bool use_subframes) const
+BasicUI::timecode_to_sample (Timecode::Time& timecode, framepos_t & sample, bool use_offset, bool use_subframes) const
{
session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_offset, use_subframes);
}
void
-BasicUI::sample_to_timecode (nframes_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const
+BasicUI::sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const
{
session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_offset, use_subframes);
}