From 585e49184209f6f1679ddb6ee628efd02f7cbb0d Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 22 Dec 2006 04:20:07 +0000
Subject: more panner tweaks

git-svn-id: svn://localhost/ardour2/trunk@1245 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/globals.cc          | 19 +++++++++++++++----
 libs/gtkmm2ext/barcontroller.cc |  9 +++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'libs')

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 74e396bac8..c68951e525 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -398,8 +398,14 @@ ARDOUR::get_system_data_path ()
 {
 	string path;
 
-	path += DATA_DIR;
-	path += "/ardour2/";
+	char *envvar;
+
+	if ((envvar = getenv ("ARDOUR_DATA_PATH")) != 0) {
+		path = envvar;
+	} else {
+		path += DATA_DIR;
+		path += "/ardour2/";
+	}
 	
 	return path;
 }
@@ -408,9 +414,14 @@ string
 ARDOUR::get_system_module_path ()
 {
 	string path;
+	char *envvar;
 
-	path += MODULE_DIR;
-	path += "/ardour2/";
+	if ((envvar = getenv ("ARDOUR_MODULE_PATH")) != 0) {
+		path = envvar;
+	} else {
+		path += MODULE_DIR;
+		path += "/ardour2/";
+	}
 	
 	return path;
 }
diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc
index 803cb113cb..5dff70cedf 100644
--- a/libs/gtkmm2ext/barcontroller.cc
+++ b/libs/gtkmm2ext/barcontroller.cc
@@ -95,6 +95,8 @@ BarController::drop_grab ()
 bool
 BarController::button_press (GdkEventButton* ev)
 {
+	double fract;
+
 	if (binding_proxy.button_press_handler (ev)) {
 		return true;
 	}
@@ -116,6 +118,9 @@ BarController::button_press (GdkEventButton* ev)
 		break;
 
 	case 2:
+		fract = ev->x / (darea.get_width() - 2.0);
+		adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower()));
+
 	case 3:
 		break;
 
@@ -130,8 +135,6 @@ BarController::button_press (GdkEventButton* ev)
 bool
 BarController::button_release (GdkEventButton* ev)
 {
-	double fract;
-
 	drop_grab ();
 	
 	switch (ev->button) {
@@ -159,8 +162,6 @@ BarController::button_release (GdkEventButton* ev)
 		break;
 
 	case 2:
-		fract = ev->x / (darea.get_width() - 2.0);
-		adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower()));
 		break;
 		
 	case 3:
-- 
cgit v1.2.3