Replace thinning static state with parameter.

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

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 5874ac3b1b25d183cea69ba2766e2497605947b8..44367b8cf32cf055109e6de84cd21008e1ad6ddd 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -85,10 +85,12 @@
 #include "ardour/audioregion.h"
 #include "ardour/buffer_manager.h"
 #include "ardour/control_protocol_manager.h"
+#include "ardour/event_type_map.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
 #include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
+#include "ardour/operations.h"
 #include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
@@ -99,6 +101,7 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session_event.h"
 #include "ardour/source_factory.h"
+#include "ardour/uri_map.h"
 
 #include "audiographer/routines.h"
 
@@ -125,6 +128,8 @@ mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
 mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
 
 PBD::Signal1<void,std::string> ARDOUR::BootMessage;
+PBD::Signal3<void,std::string,std::string,bool> ARDOUR::PluginScanMessage;
+PBD::Signal1<void,int> ARDOUR::PluginScanTimeout;
 PBD::Signal0<void> ARDOUR::GUIIdle;
 
 namespace ARDOUR {
@@ -239,10 +244,12 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
 #ifdef ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);
+       (void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
 
        SessionEvent::init_event_pool ();
 
+       Operations::make_operations_quarks ();
        SessionObject::make_property_quarks ();
        Region::make_property_quarks ();
        MidiRegion::make_property_quarks ();
@@ -314,8 +321,10 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
        SourceFactory::init ();
        Analyser::init ();
 
-       /* singleton - first object is "it" */
+       /* singletons - first object is "it" */
        (void) PluginManager::instance();
+       (void) URIMap::instance();
+       (void) EventTypeMap::instance();
 
         ProcessThread::init ();
        /* the + 4 is a bit of a handwave. i don't actually know
@@ -326,24 +335,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
         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);
-
        ARDOUR::AudioEngine::create ();
 
        libardour_initialized = true;
@@ -363,7 +354,7 @@ ARDOUR::init_post_engine ()
 
        /* find plugins */
 
-       ARDOUR::PluginManager::instance().refresh ();
+       ARDOUR::PluginManager::instance().refresh (!Config->get_discover_vst_on_start());
 }
 
 void
@@ -387,6 +378,8 @@ ARDOUR::cleanup ()
 #ifdef LXVST_SUPPORT
        vstfx_exit();
 #endif
+       delete &PluginManager::instance();
+       delete Config;
        PBD::cleanup ();
 
        return;
@@ -399,11 +392,9 @@ ARDOUR::find_bindings_files (map<string,string>& files)
        Searchpath spath = ardour_config_search_path();
 
        if (getenv ("ARDOUR_SAE")) {
-               Glib::PatternSpec pattern("*SAE-*.bindings");
-               find_matching_files_in_search_path (spath, pattern, found);
+               find_files_matching_pattern (found, spath, "*SAE-*.bindings");
        } else {
-               Glib::PatternSpec pattern("*.bindings");
-               find_matching_files_in_search_path (spath, pattern, found);
+               find_files_matching_pattern (found, spath, "*.bindings");
        }
 
        if (found.empty()) {