X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=4b0ba07b77aeadd4b0b749fe4cd4f71f1bca2ba9;hb=a606a83d2ec43d9fbf9b65969afb3b3c46c546fa;hp=238a45c4d13b05d253e37c04186d11f2ccd82090;hpb=57bafcd1f4277ba9805bfb4ed05b8eaffaa7a5ce;p=ardour.git

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 238a45c4d1..4b0ba07b77 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <sigc++/retype.h>
@@ -24,8 +23,10 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/window_title.h>
 
 #include <ardour/location.h>
+#include <ardour/profile.h>
 #include <pbd/memento_command.h>
 
 #include "editor.h"
@@ -44,6 +45,7 @@ using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 
 void
 Editor::clear_marker_display ()
@@ -76,9 +78,15 @@ Editor::add_new_location (Location *location)
 	}
 
 	if (location->is_mark()) {
-		lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
-		lam->end   = 0;
 
+		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());
+		}
+		else {
+			lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+		}
+		lam->end   = 0;
+			
 	} else if (location->is_auto_loop()) {
 		// transport marker
 		lam->start = new Marker (*this, *transport_marker_group, color, 
@@ -94,12 +102,20 @@ Editor::add_new_location (Location *location)
 					 location->name(), Marker::PunchOut, location->end());
 		
 	} else {
-
 		// range marker
-		lam->start = new Marker (*this, *range_marker_group, color, 
-					 location->name(), Marker::Start, location->start());
-		lam->end   = new Marker (*this, *range_marker_group, color, 
-					 location->name(), Marker::End, location->end());
+		if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
+			lam->start = new Marker (*this, *cd_marker_group, color, 
+						 location->name(), Marker::Start, location->start());
+			lam->end   = new Marker (*this, *cd_marker_group, color, 
+						 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, 
+						 location->name(), Marker::End, location->end());
+		}
 	}
 
 	if (location->is_hidden ()) {
@@ -120,6 +136,11 @@ Editor::add_new_location (Location *location)
 	newpair.second = lam;
 
 	location_markers.insert (newpair);
+
+	if (select_new_marker && location->is_mark()) {
+		selection->set (lam->start);
+		select_new_marker = false;
+	}
 }
 
 void
@@ -156,6 +177,9 @@ Editor::location_flags_changed (Location *location, void *src)
 		return;
 	}
 
+	// move cd markers to/from cd marker bar as appropriate
+	ensure_cd_marker_updated (lam, location);
+
 	if (location->is_cd_marker()) {
 		lam->set_color_rgba (location_cd_marker_color);
 	} else if (location->is_mark()) {
@@ -175,6 +199,52 @@ Editor::location_flags_changed (Location *location, void *src)
 	}
 }
 
+void Editor::update_cd_marker_display ()
+{
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		LocationMarkers * lam = i->second;
+		Location * location = i->first;
+
+		ensure_cd_marker_updated (lam, location);
+	}
+}
+
+void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * location)
+{
+	if (location->is_cd_marker()
+	    && (ruler_cd_marker_action->get_active() &&  lam->start->get_parent() != cd_marker_group))
+	{
+		//cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl;
+		if (lam->start) {
+			lam->start->reparent (*cd_marker_group);
+		}
+		if (lam->end) {
+			lam->end->reparent (*cd_marker_group);
+		}
+	}
+	else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active()) 
+		  && (lam->start->get_parent() == cd_marker_group))  
+	{
+		//cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl;
+		if (location->is_mark()) {
+			if (lam->start) {
+				lam->start->reparent (*marker_group);
+			}
+			if (lam->end) {
+				lam->end->reparent (*marker_group);
+			}
+		}
+		else {
+			if (lam->start) {
+				lam->start->reparent (*range_marker_group);
+			}
+			if (lam->end) {
+				lam->end->reparent (*range_marker_group);
+			}
+		}
+	}
+}
+
 Editor::LocationMarkers::~LocationMarkers ()
 {
 	if (start) {
@@ -187,9 +257,9 @@ Editor::LocationMarkers::~LocationMarkers ()
 }
 
 Editor::LocationMarkers *
-Editor::find_location_markers (Location *location)
+Editor::find_location_markers (Location *location) const
 {
-	LocationMarkerMap::iterator i;
+	LocationMarkerMap::const_iterator i;
 
 	for (i = location_markers.begin(); i != location_markers.end(); ++i) {
 		if ((*i).first == location) {
@@ -201,9 +271,9 @@ Editor::find_location_markers (Location *location)
 }
 
 Location *
-Editor::find_location_from_marker (Marker *marker, bool& is_start)
+Editor::find_location_from_marker (Marker *marker, bool& is_start) const
 {
-	LocationMarkerMap::iterator i;
+	LocationMarkerMap::const_iterator i;
 
 	for (i = location_markers.begin(); i != location_markers.end(); ++i) {
 		LocationMarkers *lm = (*i).second;
@@ -222,11 +292,43 @@ Editor::find_location_from_marker (Marker *marker, bool& is_start)
 void
 Editor::refresh_location_display_internal (Locations::LocationList& locations)
 {
-	clear_marker_display ();
+	/* invalidate all */
+
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		i->second->valid = false;
+	}
 	
+	/* add new ones */
+
 	for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
+
+		LocationMarkerMap::iterator x;
+
+		if ((x = location_markers.find (*i)) != location_markers.end()) {
+			x->second->valid = true;
+			continue;
+		}
+
 		add_new_location (*i);
 	}
+
+	/* remove dead ones */
+
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ) {
+
+		LocationMarkerMap::iterator tmp;
+
+		tmp = i;
+		++tmp;
+
+		if (!i->second->valid) {
+			delete i->second;
+			location_markers.erase (i);
+		} 
+
+		i = tmp;
+	}
+	
 }
 
 void
@@ -286,18 +388,35 @@ Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
 }
 
 void
-Editor::mouse_add_new_marker (nframes_t where)
+Editor::mouse_add_new_marker (nframes_t where, bool is_cd, bool is_xrun)
 {
-	string markername;
+	string markername, markerprefix;
+	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,"mark");
-		Location *location = new Location (where, where, markername, Location::IsMark);
+		session->locations()->next_available_name(markername, markerprefix);
+		Location *location = new Location (where, where, markername, (Location::Flags) flags);
 		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 ();
+
+		/* find the marker we just added */
+
+		LocationMarkers *lam = find_location_markers (location);
+		if (lam) {
+			/* make it the selected marker */
+			selection->set (lam->start);
+		}
 	}
 }
 
@@ -312,6 +431,10 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
 		/*NOTREACHED*/
 	}
 
+	if (entered_marker == marker) {
+		entered_marker = NULL;
+	}
+
 	Location* loc = find_location_from_marker (marker, is_start);
 
 	if (session && loc) {
@@ -463,17 +586,21 @@ Editor::build_marker_menu (bool start_or_end)
 	MenuList& items = markerMenu->items();
 	markerMenu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Locate to Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
-	items.push_back (MenuElem (_("Play from Mark"), mem_fun(*this, &Editor::marker_menu_play_from)));
-	items.push_back (MenuElem (_("Set Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+	items.push_back (MenuElem (_("Locate to here"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
+	items.push_back (MenuElem (_("Play from here"), mem_fun(*this, &Editor::marker_menu_play_from)));
+	items.push_back (MenuElem (_("Move Mark to Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (MenuElem (_("Hide Mark"), mem_fun(*this, &Editor::marker_menu_hide)));
+	items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
 	if (start_or_end) return;
-	items.push_back (MenuElem (_("Rename Mark"), mem_fun(*this, &Editor::marker_menu_rename)));
-	items.push_back (MenuElem (_("Remove Mark"), mem_fun(*this, &Editor::marker_menu_remove)));
+	items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename)));
+	items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
+	items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
 
+	items.push_back (SeparatorElem());
+
+	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
 }
 
 void
@@ -490,19 +617,21 @@ Editor::build_range_marker_menu (bool loop_or_punch)
 	MenuList& items = markerMenu->items();
 	markerMenu->set_name ("ArdourContextMenu");
 
+	items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::marker_menu_play_range)));
 	items.push_back (MenuElem (_("Locate to Range Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
 	items.push_back (MenuElem (_("Play from Range Mark"), mem_fun(*this, &Editor::marker_menu_play_from)));
 	if (! loop_or_punch) {
-		items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::marker_menu_play_range)));
 		items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range)));
 	}
 	items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
-	items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+	if (!Profile->get_sae()) {
+		items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+	}
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
 	if (! loop_or_punch) {
+		items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
 		items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename)));
 		items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove)));
 	}
@@ -511,7 +640,9 @@ Editor::build_range_marker_menu (bool loop_or_punch)
 
 	items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
 	items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
-
+	if (!Profile->get_sae()) {
+		items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range)));
+	}
 }
 
 void
@@ -560,6 +691,24 @@ Editor::marker_menu_hide ()
 	}
 }
 
+void
+Editor::marker_menu_select_using_range ()
+{
+	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* l;
+	bool is_start;
+
+	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
+	        set_selection_from_range (*l);
+	}
+}
+
 void
 Editor::marker_menu_select_all_selectables_using_range ()
 {
@@ -574,7 +723,7 @@ Editor::marker_menu_select_all_selectables_using_range ()
 	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, Selection::Set);
+	        select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set);
 	}
 	  
 }
@@ -672,13 +821,13 @@ Editor::marker_menu_set_from_playhead ()
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			l->set_start (session->transport_frame ());
+			l->set_start (session->audible_frame ());
 		}
 		else {
 			if (is_start) {
-				l->set_start (session->transport_frame ());
+				l->set_start (session->audible_frame ());
 			} else {
-				l->set_end (session->transport_frame ());
+				l->set_end (session->audible_frame ());
 			}
 		}
 	}
@@ -817,6 +966,31 @@ Editor::marker_menu_remove ()
 	}
 }
 
+void
+Editor::marker_menu_lock (bool yn)
+{
+
+	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 (yn) {
+		loc->lock();
+	} else {
+		loc->unlock ();
+	}
+}
+
 void
 Editor::marker_menu_rename ()
 {
@@ -838,13 +1012,16 @@ Editor::marker_menu_rename ()
 	string txt;
 
 	dialog.set_prompt (_("New Name:"));
-	
+
+	WindowTitle title(Glib::get_application_name());
 	if (loc->is_mark()) {
-		dialog.set_title (_("ardour: rename mark"));
+		title += _("Rename Mark");
 	} else {
-		dialog.set_title (_("ardour: rename range"));
+		title += _("Rename Range");
 	}
 
+	dialog.set_title(title.get_string());
+
 	dialog.set_name ("MarkRenameWindow");
 	dialog.set_size_request (250, -1);
 	dialog.set_position (Gtk::WIN_POS_MOUSE);
@@ -886,56 +1063,13 @@ Editor::new_transport_marker_menu_popdown (GdkEventAny *ev)
 void
 Editor::new_transport_marker_menu_set_loop ()
 {
-	if (!session) return;
-	
-	begin_reversible_command (_("set loop range"));
-	
-	Location* tll;
-
-	if ((tll = transport_loop_location()) == 0) {
-		Location* loc = new Location (temp_location->start(), temp_location->end(), _("Loop"),  Location::IsAutoLoop);
-                XMLNode &before = session->locations()->get_state();
-		session->locations()->add (loc, true);
-		session->set_auto_loop_location (loc);
-                XMLNode &after = session->locations()->get_state();
-		session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
-	}
-	else {
-                XMLNode &before = tll->get_state();
-		tll->set_hidden (false, this);
-		tll->set (temp_location->start(), temp_location->end());
-                XMLNode &after = tll->get_state();
-                session->add_command (new MementoCommand<Location>(*tll, &before, &after));
-	}
-	
-	commit_reversible_command ();
+	set_loop_range (temp_location->start(), temp_location->end(), _("set loop range"));
 }
 
 void
 Editor::new_transport_marker_menu_set_punch ()
 {
-	if (!session) return;
-	
-	begin_reversible_command (_("set punch range"));
-	
-	Location* tpl;
-
-	if ((tpl = transport_punch_location()) == 0) {
-		tpl = new Location (temp_location->start(), temp_location->end(), _("Punch"), Location::IsAutoPunch);
-                XMLNode &before = session->locations()->get_state();
-		session->locations()->add (tpl, true);
-		session->set_auto_punch_location (tpl);
-                XMLNode &after = session->locations()->get_state();
-		session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
-	} else {
-                XMLNode &before = tpl->get_state();
-		tpl->set_hidden(false, this);
-		tpl->set(temp_location->start(), temp_location->end());
-                XMLNode &after = tpl->get_state();
-                session->add_command (new MementoCommand<Location>(*tpl, &before, &after));
-	}
-	
-	commit_reversible_command ();
+	set_punch_range (temp_location->start(), temp_location->end(), _("set punch range"));
 }
 
 void
@@ -958,8 +1092,8 @@ Editor::update_loop_range_view (bool visibility)
 		if (visibility) {
 			transport_loop_range_rect->show();
 		}
-	}
-	else if (visibility) {
+
+	} else if (visibility) {
 		transport_loop_range_rect->hide();
 	}
 }
@@ -978,9 +1112,15 @@ Editor::update_punch_range_view (bool visibility)
 		double x1 = frame_to_pixel (tpl->start());
 		double x2 = frame_to_pixel (tpl->end());
 		
+		guint track_canvas_width,track_canvas_height;
+		track_canvas->get_size(track_canvas_width,track_canvas_height);
+		
 		transport_punch_range_rect->property_x1() = x1;
 		transport_punch_range_rect->property_x2() = x2;
 		
+		transport_punch_range_rect->property_x1() = (Config->get_punch_in() ? x1 : 0);
+		transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? x2 : track_canvas_width);
+		
 		if (visibility) {
 		        transport_punch_range_rect->show();
 		}
@@ -1014,3 +1154,82 @@ Editor::update_punch_range_view (bool visibility)
 // 		gnome_canvas_item_hide (transport_punchout_line);
 // 	}
 }
+
+void
+Editor::marker_selection_changed ()
+{
+	if (session && session->deletion_in_progress()) {
+		return;
+	}
+
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		LocationMarkers* lam = i->second;
+
+		if (lam->start) {
+			lam->start->hide_line();
+		} 
+
+		if (lam->end) {
+			lam->end->hide_line();
+		}
+	}
+
+	edit_point_clock_connection_a.disconnect();
+	edit_point_clock_connection_b.disconnect();
+
+	if (selection->markers.empty()) {
+		edit_point_clock.set (0);
+		return;
+	}
+
+	for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
+		(*x)->add_line (cursor_group, vertical_adjustment.get_value(), canvas_height);
+		(*x)->show_line ();
+	}
+
+	edit_point_clock.set (selection->markers.front()->position());
+
+	bool ignored;
+	Location* loc = find_location_from_marker (selection->markers.front(), ignored);
+
+	if (loc) {
+		edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
+		edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
+	}
+}
+
+void
+Editor::selected_marker_moved (Location* loc)
+{
+	edit_point_clock.set (loc->start());
+}
+
+struct SortLocationsByPosition { 
+    bool operator() (Location* a, Location* b) {
+	    return a->start() < b->start();
+    }
+};
+
+void
+Editor::goto_nth_marker (int n)
+{
+	if (!session) {
+		return;
+	}
+	const Locations::LocationList& l (session->locations()->list());
+	Locations::LocationList ordered;
+	ordered = l;
+
+	SortLocationsByPosition cmp;
+	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 (n == 0) {
+				session->request_locate ((*i)->start(), session->transport_rolling());
+				break;
+			}
+			--n;
+		}
+	}
+}