#include "canvas/item.h"
#include "canvas/rectangle.h"
+#include "widgets/prompter.h"
+
#include "editor.h"
#include "marker.h"
#include "selection.h"
#include "editing.h"
#include "gui_thread.h"
#include "actions.h"
-#include "prompter.h"
#include "editor_drag.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
/* Do a full update of the markers in this group */
update_marker_labels (group);
-
+
if (location->is_auto_punch()) {
update_punch_range_view ();
}
if (location->is_mark()) {
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
- lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start());
+ lam->start = new ArdourMarker (*this, *cd_marker_group, color, location->name(), ArdourMarker::Mark, location->start());
group = cd_marker_group;
} else {
- lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+ lam->start = new ArdourMarker (*this, *marker_group, color, location->name(), ArdourMarker::Mark, location->start());
group = marker_group;
}
} else if (location->is_auto_loop()) {
// transport marker
- lam->start = new Marker (*this, *transport_marker_group, color,
- location->name(), Marker::LoopStart, location->start());
- lam->end = new Marker (*this, *transport_marker_group, color,
- location->name(), Marker::LoopEnd, location->end());
+ lam->start = new ArdourMarker (*this, *transport_marker_group, color,
+ location->name(), ArdourMarker::LoopStart, location->start());
+ lam->end = new ArdourMarker (*this, *transport_marker_group, color,
+ location->name(), ArdourMarker::LoopEnd, location->end());
group = transport_marker_group;
} else if (location->is_auto_punch()) {
// transport marker
- lam->start = new Marker (*this, *transport_marker_group, color,
- location->name(), Marker::PunchIn, location->start());
- lam->end = new Marker (*this, *transport_marker_group, color,
- location->name(), Marker::PunchOut, location->end());
+ lam->start = new ArdourMarker (*this, *transport_marker_group, color,
+ location->name(), ArdourMarker::PunchIn, location->start());
+ lam->end = new ArdourMarker (*this, *transport_marker_group, color,
+ location->name(), ArdourMarker::PunchOut, location->end());
group = transport_marker_group;
} else if (location->is_session_range()) {
// session range
- lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start());
- lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end());
+ lam->start = new ArdourMarker (*this, *marker_group, color, _("start"), ArdourMarker::SessionStart, location->start());
+ lam->end = new ArdourMarker (*this, *marker_group, color, _("end"), ArdourMarker::SessionEnd, location->end());
group = marker_group;
} else {
// range marker
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
- lam->start = new Marker (*this, *cd_marker_group, color,
- location->name(), Marker::RangeStart, location->start());
- lam->end = new Marker (*this, *cd_marker_group, color,
- location->name(), Marker::RangeEnd, location->end());
+ lam->start = new ArdourMarker (*this, *cd_marker_group, color,
+ location->name(), ArdourMarker::RangeStart, location->start());
+ lam->end = new ArdourMarker (*this, *cd_marker_group, color,
+ location->name(), ArdourMarker::RangeEnd, location->end());
group = cd_marker_group;
} else {
- lam->start = new Marker (*this, *range_marker_group, color,
- location->name(), Marker::RangeStart, location->start());
- lam->end = new Marker (*this, *range_marker_group, color,
- location->name(), Marker::RangeEnd, location->end());
+ lam->start = new ArdourMarker (*this, *range_marker_group, color,
+ location->name(), ArdourMarker::RangeStart, location->start());
+ lam->end = new ArdourMarker (*this, *range_marker_group, color,
+ location->name(), ArdourMarker::RangeEnd, location->end());
group = range_marker_group;
}
}
}
location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+ location->position_lock_style_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, location), gui_context());
pair<Location*,LocationMarkers*> newpair;
return;
}
- lam->set_name (location->name ());
+ if (location->position_lock_style() == MusicTime) {
+ lam->set_name ("\u266B" + location->name ()); // BEAMED EIGHTH NOTES
+ } else {
+ lam->set_name (location->name ());
+ }
+
lam->set_position (location->start(), location->end());
if (location->is_auto_loop()) {
* lengthened)
*/
void
-Editor::check_marker_label (Marker* m)
+Editor::check_marker_label (ArdourMarker* m)
{
/* Get a time-ordered list of markers from the last time anything changed */
- std::list<Marker*>& sorted = _sorted_marker_lists[m->get_parent()];
+ std::list<ArdourMarker*>& sorted = _sorted_marker_lists[m->get_parent()];
- list<Marker*>::iterator i = find (sorted.begin(), sorted.end(), m);
+ list<ArdourMarker*>::iterator i = find (sorted.begin(), sorted.end(), m);
- list<Marker*>::iterator prev = sorted.end ();
- list<Marker*>::iterator next = i;
+ list<ArdourMarker*>::iterator prev = sorted.end ();
+ list<ArdourMarker*>::iterator next = i;
++next;
/* Look to see if the previous marker is still behind `m' in time */
}
struct MarkerComparator {
- bool operator() (Marker const * a, Marker const * b) {
+ bool operator() (ArdourMarker const * a, ArdourMarker const * b) {
return a->position() < b->position();
}
};
void
Editor::update_marker_labels ()
{
- for (std::map<ArdourCanvas::Container *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+ for (std::map<ArdourCanvas::Container *, std::list<ArdourMarker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
update_marker_labels (i->first);
}
}
void
Editor::update_marker_labels (ArdourCanvas::Container* group)
{
- list<Marker*>& sorted = _sorted_marker_lists[group];
+ list<ArdourMarker*>& sorted = _sorted_marker_lists[group];
if (sorted.empty()) {
return;
sorted.sort (MarkerComparator ());
- list<Marker*>::iterator i = sorted.begin ();
+ list<ArdourMarker*>::iterator i = sorted.begin ();
- list<Marker*>::iterator prev = sorted.end ();
- list<Marker*>::iterator next = i;
+ list<ArdourMarker*>::iterator prev = sorted.end ();
+ list<ArdourMarker*>::iterator next = i;
if (next != sorted.end()) {
++next;
}
Location *
-Editor::find_location_from_marker (Marker *marker, bool& is_start) const
+Editor::find_location_from_marker (ArdourMarker *marker, bool& is_start) const
{
LocationMarkerMap::const_iterator i;
{
/* XXX: hack: don't change names of session start/end markers */
- if (start->type() != Marker::SessionStart) {
+ if (start->type() != ArdourMarker::SessionStart) {
start->set_name (str);
}
- if (end && end->type() != Marker::SessionEnd) {
+ if (end && end->type() != ArdourMarker::SessionEnd) {
end->set_name (str);
}
}
void
-Editor::LocationMarkers::set_position (framepos_t startf,
- framepos_t endf)
+Editor::LocationMarkers::set_position (samplepos_t startf,
+ samplepos_t endf)
{
start->set_position (startf);
if (end) {
}
void
-Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
+Editor::mouse_add_new_marker (samplepos_t where, bool is_cd)
{
string markername;
int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
if (!choose_new_marker_name(markername)) {
return;
}
- Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
+ Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags, get_grid_music_divisions (0));
begin_reversible_command (_("add marker"));
XMLNode &before = _session->locations()->get_state();
}
void
-Editor::mouse_add_new_loop (framepos_t where)
+Editor::mouse_add_new_loop (samplepos_t where)
{
if (!_session) {
return;
it's reasonably easy to manipulate after creation.
*/
- framepos_t const end = where + current_page_samples() / 8;
+ samplepos_t const end = where + current_page_samples() / 8;
set_loop_range (where, end, _("set loop range"));
}
void
-Editor::mouse_add_new_punch (framepos_t where)
+Editor::mouse_add_new_punch (samplepos_t where)
{
if (!_session) {
return;
it's reasonably easy to manipulate after creation.
*/
- framepos_t const end = where + current_page_samples() / 8;
+ samplepos_t const end = where + current_page_samples() / 8;
set_punch_range (where, end, _("set punch range"));
}
void
-Editor::mouse_add_new_range (framepos_t where)
+Editor::mouse_add_new_range (samplepos_t where)
{
if (!_session) {
return;
it's reasonably easy to manipulate after creation.
*/
- framepos_t const end = where + current_page_samples() / 8;
+ samplepos_t const end = where + current_page_samples() / 8;
string name;
_session->locations()->next_available_name (name, _("range"));
void
Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
{
- Marker* marker;
+ ArdourMarker* marker;
bool is_start;
- if ((marker = static_cast<Marker*> (item.get_data ("marker"))) == 0) {
+ if ((marker = static_cast<ArdourMarker*> (item.get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
Location* loc = find_location_from_marker (marker, is_start);
if (_session && loc) {
- Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
+ Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
}
}
LocationMarkers* m = i->second;
location_markers.erase (i);
delete m;
+
+ /* Markers that visually overlap with this (removed) marker
+ * need to be re-displayed.
+ * But finding such cases is similarly expensive as simply
+ * re-displaying all.. so:
+ */
+ refresh_location_display ();
break;
}
}
bool can_remove = false;
if (mm) {
- can_remove = mm->meter().movable ();
+ can_remove = !mm->meter().initial ();
+ delete meter_marker_menu;
+ build_meter_marker_menu (mm, can_remove);
+ meter_marker_menu->popup (1, ev->time);
} else if (tm) {
- can_remove = tm->tempo().movable ();
+ if (!tm->tempo().active()) {
+ return;
+ }
+ can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter();
+ delete tempo_marker_menu;
+ build_tempo_marker_menu (tm, can_remove);
+ tempo_marker_menu->popup (1, ev->time);
} else {
return;
}
-
- delete tempo_or_meter_marker_menu;
- build_tempo_or_meter_marker_menu (can_remove);
- tempo_or_meter_marker_menu->popup (1, ev->time);
}
void
Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
{
- Marker * marker;
- if ((marker = reinterpret_cast<Marker *> (item->get_data("marker"))) == 0) {
+ ArdourMarker * marker;
+ if ((marker = reinterpret_cast<ArdourMarker *> (item->get_data("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
- if (transport_marker_menu == 0) {
- build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
- }
+ delete transport_marker_menu;
+ build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
marker_menu_item = item;
transport_marker_menu->popup (1, ev->time);
marker_menu->popup (1, ev->time);
} else if (loc->is_range_marker()) {
- if (range_marker_menu == 0) {
- build_range_marker_menu (false, false);
- }
+ delete range_marker_menu;
+ build_range_marker_menu (loc, false, false);
+
marker_menu_item = item;
range_marker_menu->popup (1, ev->time);
}
using namespace Menu_Helpers;
marker_menu = new Menu;
+
MenuList& items = marker_menu->items();
marker_menu->set_name ("ArdourContextMenu");
items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
+ items.push_back (MenuElem (_("Promote to Time Origin"), sigc::mem_fun(*this, &Editor::marker_menu_set_origin)));
items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
- if (loc->position_lock_style() == MusicTime) {
- glue_item->set_active ();
- }
+ glue_item->set_active (loc->position_lock_style() == MusicTime);
+
glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
items.push_back (SeparatorElem());
}
void
-Editor::build_range_marker_menu (bool loop_or_punch, bool session)
+Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session)
{
using namespace Menu_Helpers;
- bool const loop_or_punch_or_session = loop_or_punch | session;
+ bool const loop_or_punch_or_session = loop_or_punch || session;
+
+ Menu* markerMenu = new Menu;
- Menu *markerMenu = new Menu;
if (loop_or_punch_or_session) {
transport_marker_menu = markerMenu;
} else {
items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
- if (!Profile->get_sae()) {
- items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
- }
+ items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
+ items.push_back (SeparatorElem());
+ items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
+
+ Gtk::CheckMenuItem* glue_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
+ glue_item->set_active (loc->position_lock_style() == MusicTime);
+ glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
+
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Promote to Time Origin"), sigc::mem_fun(*this, &Editor::marker_menu_set_origin)));
if (!loop_or_punch_or_session) {
items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
items.push_back (MenuElem (_("Rename Range..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
if (!loop_or_punch_or_session || !session) {
items.push_back (SeparatorElem());
}
-
+
items.push_back (MenuElem (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
- if (!Profile->get_sae()) {
- items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range)));
+ items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range)));
+}
+
+void
+Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove)
+{
+ using namespace Menu_Helpers;
+
+ tempo_marker_menu = new Menu;
+
+ MenuList& items = tempo_marker_menu->items();
+ tempo_marker_menu->set_name ("ArdourContextMenu");
+
+ if (!loc->tempo().initial()) {
+ if (loc->tempo().clamped()) {
+ items.push_back (MenuElem (_("Don't Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+ } else {
+ items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+ }
}
+
+ if (loc->tempo().type() == TempoSection::Ramp) {
+ items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
+ }
+
+ TempoSection* next_ts = _session->tempo_map().next_tempo_section (&loc->tempo());
+ if (next_ts && next_ts->note_types_per_minute() != loc->tempo().end_note_types_per_minute()) {
+ items.push_back (MenuElem (_("Ramp to Next"), sigc::mem_fun(*this, &Editor::ramp_to_next_tempo)));
+ }
+
+ if (loc->tempo().position_lock_style() == AudioTime && can_remove) {
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
+ } else if (can_remove) {
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
+ }
+
+ items.push_back (SeparatorElem());
+
+ items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
+ items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
+ items.back().set_sensitive (can_remove);
}
void
-Editor::build_tempo_or_meter_marker_menu (bool can_remove)
+Editor::build_meter_marker_menu (MeterMarker* loc, bool can_remove)
{
using namespace Menu_Helpers;
- tempo_or_meter_marker_menu = new Menu;
- MenuList& items = tempo_or_meter_marker_menu->items();
- tempo_or_meter_marker_menu->set_name ("ArdourContextMenu");
+ meter_marker_menu = new Menu;
+
+ MenuList& items = meter_marker_menu->items();
+ meter_marker_menu->set_name ("ArdourContextMenu");
+
+ if (loc->meter().position_lock_style() == AudioTime && can_remove) {
+ items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
+ } else if (can_remove) {
+ items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
+ }
items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
using namespace Menu_Helpers;
new_transport_marker_menu = new Menu;
+
MenuList& items = new_transport_marker_menu->items();
new_transport_marker_menu->set_name ("ArdourContextMenu");
void
Editor::marker_menu_hide ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
}
}
+void
+Editor::marker_menu_set_origin ()
+{
+ ArdourMarker* marker;
+
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
+ abort(); /*NOTREACHED*/
+ }
+
+ Location* l;
+ bool is_start;
+
+ if ((l = find_location_from_marker (marker, is_start)) != 0) {
+ _session->locations()->set_clock_origin (l, this);
+ }
+}
+
void
Editor::marker_menu_select_using_range ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
bool is_start;
if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
- set_selection_from_range (*l);
+ set_selection_from_range (*l);
}
}
void
Editor::marker_menu_select_all_selectables_using_range ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
bool is_start;
if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
- select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set, false);
+ select_all_within (l->start(), l->end() - 1, 0, DBL_MAX, track_views, Selection::Set, false);
}
}
void
Editor::marker_menu_separate_regions_using_location ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
bool is_start;
if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
- separate_regions_using_location (*l);
+ separate_regions_using_location (*l);
}
}
void
Editor::marker_menu_play_from ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
void
Editor::marker_menu_set_playhead ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
void
Editor::marker_menu_range_to_next ()
{
- Marker* marker;
+ ArdourMarker* marker;
if (!_session) {
return;
}
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
return;
}
- framepos_t start;
- framepos_t end;
+ samplepos_t start;
+ samplepos_t end;
_session->locations()->marks_either_side (marker->position(), start, end);
- if (end != max_framepos) {
+ if (end != max_samplepos) {
string range_name = l->name();
range_name += "-range";
void
Editor::marker_menu_set_from_playhead ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
Location* l;
bool is_start;
+ const int32_t divisions = get_grid_music_divisions (0);
if ((l = find_location_from_marker (marker, is_start)) != 0) {
if (l->is_mark()) {
- l->set_start (_session->audible_frame ());
+ l->set_start (_session->audible_sample (), false, true, divisions);
}
else {
if (is_start) {
- l->set_start (_session->audible_frame ());
+ l->set_start (_session->audible_sample (), false, true, divisions);
} else {
- l->set_end (_session->audible_frame ());
+ l->set_end (_session->audible_sample (), false, true, divisions);
}
}
}
void
Editor::marker_menu_set_from_selection (bool /*force_regions*/)
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
// nothing for now
} else {
-
+
if (!selection->time.empty()) {
- l->set (selection->time.start(), selection->time.end_frame());
+ l->set (selection->time.start(), selection->time.end_sample());
} else if (!selection->regions.empty()) {
- l->set (selection->regions.start(), selection->regions.end_frame());
+ l->set (selection->regions.start(), selection->regions.end_sample());
}
}
}
void
Editor::marker_menu_play_range ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
void
Editor::marker_menu_loop_range ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
bool is_start;
if ((l = find_location_from_marker (marker, is_start)) != 0) {
- Location* l2;
- if ((l2 = transport_loop_location()) != 0) {
- l2->set (l->start(), l->end());
-
- // enable looping, reposition and start rolling
- _session->request_locate (l2->start(), true);
- _session->request_play_loop(true);
+ if (l != transport_loop_location()) {
+ set_loop_range (l->start(), l->end(), _("loop range from marker"));
}
+ _session->request_locate (l->start(), true);
+ _session->request_play_loop (true);
}
}
void
Editor::marker_menu_zoom_to_range ()
{
- Marker* marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"));
+ ArdourMarker* marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"));
assert (marker);
bool is_start;
return;
}
- framecnt_t const extra = l->length() * 0.05;
- framepos_t a = l->start ();
+ samplecnt_t const extra = l->length() * 0.05;
+ samplepos_t a = l->start ();
if (a >= extra) {
a -= extra;
}
-
- framepos_t b = l->end ();
- if (b < (max_framepos - extra)) {
+
+ samplepos_t b = l->end ();
+ if (b < (max_samplepos - extra)) {
b += extra;
}
- temporal_zoom_by_frame (a, b);
+ temporal_zoom_by_sample (a, b);
}
void
Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const
{
- Marker* marker = reinterpret_cast<Marker*> (p);
+ ArdourMarker* marker = reinterpret_cast<ArdourMarker*> (p);
if (!marker) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
}
+void
+Editor::toggle_marker_lock_style ()
+{
+ MeterMarker* mm;
+ TempoMarker* tm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+ if (mm) {
+ begin_reversible_command (_("change meter lock style"));
+ XMLNode &before = _session->tempo_map().get_state();
+ MeterSection* msp = &mm->meter();
+
+ const Meter meter (msp->divisions_per_bar(), msp->note_divisor());
+ const Timecode::BBT_Time bbt (msp->bbt());
+ const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+
+ _session->tempo_map().replace_meter (*msp, meter, bbt, msp->sample(), pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ } else if (tm) {
+ TempoSection* tsp = &tm->tempo();
+
+ const double pulse = tsp->pulse();
+ const samplepos_t sample = tsp->sample();
+ const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
+ const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
+
+ begin_reversible_command (_("change tempo lock style"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ _session->tempo_map().replace_tempo (*tsp, tempo, pulse, sample, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+}
+/* actally just resets the ts to constant using initial tempo */
+void
+Editor::toggle_tempo_type ()
+{
+ TempoMarker* tm;
+ MeterMarker* mm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+ if (tm) {
+ TempoSection* tsp = &tm->tempo();
+
+ const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type());
+ const double pulse = tsp->pulse();
+ const samplepos_t sample = tsp->sample();
+ const PositionLockStyle pls = tsp->position_lock_style();
+
+ begin_reversible_command (_("set tempo to constant"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ _session->tempo_map().replace_tempo (*tsp, tempo, pulse, sample, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+}
+/* clamped locks the previous section end tempo to the start tempo */
+void
+Editor::toggle_tempo_clamped ()
+{
+ TempoMarker* tm;
+ MeterMarker* mm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+ if (tm) {
+ begin_reversible_command (_("Clamp Tempo"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ TempoSection* tsp = &tm->tempo();
+ TempoSection* prev = _session->tempo_map().previous_tempo_section (tsp);
+
+ if (prev) {
+ /* set to the end tempo of the previous section */
+ Tempo new_tempo (prev->end_note_types_per_minute(), prev->note_type(), tsp->end_note_types_per_minute());
+ _session->tempo_map().gui_change_tempo (tsp, new_tempo);
+ }
+
+ tsp->set_clamped (!tsp->clamped());
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+}
+
+void
+Editor::ramp_to_next_tempo ()
+{
+ TempoMarker* tm;
+ MeterMarker* mm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+ if (tm) {
+ TempoMap& tmap (_session->tempo_map());
+ TempoSection* tsp = &tm->tempo();
+ TempoSection* next_ts = tmap.next_tempo_section (&tm->tempo());
+ if (next_ts) {
+ const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), next_ts->note_types_per_minute());
+ const double pulse = tsp->pulse();
+ const samplepos_t sample = tsp->sample();
+ const PositionLockStyle pls = tsp->position_lock_style();
+
+ begin_reversible_command (_("ramp to next tempo"));
+ XMLNode &before = _session->tempo_map().get_state();
+
+ tmap.replace_tempo (*tsp, tempo, pulse, sample, pls);
+
+ XMLNode &after = _session->tempo_map().get_state();
+ _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+ commit_reversible_command ();
+ }
+ }
+}
+
void
Editor::toggle_marker_menu_lock ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
void
Editor::marker_menu_rename ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
}
void
-Editor::rename_marker(Marker *marker)
+Editor::rename_marker(ArdourMarker *marker)
{
Location* loc;
bool is_start;
loc = find_location_from_marker (marker, is_start);
- if (!loc)
- return;
+ if (!loc) {
+ return;
+ }
- if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range())
+ if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) {
return;
+ }
- ArdourPrompter dialog (true);
+ ArdourWidgets::Prompter dialog (true);
string txt;
dialog.set_prompt (_("New Name:"));
transport_loop_range_rect->set_x1 (x2);
transport_loop_range_rect->show();
-
+
} else {
transport_loop_range_rect->hide();
}
double pixel_start;
double pixel_end;
-
+
if (_session->config.get_punch_in()) {
pixel_start = sample_to_pixel (tpl->start());
} else {
if (_session->config.get_punch_out()) {
pixel_end = sample_to_pixel (tpl->end());
} else {
- pixel_end = sample_to_pixel (max_framepos);
+ pixel_end = sample_to_pixel (max_samplepos);
}
-
+
transport_punch_range_rect->set_x0 (pixel_start);
- transport_punch_range_rect->set_x1 (pixel_end);
+ transport_punch_range_rect->set_x1 (pixel_end);
transport_punch_range_rect->show();
} else {
- transport_punch_range_rect->hide();
+ transport_punch_range_rect->hide();
}
}
}
struct SortLocationsByPosition {
- bool operator() (Location* a, Location* b) {
- return a->start() < b->start();
- }
+ bool operator() (Location* a, Location* b) {
+ return a->start() < b->start();
+ }
};
void
void
Editor::toggle_marker_menu_glue ()
{
- Marker* marker;
+ ArdourMarker* marker;
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
abort(); /*NOTREACHED*/
}
return;
}
+ begin_reversible_command (_("change marker lock style"));
+ XMLNode &before = _session->locations()->get_state();
+
if (loc->position_lock_style() == MusicTime) {
loc->set_position_lock_style (AudioTime);
} else {
loc->set_position_lock_style (MusicTime);
}
+ XMLNode &after = _session->locations()->get_state();
+ _session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+ commit_reversible_command ();
}
void
}
void
-Editor::remove_sorted_marker (Marker* m)
+Editor::remove_sorted_marker (ArdourMarker* m)
{
- for (std::map<ArdourCanvas::Container *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+ for (std::map<ArdourCanvas::Container *, std::list<ArdourMarker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
i->second.remove (m);
}
}
-Marker *
+ArdourMarker *
Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const
{
for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
projects / ardour.git / blobdiff