Install everything to *ardour3* instead of *ardour2*.

Fix initial display of keys and scroomer on new MIDI tracks.
Remove console barf.


git-svn-id: svn://localhost/ardour2/trunk@2909 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 7 insertions, 9 deletions

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 6a05bb2295..4246c3c99a 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -355,7 +355,7 @@ if env['NLS']:
 	i18n (ardour, ardour_files + vst_files + coreaudio_files + timefx_sources + audiounit_files, env)
 
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour))
 
 env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], []))
 
diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index 2a02638db1..2b6dfcbb39 100644
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -14,6 +14,6 @@ const char* const interchange_dir_name = X_("interchange");
 const char* const export_dir_name = X_("export");
 const char* const templates_dir_name = X_("templates");
 const char* const surfaces_dir_name = X_("surfaces");
-const char* const user_config_dir_name = X_(".ardour2");
+const char* const user_config_dir_name = X_(".ardour3");
 
 }
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index cc683c2450..9665176a67 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -56,7 +56,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX This goes uninitialized when there is no ~/.ardour2 directory.
+/* XXX This goes uninitialized when there is no ~/.ardour3 directory.
  * I can't figure out why, so this will do for now (just stole the
  * default from configuration_vars.h).  0 is not a good value for
  * allocating buffer sizes..
diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index dd41198142..d36bce2146 100644
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -56,7 +56,7 @@ sys::path
 ardour_module_directory ()
 {
 	sys::path module_directory(MODULE_DIR);
-	module_directory /= "ardour2";
+	module_directory /= "ardour3";
 	return module_directory;
 }
 
@@ -80,7 +80,7 @@ system_config_search_path ()
 
 #endif
 
-	config_path.add_subdirectory_to_paths("ardour2");
+	config_path.add_subdirectory_to_paths("ardour3");
 
 	return config_path;
 }
@@ -98,7 +98,7 @@ system_data_search_path ()
 
 #endif
 
-	data_path.add_subdirectory_to_paths("ardour2");
+	data_path.add_subdirectory_to_paths("ardour3");
 
 	return data_path;
 }
diff --git a/libs/gtkmm2ext/scroomer.cc b/libs/gtkmm2ext/scroomer.cc
index 50c17a46c6..b9be460de3 100644
--- a/libs/gtkmm2ext/scroomer.cc
+++ b/libs/gtkmm2ext/scroomer.cc
@@ -264,8 +264,6 @@ void
 Scroomer::on_size_allocate (Allocation& a) {
 	Gtk::DrawingArea::on_size_allocate(a);
 
-	cerr << "allocate" << endl;
-
 	position[Total] = a.get_height();
 	set_min_page_size(min_page_size);
 	update();
@@ -314,7 +312,7 @@ Scroomer::set_min_page_size(double ps) {
 void
 Scroomer::update() {
 	double range = adj.get_upper() - adj.get_lower();
-	double value = adj.get_value() - adj.get_lower();
+	//double value = adj.get_value() - adj.get_lower();
 	int height = position[Total];
 	double coeff = ((double) height) / range;