hopefully fix the build, and actually use the options

[ardour.git] / libs / ardour / globals.cc

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index a501e6593164fc55761f125bd62141772b8194a2..90f05ce325f49e47a32c3c616274c0fcbd32c71d 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -16,6 +16,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include <cstdio> // Needed so that libraptor (included in lrdf) won't complain
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -430,6 +435,12 @@ ARDOUR::find_bindings_files (map<string,string>& files)
        }
 }
 
+bool
+ARDOUR::no_auto_connect() 
+{
+       return getenv ("ARDOUR_NO_AUTOCONNECT") != 0;
+}
+
 ARDOUR::LocaleGuard::LocaleGuard (const char* str)
 {
        old = strdup (setlocale (LC_NUMERIC, NULL));
@@ -598,7 +609,7 @@ std::istream& operator>>(std::istream& o, AutoConnectOption& var) { return int_t
 std::istream& operator>>(std::istream& o, MonitorModel& var) { return int_to_type<MonitorModel> (o, var); }
 std::istream& operator>>(std::istream& o, RemoteModel& var) { return int_to_type<RemoteModel> (o, var); }
 std::istream& operator>>(std::istream& o, EditMode& var) { return int_to_type<EditMode> (o, var); }
-std::istream& operator>>(std::istream& o, SoloModel& var) { return int_to_type<SoloModel> (o, var); }
+std::istream& operator>>(std::istream& o, ListenPosition& var) { return int_to_type<ListenPosition> (o, var); }
 std::istream& operator>>(std::istream& o, LayerModel& var) { return int_to_type<LayerModel> (o, var); }
 std::istream& operator>>(std::istream& o, CrossfadeModel& var) { return int_to_type<CrossfadeModel> (o, var); }
 std::istream& operator>>(std::istream& o, SlaveSource& var) { return int_to_type<SlaveSource> (o, var); }