rework AudioUnit variable input port count.

[ardour.git] / gtk2_ardour / ui_config.h

diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index c8dcbacf126af35a4d25d758f2f55a165e779544..285bc5366a374e8b769a3cf5452864fa7f568c4d 100644 (file)
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -29,7 +29,7 @@
 
 #include "pbd/stateful.h"
 #include "pbd/xml++.h"
-#include "ardour/configuration_variable.h"
+#include "pbd/configuration_variable.h"
 
 #include "canvas/colors.h"
 
@@ -48,6 +48,7 @@ class UIConfiguration : public PBD::Stateful
        int load_state ();
        int save_state ();
        int load_defaults ();
+       int load_color_theme (bool allow_own=true);
 
        int set_state (const XMLNode&, int version);
        XMLNode& get_state (void);
@@ -71,6 +72,7 @@ class UIConfiguration : public PBD::Stateful
 
        ArdourCanvas::Color color (const std::string&, bool* failed = 0) const;
        ArdourCanvas::Color color_mod (std::string const & color, std::string const & modifier) const;
+       ArdourCanvas::Color color_mod (const ArdourCanvas::Color& color, std::string const & modifier) const;
        ArdourCanvas::HSV  color_hsv (const std::string&) const;
        ArdourCanvas::SVAModifier modifier (const std::string&) const;
                
@@ -78,6 +80,16 @@ class UIConfiguration : public PBD::Stateful
        void map_parameters (boost::function<void (std::string)>&);
 
        void parameter_changed (std::string);
+
+       /** called before initializing any part of the GUI. Sets up
+        *  any runtime environment required to make the GUI work
+        *  in specific ways.
+        */
+       int pre_gui_init ();
+
+       /** called after the GUI toolkit has been initialized. 
+        */
+       UIConfiguration* post_gui_init ();
        
 #undef UI_CONFIG_VARIABLE
 #define UI_CONFIG_VARIABLE(Type,var,name,value) \
@@ -95,11 +107,11 @@ class UIConfiguration : public PBD::Stateful
        /* declare variables */
 
 #undef  UI_CONFIG_VARIABLE
-#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable<Type> var;
+#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
 #include "ui_config_vars.h"
 #undef UI_CONFIG_VARIABLE
 
-#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
+#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
 #include "canvas_vars.h"
 #undef CANVAS_FONT_VARIABLE
 
@@ -117,7 +129,6 @@ class UIConfiguration : public PBD::Stateful
        void load_modifiers (XMLNode const &);
        void reset_gtk_theme ();
        void colors_changed ();
-       int load_color_theme (bool allow_own=true);
 
        uint32_t block_save;
 };