Make the mackie surface work again by initialising control surfaces after MIDI, so...

git-svn-id: svn://localhost/ardour2/branches/3.0@5747 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 09ddb34a244a99e2b73f2a720b57171955f5ec6d..afa842e4f51e532bb3948720cf30d7f4083c0457 100644 (file)
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -5,7 +5,7 @@ TOP=`dirname "$0"`/..
 libs=$TOP/@LIBS@
 
 export ARDOUR_PATH=$TOP/gtk2_ardour/icons:$TOP/gtk2_ardour/pixmaps:$TOP/gtk2_ardour:$TOP/build/default/gtk2_ardour:.
-export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate
+export ARDOUR_SURFACES_PATH=$libs/surfaces/osc:$libs/surfaces/generic_midi:$libs/surfaces/tranzport:$libs/surfaces/powermate:$libs/surfaces/mackie
 export ARDOUR_DATA_PATH=$TOP/gtk2_ardour:build/default/gtk2_ardour:.
 
 if test -d $HOME/gtk/inst ; then

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 5faa64b536d821273035ab065fdea9ff75c4f11a..ea89b062c8632c582d8a7581fdac8d1b14be16dc 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -336,6 +336,8 @@ ARDOUR_UI::post_engine ()
        MIDI::Manager::instance()->set_api_data (engine->jack());
        setup_midi ();
 
+       ARDOUR::init_post_engine ();
+
        ActionManager::init ();
        _tooltips.enable();
 

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 892df2eb50764fd045d6f4c9999668804d21dd5c..4ea020403cf856945b0d9cb81e2d7393a58be0b5 100644 (file)
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -46,6 +46,7 @@ namespace ARDOUR {
        extern sigc::signal<void,std::string> BootMessage;
 
        int init (bool with_vst, bool try_optimization);
+       void init_post_engine ();
        int cleanup ();
        bool no_auto_connect ();
 

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 90f05ce325f49e47a32c3c616274c0fcbd32c71d..ca9334547125f5481f819351b39057c48c068a6d 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -348,6 +348,14 @@ ARDOUR::init (bool use_vst, bool try_optimization)
        /* singleton - first object is "it" */
        new PluginManager ();
 
+       BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
+
+       return 0;
+}
+
+void
+ARDOUR::init_post_engine ()
+{
        /* singleton - first object is "it" */
        new ControlProtocolManager ();
        ControlProtocolManager::instance().discover_control_protocols ();
@@ -356,10 +364,6 @@ ARDOUR::init (bool use_vst, bool try_optimization)
        if ((node = Config->control_protocol_state()) != 0) {
                ControlProtocolManager::instance().set_state (*node);
        }
-
-       BoundsChanged = Change (StartChanged|PositionChanged|LengthChanged);
-
-       return 0;
 }
 
 int