merge Sakari's (sbergen) branch back into 3.0, removing libsndfile and adding taglib

git-svn-id: svn://localhost/ardour2/branches/3.0@3736 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 1 insertions, 21 deletions

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 8d86a0fbb2..508d73a01a 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -636,7 +636,7 @@ Editor::build_range_marker_menu (bool loop_or_punch)
 	}
 
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::marker_menu_export_range)));
+	items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::export_range)));
 	items.push_back (SeparatorElem());
 
 	if (!loop_or_punch) {
@@ -815,26 +815,6 @@ Editor::marker_menu_set_playhead ()
 }
 
 void
-Editor::marker_menu_export_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) {
-		if (l->is_range_marker()) {
-			export_range (l->start(), l->end());
-		}
-	}
-}
-
-void
 Editor::marker_menu_range_to_next ()
 {
 	Marker* marker;