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

11 files changed, 29 insertions, 22 deletions

diff --git a/SConstruct b/SConstruct
index ffa61a0b5a..4f84f5384c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -799,10 +799,10 @@ prep_libcheck(env, env)
 
 libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
                                  LIBPATH='#libs/vamp-sdk',
-                                 CPPPATH='#libs/vamp-sdk/vamp')
+                                 CPPPATH='#libs/vamp-sdk')
 libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
                                  LIBPATH='#libs/vamp-sdk',
-                                 CPPPATH='#libs/vamp-sdk/vamp')
+                                 CPPPATH='#libs/vamp-sdk')
 
 env['RUBBERBAND'] = False
 
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);
 	}
 }
 
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 4552913bae..5b4f0cda87 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -124,6 +124,7 @@ if ardour['LIBLO']:
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
 ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
+ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour2', 'vamp') + "\\\"")
 ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
 ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")
 
diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index ea91510f94..86bf1c51be 100644
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -40,13 +40,12 @@ AudioAnalyser::initialize_plugin (AnalysisPluginKey key, float sr)
 		return -1;
 	} 
 
-	if ((bufsize = plugin->getPreferredBlockSize ()) == 0) {
-		bufsize = 65536;
-	}
+	/* we asked for the buffering adapter, so set the blocksize to
+	   something that makes for efficient disk i/o
+	*/
 
-	if ((stepsize = plugin->getPreferredStepSize()) == 0) {
-		stepsize = bufsize;
-	}
+	bufsize = 65536;
+	stepsize = bufsize;
 
 	if (plugin->getMinChannelCount() > 1) {
 		delete plugin;
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index dcaf98e0a9..5ada27a787 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -285,6 +285,17 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 		return -1;
 	}
 #endif
+	
+	/* Make VAMP look in our library ahead of anything else */
+
+	char *p = getenv ("VAMP_PATH");
+	string vamppath = VAMP_DIR;
+	if (p) {
+		vamppath += ':';
+		vamppath += p;
+	} 
+	setenv ("VAMP_PATH", vamppath.c_str(), 1);
+
 
 	setup_hardware_optimization (try_optimization);
 
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 5793ef545f..75682ec592 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -793,9 +793,9 @@ Region::state (bool full_state)
 	node->add_property ("length", buf);
 	snprintf (buf, sizeof (buf), "%u", _position);
 	node->add_property ("position", buf);
-	snprintf (buf, sizeof (buf), "%lu", _ancestral_start);
+	snprintf (buf, sizeof (buf), "%Ld", _ancestral_start);
 	node->add_property ("ancestral-start", buf);
-	snprintf (buf, sizeof (buf), "%lu", _ancestral_length);
+	snprintf (buf, sizeof (buf), "%Ld", _ancestral_length);
 	node->add_property ("ancestral-length", buf);
 	snprintf (buf, sizeof (buf), "%.12g", _stretch);
 	node->add_property ("stretch", buf);
diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index e4692b9c95..cc554ee544 100644
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -7,9 +7,8 @@ using namespace ARDOUR;
 using namespace std;
 
 TransientDetector::TransientDetector (float sr)
-	: AudioAnalyser (sr, X_("vamp-example-plugins:percussiononsets"))
+	: AudioAnalyser (sr, X_("ardour-vamp-plugins:percussiononsets"))
 {
-	cerr << "plugin in constructor = " << plugin << endl;
 }
 
 TransientDetector::~TransientDetector()