fix merge conflicts from master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/ardour_ui_dialogs.cc
Simple merge

diff --cc gtk2_ardour/export_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/main.cc
index ef96423fb58c827bd1197c0574d3ea3f3d1cac40,e619c9d83bcf40caf34d52c02bc89b9ae1da0544..dfa0bda94540a713972721bbb322d29bbd8e4568
--- 1/gtk2_ardour/main.cc
--- 2/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@@ -514,9 -509,15 +510,16 @@@ int main (int argc, char *argv[]
  
        /* some GUI objects need this */
  
-       PBD::ID::init ();
+       if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+               error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
+               exit (1);
+       }
+ 
+       if (curvetest_file) {
+               return curvetest (curvetest_file);
+       }
  
 +#ifndef WIN32
        if (::signal (SIGPIPE, sigpipe_handler)) {
                cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
        }

diff --cc gtk2_ardour/midi_tracer.cc
Simple merge

diff --cc gtk2_ardour/port_matrix.cc
Simple merge

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

diff --cc gtk2_ardour/transcode_ffmpeg.cc
index aedd7d25ebc44cbaa8612203ccd7b99748bf9313,ea753104dbaf9d887aaac1634503d31cf53e7d13..0a7bf64ecdaee452026d4decf425f47a0bbfdb40
--- 1/gtk2_ardour/transcode_ffmpeg.cc
--- 2/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@@ -32,11 -32,8 +32,12 @@@
  
  #include "i18n.h"
  
 +#ifdef SearchPath
 +#undef SearchPath
 +#endif
 +
  using namespace PBD;
+ using namespace VideoUtils;
  
  TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
        : infile(f)

diff --cc gtk2_ardour/transcode_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/video_image_frame.cc
Simple merge

diff --cc gtk2_ardour/video_server_dialog.cc
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

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

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

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

diff --cc libs/ardour/globals.cc
index 57b1e2db65b14f42b4caf49c936a27a472f26676,986d320aef5d7ec9aa61fc52768b9323c9562ab3..f4cc81a2607de06570e057e09ef7195a377e92c2
--- 1/libs/ardour/globals.cc
--- 2/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@@ -222,18 -214,16 +223,17 @@@ lotsa_files_please (
        } else {
                error << string_compose (_("Could not get system open files limit (%1)"), strerror (errno)) << endmsg;
        }
 +#endif
  }
  
- int
+ bool
  ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir)
  {
-       if (!Glib::thread_supported()) {
-               Glib::thread_init();
+       if (libardour_initialized) {
+               return true;
        }
  
-       // this really should be in PBD::init..if there was one
-       Gio::init ();
+       if (!PBD::init()) return false;
  
  #ifdef ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);

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

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

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

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

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

diff --cc libs/pbd/pbd/pthread_utils.h
Simple merge

diff --cc libs/pbd/pthread_utils.cc
index 91d93ec4f8a73c8b28fdc68ac557bca980b7cc28,3d3cb96fb5cb313f31df83bda7cc3e9229e26057..b8ca8fc09346274d7dd441ae68d1e0671e7c8534
--- 1/libs/pbd/pthread_utils.cc
--- 2/libs/pbd/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
@@@ -147,7 -161,11 +169,12 @@@ voi
  pthread_cancel_all () 
  {     
        pthread_mutex_lock (&thread_map_lock);
-       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
++
+       for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ) {
+ 
+               ThreadMap::iterator nxt = i;
+               ++nxt;
+ 
                if (!pthread_equal ((*i), pthread_self())) {
                        pthread_cancel ((*i));
                }

diff --cc libs/pbd/wscript
Simple merge

diff --cc wscript
Simple merge