fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 0e12883d8235d992f11a157d6196e5fd3597c611..48a7dc0da0b386d29be6fafb6415a5f99e92c948 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -16,7 +16,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 #ifdef WAF_BUILD
 #include "libardour-config.h"
 #endif
@@ -34,6 +33,10 @@
 #include <fst.h>
 #endif
 
+#ifdef LXVST_SUPPORT
+#include "ardour/vstfx.h"
+#endif
+
 #ifdef HAVE_AUDIOUNITS
 #include "ardour/audio_unit.h"
 #endif
@@ -66,10 +69,13 @@
 #include "ardour/audiosource.h"
 #include "ardour/buffer_manager.h"
 #include "ardour/control_protocol_manager.h"
+#include "ardour/dB.h"
 #include "ardour/debug.h"
 #include "ardour/filesystem_paths.h"
+#include "ardour/midi_region.h"
 #include "ardour/mix.h"
 #include "ardour/audioplaylist.h"
+#include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
 #include "ardour/profile.h"
@@ -113,13 +119,13 @@ void ARDOUR::setup_enum_writer ();
 */
 PBD::PropertyChange ARDOUR::bounds_change;
 
-namespace ARDOUR { 
+namespace ARDOUR {
        namespace Properties {
 
                /* the envelope and fades are not scalar items and so
                   currently (2010/02) are not stored using Property.
                   However, these descriptors enable us to notify
-                  about changes to them via PropertyChange. 
+                  about changes to them via PropertyChange.
 
                   Declared in ardour/audioregion.h ...
                */
@@ -160,7 +166,8 @@ setup_hardware_optimization (bool try_optimization)
                        compute_peak          = x86_sse_compute_peak;
                        find_peaks            = x86_sse_find_peaks;
                        apply_gain_to_buffer  = x86_sse_apply_gain_to_buffer;
-                       mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
+                       // mix_buffers_with_gain = x86_sse_mix_buffers_with_gain;
+                       mix_buffers_with_gain = default_mix_buffers_with_gain;
                        mix_buffers_no_gain   = x86_sse_mix_buffers_no_gain;
 
                        generic_mix_functions = false;
@@ -201,7 +208,7 @@ setup_hardware_optimization (bool try_optimization)
 
                info << "No H/W specific optimizations in use" << endmsg;
        }
-       
+
        AudioGrapher::Routines::override_compute_peak (compute_peak);
        AudioGrapher::Routines::override_apply_gain_to_buffer (apply_gain_to_buffer);
 }
@@ -244,10 +251,11 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 
        PBD::ID::init ();
        SessionEvent::init_event_pool ();
-       
+
        make_property_quarks ();
        SessionObject::make_property_quarks ();
        Region::make_property_quarks ();
+       MidiRegion::make_property_quarks ();
        AudioRegion::make_property_quarks ();
        RouteGroup::make_property_quarks ();
         Playlist::make_property_quarks ();
@@ -284,8 +292,11 @@ ARDOUR::init (bool use_vst, bool try_optimization)
        if (Config->load_state ()) {
                return -1;
        }
-        
+
        Config->set_use_vst (use_vst);
+#ifdef LXVST_SUPPORT
+       Config->set_use_lxvst(true);
+#endif
 
        Profile = new RuntimeProfile;
 
@@ -296,6 +307,12 @@ ARDOUR::init (bool use_vst, bool try_optimization)
        }
 #endif
 
+#ifdef LXVST_SUPPORT
+       if (Config->get_use_lxvst() && vstfx_init (0)) {
+               return -1;
+       }
+#endif
+
 #ifdef HAVE_AUDIOUNITS
        AUPluginInfo::load_cached_info ();
 #endif
@@ -322,6 +339,26 @@ ARDOUR::init (bool use_vst, bool try_optimization)
         ProcessThread::init ();
         BufferManager::init (10); // XX should be num_processors_for_dsp
 
+        PannerManager::instance().discover_panners();
+
+       // Initialize parameter metadata
+       EventTypeMap::instance().new_parameter(NullAutomation);
+       EventTypeMap::instance().new_parameter(GainAutomation);
+       EventTypeMap::instance().new_parameter(PanAzimuthAutomation);
+       EventTypeMap::instance().new_parameter(PanElevationAutomation);
+       EventTypeMap::instance().new_parameter(PanWidthAutomation);
+       EventTypeMap::instance().new_parameter(PluginAutomation);
+       EventTypeMap::instance().new_parameter(SoloAutomation);
+       EventTypeMap::instance().new_parameter(MuteAutomation);
+       EventTypeMap::instance().new_parameter(MidiCCAutomation);
+       EventTypeMap::instance().new_parameter(MidiPgmChangeAutomation);
+       EventTypeMap::instance().new_parameter(MidiPitchBenderAutomation);
+       EventTypeMap::instance().new_parameter(MidiChannelPressureAutomation);
+       EventTypeMap::instance().new_parameter(FadeInAutomation);
+       EventTypeMap::instance().new_parameter(FadeOutAutomation);
+       EventTypeMap::instance().new_parameter(EnvelopeAutomation);
+       EventTypeMap::instance().new_parameter(MidiCCAutomation);
+
        return 0;
 }
 
@@ -337,8 +374,6 @@ ARDOUR::init_post_engine ()
        if ((node = Config->control_protocol_state()) != 0) {
                ControlProtocolManager::instance().set_state (*node, Stateful::loading_state_version);
        }
-
-       MIDI::Manager::instance()->set_port_states (Config->midi_port_states ());
 }
 
 int
@@ -350,13 +385,11 @@ ARDOUR::cleanup ()
 #ifdef VST_SUPPORT
        fst_exit ();
 #endif
-       return 0;
-}
 
-string
-ARDOUR::get_ardour_revision ()
-{
-       return "$Rev$";
+#ifdef LXVST_SUPPOR
+       vstfx_exit();
+#endif
+       return 0;
 }
 
 void