Don't report an error when the user cancels a time stretch operation.

[ardour.git] / gtk2_ardour / ardev_common.sh.in

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index f4e0edee74b58c9437776b60e58252c1c5d98e88..10a37a6ae8c6ef818d4ced10e163db071fe3c0ad 100644 (file)
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -1,34 +1,13 @@
-cd `dirname "$0"`/..
+TOP=`dirname "$0"`/..
 
 #export G_DEBUG=fatal_criticals
 
-export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:.
-export ARDOUR_SURFACES_PATH=libs/surfaces/osc:libs/surfaces/generic_midi:libs/surfaces/tranzport:libs/surfaces/powermate
-export ARDOUR_DATA_PATH=gtk2_ardour:.
-if test -d $HOME/gtk/inst ; then
-    echo USING NEW CLEARLOOKS
-    export GTK_PATH=~/.ardour3:libs/clearlooks-newer
-else
-    echo USING OLD CLEARLOOKS
-    export GTK_PATH=~/.ardour3:libs/clearlooks-older
-fi
-export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
+libs=$TOP/@LIBS@
 
-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:libs/cairomm:libs/taglib:libs/evoral:libs/evoral/src/libsmf:$LD_LIBRARY_PATH
+export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/build/default/gtk2_ardour:$TOP/gtk2_ardour:.
+export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
+export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/default/gtk2_ardour:.
 
-# DYLD_LIBRARY_PATH is for darwin.
-export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
-
-EXECUTABLE=gtk2_ardour/ardour-%VERSION%
-cd `dirname "$0"`/..
-
-#export G_DEBUG=fatal_criticals
-
-libs=@LIBS@
-
-export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:build/default/gtk2_ardour:.
-export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate
-export ARDOUR_DATA_PATH=gtk2_ardour:build/default/gtk2_ardour:.
 if test -d $HOME/gtk/inst ; then
     echo USING NEW CLEARLOOKS
     export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
@@ -36,9 +15,10 @@ else
     echo USING OLD CLEARLOOKS
     export GTK_PATH=~/.ardour3:$libs/clearlooks-older
 fi
+
 export VAMP_PATH=$libs/vamp-plugins:$VAMP_PATH
 
-export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$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:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$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:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$LD_LIBRARY_PATH
 
 # DYLD_LIBRARY_PATH is for darwin.
 export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH