the BIG CONFIG patch

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index a6f9d6b2e5923ce9db0b60686e8fe86b905b9d89..c9c244ca3c12bee53032f5dbf937a3fb5a5c813e 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -32,6 +32,7 @@
 #include <lrdf.h>
 
 #include <pbd/error.h>
+#include <pbd/id.h>
 #include <pbd/strsplit.h>
 
 #include <midi++/port.h>
@@ -43,11 +44,15 @@
 #include <ardour/audio_library.h>
 #include <ardour/configuration.h>
 #include <ardour/plugin_manager.h>
-#include <ardour/source.h>
+#include <ardour/audiosource.h>
 #include <ardour/utils.h>
 #include <ardour/session.h>
 #include <ardour/control_protocol_manager.h>
 
+#ifdef HAVE_LIBLO
+#include <ardour/osc.h>
+#endif
+
 #include <ardour/mix.h>
 
 #if defined (__APPLE__)
@@ -59,8 +64,13 @@
 ARDOUR::Configuration* ARDOUR::Config = 0;
 ARDOUR::AudioLibrary* ARDOUR::Library = 0;
 
+#ifdef HAVE_LIBLO
+ARDOUR::OSC* ARDOUR::osc = 0;
+#endif
+
 using namespace ARDOUR;
 using namespace std;
+using namespace PBD;
 
 MIDI::Port *default_mmc_port = 0;
 MIDI::Port *default_mtc_port = 0;
@@ -72,6 +82,24 @@ Change ARDOUR::PositionChanged = ARDOUR::new_change ();
 Change ARDOUR::NameChanged = ARDOUR::new_change ();
 Change ARDOUR::BoundsChanged = Change (0); // see init(), below
 
+#ifdef HAVE_LIBLO
+static int
+setup_osc ()
+{
+       /* no real cost to creating this object, and it avoids
+          conditionals anywhere that uses it 
+       */
+       
+       osc = new OSC (Config->get_osc_port());
+       
+       if (Config->get_use_osc ()) {
+               return osc->start ();
+       } else {
+               return 0;
+       }
+}
+#endif
+
 static int 
 setup_midi ()
 {
@@ -162,12 +190,17 @@ setup_midi ()
 }
 
 int
-ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*sighandler)(int,siginfo_t*,void*))
+ARDOUR::init (bool use_vst, bool try_optimization)
 {
         bool generic_mix_functions = true;
 
        (void) bindtextdomain(PACKAGE, LOCALEDIR);
 
+       PBD::ID::init ();
+
+       lrdf_init();
+       Library = new AudioLibrary;
+
        Config = new Configuration;
 
        if (Config->load_state ()) {
@@ -179,9 +212,15 @@ ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*s
        if (setup_midi ()) {
                return -1;
        }
+    
+#ifdef HAVE_LIBLO
+       if (setup_osc ()) {
+               return -1;
+       }
+#endif
 
 #ifdef VST_SUPPORT
-       if (Config->get_use_vst() && fst_init (sighandler)) {
+       if (Config->get_use_vst() && fst_init ()) {
                return -1;
        }
 #endif
@@ -259,12 +298,9 @@ ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*s
                
                info << "No H/W specific optimizations in use" << endmsg;
        }
-       
-       lrdf_init();
-       Library = new AudioLibrary;
 
        /* singleton - first object is "it" */
-       new PluginManager (engine);
+       new PluginManager ();
        
        /* singleton - first object is "it" */
        new ControlProtocolManager ();
@@ -289,10 +325,15 @@ ARDOUR::cleanup ()
        return 0;
 }
 
-ARDOUR::id_t
-ARDOUR::new_id ()
+
+microseconds_t
+ARDOUR::get_microseconds ()
 {
-       return get_uid();
+       /* XXX need JACK to export its functionality */
+
+       struct timeval now;
+       gettimeofday (&now, 0);
+       return now.tv_sec * 1000000ULL + now.tv_usec;
 }
 
 ARDOUR::Change
@@ -301,10 +342,17 @@ ARDOUR::new_change ()
        Change c;
        static uint32_t change_bit = 1;
 
-       /* XXX catch out-of-range */
+       /* catch out-of-range */
+       if (!change_bit)
+       {
+               fatal << _("programming error: ")
+                       << "change_bit out of range in ARDOUR::new_change()"
+                       << endmsg;
+               /*NOTREACHED*/
+       }
 
        c = Change (change_bit);
-       change_bit <<= 1;
+       change_bit <<= 1;       // if it shifts too far, change_bit == 0
 
        return c;
 }
@@ -324,7 +372,9 @@ ARDOUR::get_user_ardour_path ()
 
        /* create it if necessary */
 
-       mkdir (path.c_str (), 0755);
+       if (g_mkdir_with_parents (path.c_str (), 0755)) {
+               throw exception ();
+       }
 
        return path;
 }
@@ -524,16 +574,22 @@ ARDOUR::coverage (jack_nframes_t sa, jack_nframes_t ea,
 
 /* not sure where to put these */
 
-std::istream& operator>>(std::istream& o, HeaderFormat hf) {
+template<class T>
+std::istream& int_to_type (std::istream& o, T& hf) {
        int val;
        o >> val;
-       hf = (HeaderFormat) val;
+       hf = (T) val;
        return o;
 }
 
-std::istream& operator>>(std::istream& o, SampleFormat sf) {
-       int val;
-       o >> val;
-       sf = (SampleFormat) val;
-       return o;
-}
+std::istream& operator>>(std::istream& o, HeaderFormat& var) { return int_to_type<HeaderFormat> (o, var); }
+std::istream& operator>>(std::istream& o, SampleFormat& var) { return int_to_type<SampleFormat> (o, var); }
+std::istream& operator>>(std::istream& o, AutoConnectOption& var) { return int_to_type<AutoConnectOption> (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, 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); }
+std::istream& operator>>(std::istream& o, ShuttleBehaviour& var) { return int_to_type<ShuttleBehaviour> (o, var); }
+std::istream& operator>>(std::istream& o, ShuttleUnits& var) { return int_to_type<ShuttleUnits> (o, var); }
+