fix merge issues with master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/main.cc
Simple merge

diff --cc libs/ardour/ardour/ardour.h
Simple merge

diff --cc libs/ardour/globals.cc
index 4e99bc767e572128286892589645e928c5375235,986d320aef5d7ec9aa61fc52768b9323c9562ab3..aac7709f90da8c7c1dd610f552870d9e1ddc6c0a
--- 1/libs/ardour/globals.cc
--- 2/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@@ -333,9 -330,9 +332,11 @@@ ARDOUR::init (bool use_windows_vst, boo
        EventTypeMap::instance().new_parameter(EnvelopeAutomation);
        EventTypeMap::instance().new_parameter(MidiCCAutomation);
  
-       return 0;
 +      ARDOUR::AudioEngine::create ();
 +
+       libardour_initialized = true;
+ 
+       return true;
  }
  
  void

diff --cc libs/ardour/lv2_plugin.cc
Simple merge