use dynamic bitsets for send + port insert naming; fix up ardev, arval etc more generically

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

9 files changed, 26 insertions, 12 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 375dba278b..94e558bbe6 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -278,7 +278,7 @@ my_subst_dict['%VERSION%'] = ardour_version
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
 
-ardourdev = env.SubstInFile ('ardev','ardev.in', SUBST_DICT = my_subst_dict);
+ardourdev = env.SubstInFile ('ardev_common.sh','ardev_common.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755))
 
 Default(ardourdev)
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 933b5ba720..95466a42b8 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,4 +1,4 @@
 #!/bin/sh
 dir=`dirname "$0"`
 . $dir/ardev_common.sh
-exec gdb gtk2_ardour/ardour.bin $*
+exec gdb $EXECUTABLE $*
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 73f6573228..ff68e11fbe 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,3 +1,3 @@
 #!/bin/sh
 . `dirname "$0"`/ardev_common.sh
-exec gtk2_ardour/ardour-2.0beta10 $*
+exec $EXECUTABLE $*
diff --git a/gtk2_ardour/ardev.in b/gtk2_ardour/ardev.in
deleted file mode 100644
index d9ba8330bb..0000000000
--- a/gtk2_ardour/ardev.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. `dirname "$0"`/ardev_common.sh
-exec gtk2_ardour/ardour-%VERSION% $*
diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh
index d4109de8bb..3cef2254d2 100755
--- a/gtk2_ardour/ardev_common.sh
+++ b/gtk2_ardour/ardev_common.sh
@@ -13,3 +13,4 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 # For the internal clearlooks engine
 export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2
 
+EXECUTABLE=gtk2_ardour/ardour-2.0beta10
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
new file mode 100644
index 0000000000..6017dcdba4
--- /dev/null
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -0,0 +1,16 @@
+cd `dirname "$0"`/..
+
+#export G_DEBUG=fatal_criticals
+
+export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour
+export GTK_PATH=libs/clearlooks
+
+
+export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd: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
+
+# DYLD_LIBRARY_PATH is for darwin.
+export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+# For the internal clearlooks engine
+export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2
+
+EXECUTABLE=gtk2_ardour/ardour-%VERSION%
diff --git a/gtk2_ardour/arprof b/gtk2_ardour/arprof
index 984866a99b..05a469cb17 100755
--- a/gtk2_ardour/arprof
+++ b/gtk2_ardour/arprof
@@ -5,5 +5,5 @@ if [ gprofhelper.c -nt gprofhelper.so ] ; then
     gcc -shared -nostdlib -fPIC gprofhelper.c -o gprofhelper.so -lpthread -ldl || exit 1
 fi
 
-export LD_LIBRARY_PATH=../libs/ardour/.libs
-LDPRELOAD=./gprofhelper.so ./ardour $*
+. ardev_common.sh
+LDPRELOAD=./gprofhelper.so $EXECUTABLE $*
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
index a1dc501d3f..920e7cb1a8 100755
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -1,4 +1,4 @@
 #!/bin/sh
 . ardev_common.sh
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
-exec valgrind  --num-callers=50 --tool=memcheck gtk2_ardour/ardour.bin --novst $*
+exec valgrind  --num-callers=50 --tool=memcheck $EXECUTABLE --novst $*
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 48dd829237..d9a7eb1aec 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -835,7 +835,6 @@ RedirectBox::rename_redirect (boost::shared_ptr<Redirect> redirect)
 	}
 
 	return;
-  
 }
 
 void
@@ -920,8 +919,9 @@ RedirectBox::get_selected_redirects (vector<boost::shared_ptr<Redirect> >& redir
 {
     vector<Gtk::TreeModel::Path> pathlist = redirect_display.get_selection()->get_selected_rows();
  
-	for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter)
-		redirects.push_back ((*(model->get_iter(*iter)))[columns.redirect]);
+    for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
+	    redirects.push_back ((*(model->get_iter(*iter)))[columns.redirect]);
+    }
 }
 
 void