merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

Still need to add API export/visibility macros for the canvas library.

diff --cc gtk2_ardour/ardour_ui_dialogs.cc
index b0ac528b794ace1d5f5b0b9290f85ffbf2443742,fda86fe4ad5480c131f296309a86b14f0b37c06a..d127c40343ca7145c3d22210cb508b6182b17915
--- 1/gtk2_ardour/ardour_ui_dialogs.cc
--- 2/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@@ -227,8 -227,11 +232,8 @@@ ARDOUR_UI::set_session (Session *s
                        transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
                        meter_box.show();
                        editor_meter_peak_display.show();
 -              } else if (meter_box.get_parent()) {
 -                      transport_tearoff_hbox.remove (meter_box);
 -                      transport_tearoff_hbox.remove (editor_meter_peak_display);
                }
-       } 
+       }
  }
  
  int

diff --cc gtk2_ardour/wscript
index 28a8ad5b5a900d33b8a2db51fec4af5060de07db,417814fbb4acc7e6e1948eda1cc1ad3bdbe99768..a6ead1adb9cf6a5a31fd10380051bdbaa3a0b20d
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -406,33 -408,28 +407,30 @@@ def build(bld)
                       'libardour_cp',
                       'libtimecode',
                       'libmidipp',
 -                     'libgtk2_ardour',
                       'libgtkmm2ext',
 +                     'libcanvas',
                       ]
  
-     # continue with setup of obj, which could be a shared library
-     # or an executable.
- 
 -    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 -    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
 -    obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
 -    obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
 -    if bld.is_defined('USE_EXTERNAL_LIBS'):
 -        obj.uselib += ' TAGLIB'
 -    else:
 -        obj.use.append('libtaglib')
 -    if sys.platform == 'darwin':
 -        obj.use += ' libappleutility'
 -    obj.defines     += [
++    obj.defines = [
+         'PACKAGE="' + I18N_PACKAGE + '"',
+         'VERSIONSTRING="' + bld.env['VERSION'] + '"',
+         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
+         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
+         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
+         'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
+         ]
 +    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 +    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
-     obj.uselib       += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F'
++    obj.uselib       += ' GTKMM CANVAS FFTW3F'
 +    obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
 +
 +    if bld.is_defined('USE_EXTERNAL_LIBS'):
 +        obj.uselib += ' TAGLIB'
 +    else:
 +        obj.use += ('libtaglib')
 +    if sys.platform == 'darwin':
 +        obj.uselib += ' AUDIOUNITS OSX GTKOSX'
 +        obj.use    += ' libappleutility'
-     obj.defines     = [
-         'PACKAGE="' + I18N_PACKAGE + '"',
-         'VERSIONSTRING="' + bld.env['VERSION'] + '"',
-         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
-         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
-         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
-         'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'
-         ]
      obj.includes += ['../libs']
  
      if bld.is_defined('HAVE_SUIL'):

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

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

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

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

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

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

diff --cc libs/ardour/ardour/slave.h
index 364929eaabf323c98af7e0a5af67216e4ddbb132,cb1e3650c5d04c3d8177acdce747b3b012f1596e..7e80055f945a5c74800cfc4f45ce258ccb7535ab
--- 1/libs/ardour/ardour/slave.h
--- 2/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@@ -180,17 -181,15 +181,17 @@@ class LIBARDOUR_API Slave 
  };
  
  /// We need this wrapper for testability, it's just too hard to mock up a session class
- class ISlaveSessionProxy {
+ class LIBARDOUR_API ISlaveSessionProxy {
    public:
        virtual ~ISlaveSessionProxy() {}
 -      virtual TempoMap&  tempo_map()                 const   { return *((TempoMap *) 0); }
 -      virtual framecnt_t frame_rate()                const   { return 0; }
 -      virtual framepos_t audible_frame ()            const   { return 0; }
 -      virtual framepos_t transport_frame ()          const   { return 0; }
 -      virtual pframes_t  frames_since_cycle_start () const   { return 0; }
 -      virtual framepos_t frame_time ()               const   { return 0; }
 +      virtual TempoMap&  tempo_map()                  const   { return *((TempoMap *) 0); }
 +      virtual framecnt_t frame_rate()                 const   { return 0; }
 +      virtual pframes_t  frames_per_cycle()           const   { return 0; }
 +      virtual framepos_t audible_frame ()             const   { return 0; }
 +      virtual framepos_t transport_frame ()           const   { return 0; }
 +      virtual pframes_t  frames_since_cycle_start ()  const   { return 0; }
 +      virtual pframes_t  sample_time_at_cycle_start() const   { return 0; }
 +      virtual framepos_t frame_time ()                const   { return 0; }
  
        virtual void request_locate (framepos_t /*frame*/, bool with_roll = false) {
                (void) with_roll;

diff --cc libs/ardour/ardour/utils.h
index 4bf97fd2e56de70d4ea943b4f7b1beaf68574a34,f0030557e92c7f85975521fa4824ab6f5e355a0f..6dba01c79754b9782d41956b709a9f8806ae1e20
--- 1/libs/ardour/ardour/utils.h
--- 2/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@@ -54,23 -55,22 +55,23 @@@ static inline float f_max(float x, floa
        return (x);
  }
  
- std::string bump_name_once(const std::string& s, char delimiter);
+ LIBARDOUR_API std::string bump_name_once(const std::string& s, char delimiter);
  
- int cmp_nocase (const std::string& s, const std::string& s2);
- int cmp_nocase_utf8 (const std::string& s1, const std::string& s2);
+ LIBARDOUR_API int cmp_nocase (const std::string& s, const std::string& s2);
++LIBARDOUR_API int cmp_nocase_utf8 (const std::string& s1, const std::string& s2);
  
- int touch_file(std::string path);
+ LIBARDOUR_API int touch_file(std::string path);
  
- std::string region_name_from_path (std::string path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
- bool path_is_paired (std::string path, std::string& pair_base);
+ LIBARDOUR_API std::string region_name_from_path (std::string path, bool strip_channels, bool add_channel_suffix = false, uint32_t total = 0, uint32_t this_one = 0);
+ LIBARDOUR_API bool path_is_paired (std::string path, std::string& pair_base);
  
- void compute_equal_power_fades (ARDOUR::framecnt_t nframes, float* in, float* out);
+ LIBARDOUR_API void compute_equal_power_fades (ARDOUR::framecnt_t nframes, float* in, float* out);
  
- const char* sync_source_to_string (ARDOUR::SyncSource src, bool sh = false);
- ARDOUR::SyncSource string_to_sync_source (std::string str);
+ LIBARDOUR_API const char* sync_source_to_string (ARDOUR::SyncSource src, bool sh = false);
+ LIBARDOUR_API ARDOUR::SyncSource string_to_sync_source (std::string str);
  
- const char* edit_mode_to_string (ARDOUR::EditMode);
- ARDOUR::EditMode string_to_edit_mode (std::string);
+ LIBARDOUR_API const char* edit_mode_to_string (ARDOUR::EditMode);
+ LIBARDOUR_API ARDOUR::EditMode string_to_edit_mode (std::string);
  
  #undef  OLD_GAIN_MATH
  #define OLD_GAIN_MATH

diff --cc libs/ardour/wscript
Simple merge

diff --cc libs/audiographer/audiographer/debuggable.h
Simple merge

diff --cc libs/gtkmm2ext/gtkmm2ext/utils.h
index e7c36d19e01f5f70f4df6f531dc1f21c754926a8,e0c4dcdb2d15995546a995adc7529dce3b40cb3d..c672afd75cd239c76542ed9d0d2c1f90939faf21
--- 1/libs/gtkmm2ext/gtkmm2ext/utils.h
--- 2/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@@ -31,7 -30,10 +31,9 @@@
  #include <gtkmm/treeview.h>
  #include <gdkmm/window.h> /* for WMDecoration */
  #include <gdkmm/pixbuf.h>
 -#include <pangomm/fontdescription.h>
  
+ #include "gtkmm2ext/visibility.h"
+ 
  namespace Cairo {
          class Context;
  }
@@@ -105,21 -107,19 +107,21 @@@ namespace Gtkmm2ext 
  
        /* C API for rounded rectangles */
  
-         void rounded_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-         void rounded_top_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-         void rounded_top_left_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-         void rounded_top_right_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-       void rounded_top_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-       void rounded_bottom_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
-       void rounded_right_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+         LIBGTKMM2EXT_API void rounded_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+         LIBGTKMM2EXT_API void rounded_top_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+         LIBGTKMM2EXT_API void rounded_top_left_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+         LIBGTKMM2EXT_API void rounded_top_right_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+       LIBGTKMM2EXT_API void rounded_top_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+       LIBGTKMM2EXT_API void rounded_bottom_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
+       LIBGTKMM2EXT_API void rounded_right_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
  
-       Gtk::Label* left_aligned_label (std::string const &);
+       LIBGTKMM2EXT_API Gtk::Label* left_aligned_label (std::string const &);
  
-       void set_no_tooltip_whatsoever (Gtk::Widget &);
-       void enable_tooltips ();
-       void disable_tooltips ();
+       LIBGTKMM2EXT_API void set_no_tooltip_whatsoever (Gtk::Widget &);
+       LIBGTKMM2EXT_API void enable_tooltips ();
+       LIBGTKMM2EXT_API void disable_tooltips ();
 +
-       void convert_bgra_to_rgba (guint8 const *, guint8 * dst, int, int);
++      LIBGTKMM2EXT_API void convert_bgra_to_rgba (guint8 const *, guint8 * dst, int, int);
  };
  
  #endif /*  __gtkmm2ext_utils_h__ */

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

diff --cc libs/pbd/pbd/stacktrace.h
index f3c7baf7d78fb6bb72dfec10d2b1ac2f5460244a,c4381bc0ed197aaf55e26de606fc241a326c5377..fbb92c8fa0c34544ae4a77325ad09ec0f47cddd1
--- 1/libs/pbd/pbd/stacktrace.h
--- 2/libs/pbd/pbd/stacktrace.h
+++ b/libs/pbd/pbd/stacktrace.h
@@@ -34,13 -34,15 +34,17 @@@
  #include <cstdlib>
  #endif
  
+ #include "pbd/libpbd_visibility.h"
+ 
+ 
  namespace PBD {
-       void stacktrace (std::ostream& out, int levels = 0);
-       void trace_twb();
-       std::string demangle (const std::string&);
++
+       LIBPBD_API void stacktrace (std::ostream& out, int levels = 0);
+       LIBPBD_API void trace_twb();
++      LIBPBD_API std::string demangle (const std::string&);
  
  template<typename T>
- class thing_with_backtrace 
+ class LIBPBD_API thing_with_backtrace 
  {
    public:
      thing_with_backtrace () {

diff --cc libs/surfaces/control_protocol/control_protocol/control_protocol.h
Simple merge

diff --cc libs/surfaces/control_protocol/wscript
index e3092b56060471c6b22d55bc747a76597f663628,7c53bbfb17cb57457e93ebde70f9cb494e5651f2..235c6c06cba224f518c1af4db9533c26aed518c1
--- 1/libs/surfaces/control_protocol/wscript
--- 2/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@@ -30,7 -41,7 +41,7 @@@ def build(bld)
      obj.includes     = ['.', './control_protocol']
      obj.name         = 'libardour_cp'
      obj.target       = 'ardourcp'
-     obj.use          = 'libardour libtimecode'
 -    obj.use          = 'ardour'
++    obj.use          = 'libardour'
      obj.vnum         = LIBARDOUR_CP_LIB_VERSION
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
  

diff --cc libs/surfaces/mackie/mackie_control_protocol.h
Simple merge