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;
}
}
* 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::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
+Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
{
- string markername, markerprefix;
+ string markername;
int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
- if (is_xrun) {
- markerprefix = "xrun";
- flags = Location::IsMark;
- } else {
- markerprefix = "mark";
- }
-
if (_session) {
- _session->locations()->next_available_name(markername, markerprefix);
- if (!is_xrun && !choose_new_marker_name(markername)) {
+ _session->locations()->next_available_name(markername, _("mark"));
+ if (!choose_new_marker_name(markername)) {
return;
}
Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
}
}
+void
+Editor::mouse_add_new_loop (framepos_t where)
+{
+ if (!_session) {
+ return;
+ }
+
+ /* Make this marker 1/8th of the visible area of the session so that
+ it's reasonably easy to manipulate after creation.
+ */
+
+ framepos_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)
+{
+ if (!_session) {
+ return;
+ }
+
+ /* Make this marker 1/8th of the visible area of the session so that
+ it's reasonably easy to manipulate after creation.
+ */
+
+ framepos_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)
{
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*/
}
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;
}
}
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());
+ build_range_marker_menu (loc == transport_loop_location(), loc == transport_punch_location(), loc->is_session_range());
}
marker_menu_item = item;
} else if (loc->is_range_marker()) {
if (range_marker_menu == 0) {
- build_range_marker_menu (false, false);
+ build_range_marker_menu (false, false, false);
}
marker_menu_item = item;
range_marker_menu->popup (1, ev->time);
}
void
-Editor::build_range_marker_menu (bool loop_or_punch, bool session)
+Editor::build_range_marker_menu (bool loop, bool 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 | punch | session;
Menu *markerMenu = new Menu;
if (loop_or_punch_or_session) {
items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
- items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+
+ if (!loop) {
+ items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+ } else {
+ items.push_back (MenuElem (_("Setup Loop Record"), sigc::mem_fun(*this, &Editor::setup_loop_record)));
+ }
items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
if (!Profile->get_sae()) {
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_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*/
}
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*/
}
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*/
}
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*/
}
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*/
}
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*/
}
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*/
}
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;
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_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;
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*/
}
}
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