Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/audio_region_editor.h
index 0d9292b483d84e16ebb30823a2e9c2377355d302,b72986ecf19034387bc5f9564b7a0f97ee0443a0..2552dfd16503ed7512ad6899ab6a975d154158e1
--- 1/gtk2_ardour/audio_region_editor.h
--- 2/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@@ -34,14 -34,9 +34,13 @@@
  #include <gtkmm/separator.h>
  #include <gtkmm/spinbutton.h>
  
- #include <libgnomecanvas/libgnomecanvas.h>
  
  #include "pbd/signals.h"
 +#ifdef WIN32
 +#include "pbd/glib_semaphore.h"
 +#else
  #include "pbd/crossthread.h"
 +#endif
  
  #include "audio_clock.h"
  #include "ardour_dialog.h"

diff --cc gtk2_ardour/audio_region_view.h
index 7c6d6b88f24311bbfe53a08b68ac691a7a939dc2,353d0dc93777aeccf0b58d2c123df5b81dfc622b..3bfa56d2856ee50a22da1d110933cbae8803e990
--- 1/gtk2_ardour/audio_region_view.h
--- 2/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@@ -19,14 -19,8 +19,12 @@@
  #ifndef __gtk_ardour_audio_region_view_h__
  #define __gtk_ardour_audio_region_view_h__
  
 +#ifdef interface
 +#undef interface
 +#endif
 +
  #include <vector>
  
- #include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/polygon.h>
  #include <sigc++/signal.h>
  #include "ardour/audioregion.h"
  

diff --cc gtk2_ardour/audio_time_axis.cc
Simple merge

diff --cc gtk2_ardour/automation_time_axis.cc
Simple merge

diff --cc gtk2_ardour/editor_markers.cc
Simple merge

diff --cc gtk2_ardour/editor_rulers.cc
Simple merge

diff --cc gtk2_ardour/editor_videotimeline.cc
Simple merge

diff --cc gtk2_ardour/generic_pluginui.cc
Simple merge

diff --cc gtk2_ardour/midi_time_axis.cc
Simple merge

diff --cc gtk2_ardour/region_view.h
index 30161173530d929df45da51d2516e79adddd08d7,16df6be245c1705e0bddd2679e22921d40aa95e6..a5d5fddbd08acb5d2be6a0b4b82e0264e52a9a04
--- 1/gtk2_ardour/region_view.h
--- 2/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@@ -19,14 -19,8 +19,12 @@@
  #ifndef __gtk_ardour_region_view_h__
  #define __gtk_ardour_region_view_h__
  
 +#ifdef interface
 +#undef interface
 +#endif
 +
  #include <vector>
  
- #include <libgnomecanvasmm.h>
- #include <libgnomecanvasmm/polygon.h>
  #include <sigc++/signal.h>
  #include "ardour/region.h"
  #include "ardour/beats_frames_converter.h"

diff --cc gtk2_ardour/route_time_axis.cc
Simple merge

diff --cc gtk2_ardour/ui_config.cc
Simple merge

diff --cc gtk2_ardour/utils.cc
Simple merge

diff --cc gtk2_ardour/video_image_frame.cc
Simple merge

diff --cc gtk2_ardour/video_monitor.cc
Simple merge

diff --cc gtk2_ardour/video_timeline.cc
Simple merge

diff --cc gtk2_ardour/wscript
index a02e27f83d0ff79c28bdc2f5f630a555349112f7,4e5c41b8261a7ba8f51cde448e6c1a83f2b6a5a0..e6ce7bb3b6d0a6cbebfbda76a4edf14e223dfdd4
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -416,15 -402,15 +403,18 @@@ def build(bld)
      obj.use          = [ 'libpbd',
                           'libmidipp',
                           'libtaglib',
-                          'ardour',
+                          'libardour',
                           'libardour_cp',
                           'libgtkmm2ext',
-                          'libtaglib' ]
+                          'libtaglib',
+                          'libcanvas'
+                          ]
 +    if bld.env['build_target'] == 'mingw':
 +      if bld.env['DEBUG'] == False:
 +            obj.linkflags = ['-mwindows']
      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/ardour/silentfilesource.h
Simple merge

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

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

diff --cc libs/ardour/ltc_slave.cc
index 2888e7c11454e85da555cb69520eee160981d998,b4c4a1446bfde6e091949abaa72bc978aadbcc87..ced0226d00ea3c001267a66ac0be6280bd07b447
--- 1/libs/ardour/ltc_slave.cc
--- 2/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@@ -588,10 -588,10 +588,10 @@@ LTC_Slave::approximate_current_delta() 
        if (last_timestamp == 0 || engine_dll_initstate == 0) {
                snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012");
        } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) {
-               snprintf(delta, sizeof(delta), _("flywheel"));
+               snprintf(delta, sizeof(delta), "%s", _("flywheel"));
        } else {
                snprintf(delta, sizeof(delta), "\u0394<span foreground=\"green\" face=\"monospace\" >%s%s%" PRIi64 "</span>sm",
 -                              LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta));
 +                              LEADINGZERO(llabs(current_delta)), PLUSMINUS(-current_delta), llabs(current_delta));
        }
        return std::string(delta);
  }

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

diff --cc libs/ardour/wscript
index b99e70e6bb7e95b4ad375ef034f5838c6c73829f,733900e3f604b24993d8e0353119b63a4ed73129..e8c9fb8328a7f9aace1a07b31684c4e7f11b9789
--- 1/libs/ardour/wscript
--- 2/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@@ -340,11 -334,11 +340,11 @@@ def build(bld)
  
      obj.export_includes = ['.']
      obj.includes     = ['.', '../surfaces/control_protocol', '..']
-     obj.name         = 'ardour'
+     obj.name         = 'libardour'
      obj.target       = 'ardour'
      obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
 -                        'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
 -                        'OSX','BOOST','CURL','DL']
 +                        'JACK', 'ALSA', 'SNDFILE','SAMPLERATE','LRDF',
 +                        'AUDIOUNITS', 'OSX','BOOST','CURL','DL']
      obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                          'libvampplugin','libtaglib','librubberband',
                          'libaudiographer','libltc']

diff --cc libs/backends/jack/wscript
index 0bfb016e313c2bac4774ef1410e0866786931b5b,2903abb641c0b72ee311c969b3548713b6250cec..174f22beef209af8baaf29598489923045317af2
--- 1/libs/backends/jack/wscript
--- 2/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@@ -43,11 -34,8 +43,11 @@@ def build(bld)
      obj.cxxflags = [ '-fPIC' ]
      obj.name     = 'jack_audiobackend'
      obj.target   = 'jack_audiobackend'
 -    obj.uselib   = [ 'JACK' ]
 +    if Options.options.dist_target == 'mingw':
 +        obj.uselib   = [ 'JACK', 'PORTAUDIO' ]
 +    else:
 +        obj.uselib   = [ 'JACK' ]
-     obj.use      = 'ardour libpbd'
+     obj.use      = 'libardour libpbd'
      obj.vnum     = JACKBACKEND_VERSION
      obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
      obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 

diff --cc libs/surfaces/control_protocol/wscript
index 95f5624636a37a477265f010bca6ed42b0039aa7,e3092b56060471c6b22d55bc747a76597f663628..a4331e7b7657f6a4555272df093090ebc923045d
--- 1/libs/surfaces/control_protocol/wscript
--- 2/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@@ -28,10 -28,9 +28,10 @@@ def build(bld)
      obj.export_includes = ['.', './control_protocol' ]
      obj.cxxflags     = '-DPACKAGE="ardour_cp" -fPIC'
      obj.includes     = ['.', './control_protocol']
 +    obj.defines      = [ 'ARDOURCP_DLL_EXPORTS' ]
      obj.name         = 'libardour_cp'
      obj.target       = 'ardourcp'
-     obj.use          = 'ardour libtimecode'
+     obj.use          = 'libardour libtimecode'
      obj.vnum         = LIBARDOUR_CP_LIB_VERSION
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
  

diff --cc wscript
index 82a5ac8b776722d2402967c2519ef849bb3802e4,2c63cab19c2cf1808d91df9218ec58ab6f9d1c8d..2840d454b4d370dea63236de3f21613db19bdc78
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -33,7 -33,9 +33,8 @@@ children = 
          'libs/timecode',
          'libs/ardour',
          'libs/gtkmm2ext',
 -        'libs/clearlooks-newer',
          'libs/audiographer',
+         'libs/canvas',
          'gtk2_ardour',
          'export',
          'midi_maps',