fix merge with master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/editor.h
Simple merge

diff --cc gtk2_ardour/editor_markers.cc
Simple merge

diff --cc gtk2_ardour/editor_mixer.cc
Simple merge

diff --cc gtk2_ardour/editor_mouse.cc
index b2ee2777cfea9845f34853fa41a7eef478f76f88,7f90fe2d0fffc0065fd0b3f3a6d215dd85e42593..7782f393ae5a31990889d3e92f87756fc1bcd5a2
--- 1/gtk2_ardour/editor_mouse.cc
--- 2/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@@ -1293,12 -1268,11 +1293,16 @@@ Editor::button_press_handler_2 (ArdourC
  bool
  Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
  {
 +      if (event->type == GDK_2BUTTON_PRESS) {
 +              _drags->mark_double_click ();
 +              return false;
 +      }
 +
        if (event->type != GDK_BUTTON_PRESS) {
+               if (event->type == GDK_2BUTTON_PRESS) {
+                       gdk_pointer_ungrab (GDK_CURRENT_TIME);
+                       return button_double_click_handler (item, event, item_type);
+               }
                return false;
        }
  

diff --cc gtk2_ardour/editor_ops.cc
Simple merge

diff --cc gtk2_ardour/editor_routes.cc
Simple merge

diff --cc gtk2_ardour/wscript
index 52fd7b18cb3d217fe560a98b6e24fe635b99d799,3ca90744c7c5fb7aa190e515d5dae1a3d0fafa7b..f4cb37dfc369139421a1128c055a00e716030c13
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -399,19 -412,20 +401,23 @@@ def build(bld)
  
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
  
-     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL GTKMM LO'
+     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL'
+     obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
+     obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
      obj.use          = [ 'libpbd',
                           'libmidipp',
-                          'libtaglib',
-                          'libardour',
+                          'ardour',
                           'libardour_cp',
 -                         'libgtkmm2ext']
 +                         'libgtkmm2ext',
-                          'libtaglib',
 +                         'libcanvas'
 +                         ]
+     if bld.is_defined('USE_EXTERNAL_LIBS'):
+         obj.uselib += ' TAGLIB'
+     else:
+         obj.use.append('libtaglib')
      if sys.platform == 'darwin':
 -        obj.use += ' libappleutility'
 +        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
 +        obj.use    += ' libappleutility'
      obj.defines     = [
          'PACKAGE="' + I18N_PACKAGE + '"',
          'VERSIONSTRING="' + bld.env['VERSION'] + '"',

diff --cc libs/ardour/wscript
Simple merge

diff --cc wscript
Simple merge