lots of small fixes related to the rythmic rodent

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2967 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 7 insertions, 10 deletions

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 28c9acb6f2..332efc3271 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -4,7 +4,7 @@ cd `dirname "$0"`/..
 
 export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:.
 export GTK_PATH=libs/clearlooks
-
+export VAMP_PATH=libs/vamp-sdk:$VAMP_PATH
 
 export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH
 
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 09d07494dd..87e300de0b 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -303,6 +303,7 @@
                <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
+               <menuitem action='toggle-rhythm-ferret'/>
    	       <separator/>
         </menu>
         <menu name='Options' action='Options'>
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index ae1b93e919..09414c66ef 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -364,7 +364,9 @@ Editor::register_actions ()
 	act = ActionManager::register_action (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range=Bar"), mem_fun(*this, &Editor::use_range_as_bar));
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (editor_actions, "split-region-at-transients", _("Other Temporary Label"), mem_fun(*this, &Editor::split_region_at_transients));
+	act = ActionManager::register_action (editor_actions, "split-region-at-transients", _("Split Regions At Percussion Onsets"), mem_fun(*this, &Editor::split_region_at_transients));
+	ActionManager::session_sensitive_actions.push_back (act);
+	act = ActionManager::register_action (editor_actions, "toggle-rhythm-ferret", _("Rhythm Ferret"), mem_fun(*this, &Editor::show_rhythm_ferret));
 	ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_action (editor_actions, "crop", _("Crop"), mem_fun(*this, &Editor::crop_region_to_selection));
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 0e725aeda2..6485ce356e 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -5031,12 +5031,8 @@ Editor::split_region_at_transients ()
 		return;
 	}
 
-	show_rhythm_ferret ();
-	return;
 #if 0
 
-	cerr << "selection size is " << selection->regions.size() << endl;
-
 	for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ) {
 
 		RegionSelection::iterator tmp;
@@ -5089,8 +5085,6 @@ Editor::split_region_at_transients ()
 
 		transients.clear ();
 
-		cerr << "done with that one\n";
-
 		i = tmp;
 	}
 #endif
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index c6dc773dd8..96db5b3ada 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1122,8 +1122,8 @@ TimeAxisView::show_temporary_lines (const vector<nframes64_t>& pos)
 	list<ArdourCanvas::SimpleLine*>::iterator l;
 
 	for (i = pos.begin(), l = temp_lines.begin(); i != pos.end() && l != temp_lines.end(); ++i, ++l) {
-		(*l)->property_x1() = editor.frame_to_pixel ((double) *i);
-		(*l)->property_x2() = editor.frame_to_pixel ((double) *i);
+		(*l)->property_x1() = editor.frame_to_pixel (*i);
+		(*l)->property_x2() = editor.frame_to_pixel (*i);
 	}
 }