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 1c354a5db01e3fa6f5c8f5f00872de0a85374678..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>
@@ -56,7 +61,7 @@
 #include "ardour/ardour.h"
 #include "ardour/analyser.h"
 #include "ardour/audio_library.h"
-#include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/profile.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/audiosource.h"
@@ -76,7 +81,7 @@
 
 #include "i18n.h"
 
-ARDOUR::Configuration* ARDOUR::Config = 0;
+ARDOUR::RCConfiguration* ARDOUR::Config = 0;
 ARDOUR::RuntimeProfile* ARDOUR::Profile = 0;
 ARDOUR::AudioLibrary* ARDOUR::Library = 0;
 
@@ -107,7 +112,7 @@ int
 ARDOUR::setup_midi ()
 {
        if (Config->midi_ports.size() == 0) {
-               warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg;
+               //warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg;
                return 0;
        }
 
@@ -303,7 +308,7 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 
        BootMessage (_("Loading configuration"));
 
-       Config = new Configuration;
+       Config = new RCConfiguration;
 
        if (Config->load_state ()) {
                return -1;
@@ -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); }
@@ -606,4 +617,6 @@ std::istream& operator>>(std::istream& o, ShuttleBehaviour& var) { return int_to
 std::istream& operator>>(std::istream& o, ShuttleUnits& var) { return int_to_type<ShuttleUnits> (o, var); }
 std::istream& operator>>(std::istream& o, SmpteFormat& var) { return int_to_type<SmpteFormat> (o, var); }
 std::istream& operator>>(std::istream& o, DenormalModel& var) { return int_to_type<DenormalModel> (o, var); }
+std::istream& operator>>(std::istream& o, WaveformScale& var) { return int_to_type<WaveformScale> (o, var); }
+std::istream& operator>>(std::istream& o, WaveformShape& var) { return int_to_type<WaveformShape> (o, var); }