lam->end = new Marker (*this, *transport_marker_group, color,
location->name(), Marker::PunchOut, location->end());
+ } else if (location->is_session_range()) {
+ // session range
+ lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::Start, location->start());
+ lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::End, location->end());
+
} else {
// range marker
if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
location->name(), Marker::End, location->end());
}
else {
-
lam->start = new Marker (*this, *range_marker_group, color,
location->name(), Marker::Start, location->start());
lam->end = new Marker (*this, *range_marker_group, color,
lam->show ();
}
- location->start_changed.connect (*this, ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->end_changed.connect (*this, ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->changed.connect (*this, ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->name_changed.connect (*this, ui_bind (&Editor::location_changed, this, _1), gui_context());
- location->FlagsChanged.connect (*this, ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
+ location->start_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+ location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+ location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+ location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+ location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
pair<Location*,LocationMarkers*> newpair;
return;
}
- lam->set_name (location->name());
+ lam->set_name (location->name ());
lam->set_position (location->start(), location->end());
if (location->is_auto_loop()) {
void
Editor::LocationMarkers::set_name (const string& str)
{
- start->set_name (str);
- if (end) { end->set_name (str); }
+ /* XXX: hack: don't change names of session start/end markers */
+
+ if (start->type() != Marker::Start) {
+ start->set_name (str);
+ }
+
+ if (end && end->type() != Marker::End) {
+ end->set_name (str);
+ }
}
void
if (!is_xrun && !choose_new_marker_name(markername)) {
return;
}
- Location *location = new Location (where, where, markername, (Location::Flags) flags);
+ Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
_session->begin_reversible_command (_("add marker"));
XMLNode &before = _session->locations()->get_state();
_session->locations()->add (location, true);
}
void
-Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
{
- if (tm_marker_menu == 0) {
- build_tm_marker_menu ();
- }
-
marker_menu_item = item;
- tm_marker_menu->popup (1, ev->time);
+
+ MeterMarker* mm;
+ TempoMarker* tm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+ bool can_remove = false;
+
+ if (mm) {
+ can_remove = mm->meter().movable ();
+ } else if (tm) {
+ can_remove = tm->tempo().movable ();
+ } 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
} else {
if (loc->is_mark()) {
- bool start_or_end = loc->is_start() || loc->is_end();
Menu *markerMenu;
- if (start_or_end) {
- if (start_end_marker_menu == 0)
- build_marker_menu (true);
- markerMenu = start_end_marker_menu;
+ if (loc->is_session_range ()) {
+ delete session_range_marker_menu;
+ build_marker_menu (true, loc);
+ markerMenu = session_range_marker_menu;
} else {
- if (marker_menu == 0)
- build_marker_menu (false);
+ delete marker_menu;
+ build_marker_menu (false, loc);
markerMenu = marker_menu;
}
}
void
-Editor::build_marker_menu (bool start_or_end)
+Editor::build_marker_menu (bool session_range, Location* loc)
{
using namespace Menu_Helpers;
Menu *markerMenu = new Menu;
- if (start_or_end) {
- start_end_marker_menu = markerMenu;
+ if (session_range) {
+ session_range_marker_menu = markerMenu;
} else {
marker_menu = markerMenu;
}
MenuList& items = markerMenu->items();
markerMenu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Locate to here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
- items.push_back (MenuElem (_("Play from here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+ items.push_back (MenuElem (_("Locate to Here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+ items.push_back (MenuElem (_("Play from Here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
items.push_back (MenuElem (_("Move Mark to Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Create range to next marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
+ items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
- if (start_or_end) return;
+ if (session_range) {
+ return;
+ }
items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
- items.push_back (MenuElem (_("Lock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), true)));
- items.push_back (MenuElem (_("Unlock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), false)));
+ items.push_back (CheckMenuElem (_("Lock")));
+ CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back());
+ if (loc->locked ()) {
+ lock_item->set_active ();
+ }
+ lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock));
+
+ items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
+ CheckMenuItem* glue_item = static_cast<CheckMenuItem*> (&items.back());
+ if (loc->position_lock_style() == MusicTime) {
+ glue_item->set_active ();
+ }
+ glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
+
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
}
void
-Editor::build_tm_marker_menu ()
+Editor::build_tempo_or_meter_marker_menu (bool can_remove)
{
using namespace Menu_Helpers;
- tm_marker_menu = new Menu;
- MenuList& items = tm_marker_menu->items();
- tm_marker_menu->set_name ("ArdourContextMenu");
+ tempo_or_meter_marker_menu = new Menu;
+ MenuList& items = tempo_or_meter_marker_menu->items();
+ tempo_or_meter_marker_menu->set_name ("ArdourContextMenu");
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
string range_name = l->name();
range_name += "-range";
- Location* newrange = new Location (marker->position(), end, range_name, Location::IsRangeMarker);
+ Location* newrange = new Location (*_session, marker->position(), end, range_name, Location::IsRangeMarker);
_session->locations()->add (newrange);
}
}
}
void
-Editor::marker_menu_edit ()
+Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const
{
- MeterMarker* mm;
- TempoMarker* tm;
- Marker* marker;
-
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ Marker* marker = reinterpret_cast<Marker*> (p);
+ if (!marker) {
fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
/*NOTREACHED*/
}
- if ((mm = dynamic_cast<MeterMarker*> (marker)) != 0) {
+ *m = dynamic_cast<MeterMarker*> (marker);
+ *t = dynamic_cast<TempoMarker*> (marker);
+}
+
+void
+Editor::marker_menu_edit ()
+{
+ MeterMarker* mm;
+ TempoMarker* tm;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+ if (mm) {
edit_meter_section (&mm->meter());
- } else if ((tm = dynamic_cast<TempoMarker*> (marker)) != 0) {
+ } else if (tm) {
edit_tempo_section (&tm->tempo());
- } else {
- fatal << X_("programming erorr: unhandled marker type in Editor::marker_menu_edit")
- << endmsg;
- /*NOTREACHED*/
}
}
{
MeterMarker* mm;
TempoMarker* tm;
- Marker* marker;
+ dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
- if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
- fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
- /*NOTREACHED*/
- }
-
- if ((mm = dynamic_cast<MeterMarker*> (marker)) != 0) {
+ if (mm) {
remove_meter_marker (marker_menu_item);
- } else if ((tm = dynamic_cast<TempoMarker*> (marker)) != 0) {
+ } else if (tm) {
remove_tempo_marker (marker_menu_item);
} else {
remove_marker (*marker_menu_item, (GdkEvent*) 0);
}
void
-Editor::marker_menu_lock (bool yn)
+Editor::toggle_marker_menu_lock ()
{
-
Marker* marker;
if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
loc = find_location_from_marker (marker, ignored);
- if (!loc) return;
+ if (!loc) {
+ return;
+ }
- if (yn) {
- loc->lock();
- } else {
+ if (loc->locked()) {
loc->unlock ();
+ } else {
+ loc->lock ();
}
}
// hide rects
transport_bar_drag_rect->hide();
- _drags->break_drag ();
+ _drags->abort ();
}
void
ordered.sort (cmp);
for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
- if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_start()) {
+ if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) {
if (n == 0) {
_session->request_locate ((*i)->start(), _session->transport_rolling());
break;
}
}
}
+
+void
+Editor::toggle_marker_menu_glue ()
+{
+ Marker* marker;
+
+ if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+ fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
+ /*NOTREACHED*/
+ }
+
+ Location* loc;
+ bool ignored;
+
+ loc = find_location_from_marker (marker, ignored);
+
+ if (!loc) {
+ return;
+ }
+
+ if (loc->position_lock_style() == MusicTime) {
+ loc->set_position_lock_style (AudioTime);
+ } else {
+ loc->set_position_lock_style (MusicTime);
+ }
+
+}
projects / ardour.git / blobdiff