Merge branch 'master' into windows+cc

Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
index 2f609076b6391ec61a662bc9f2f479be1ca41dca,191df0d31db408b35ecc0112c9a75026c6f229a3..b80da9a94cdd812079672ffbe81105cfa3bd6ad5
--- 1/gtk2_ardour/ardour_ui.h
--- 2/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@@ -78,32 -78,31 +78,35 @@@
  #include "visibility_group.h"
  #include "window_manager.h"
  
 -class About;
 -class AddRouteDialog;
 -class AddVideoDialog;
 +#include "add_route_dialog.h"
 +#include "add_video_dialog.h"
 +#include "big_clock_window.h"
 +#include "bundle_manager.h"
 +#include "global_port_matrix.h"
 +#include "keyeditor.h"
 +#include "location_ui.h"
 +#include "rc_option_editor.h"
 +#include "route_params_ui.h"
 +#include "session_option_editor.h"
 +#include "speaker_dialog.h"
 +#include "theme_manager.h"
 +
  class VideoTimeLine;
  class SystemExec;
- class ArdourStartup;
  class ArdourKeyboard;
  class AudioClock;
 -class BigClockWindow;
 -class BundleManager;
  class ButtonJoiner;
  class ConnectionEditor;
  class EngineControl;
  class MainClock;
  class Mixer_UI;
  class PublicEditor;
+ class RCOptionEditor;
+ class RouteParams_UI;
+ class SessionDialog;
+ class SessionOptionEditor;
  class ShuttleControl;
  class Splash;
 -class SpeakerDialog;
 -class ThemeManager;
  class TimeInfoBox;
  class MidiTracer;
  class LevelMeterHBox;

diff --cc gtk2_ardour/ardour_ui_options.cc
Simple merge

diff --cc gtk2_ardour/audio_clock.cc
Simple merge

diff --cc gtk2_ardour/editor_ops.cc
Simple merge

diff --cc gtk2_ardour/export_video_dialog.cc
index f1179a66350878cd0d2b292890edaae7bae1094a,dd08b586611aa2854b5419f11bf306255581aad5..8b7ad865c725f5889fe0b0c0338950b6e6017f4c
--- 1/gtk2_ardour/export_video_dialog.cc
--- 2/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@@ -28,10 -28,7 +28,9 @@@
  #include <fcntl.h>
  
  #include <sigc++/bind.h>
- #include <libgen.h>
  
 +#include <glib/gstdio.h>
 +
  #include "pbd/error.h"
  #include "pbd/convert.h"
  #include "gtkmm2ext/utils.h"

diff --cc gtk2_ardour/gtk_pianokeyboard.c
Simple merge

diff --cc gtk2_ardour/main.cc
Simple merge

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/plugin_selector.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/rc_option_editor.cc
Simple merge

diff --cc gtk2_ardour/sfdb_ui.cc
Simple merge

diff --cc gtk2_ardour/transcode_video_dialog.cc
index 9f18e85b64880e1002d43ae5cb7edf8cb6479a50,6e4a1a3298ad6c90560110913e82fa28e36ffde7..3963bb6cd3f2c59b613cb7de45b38de4f38dcdbf
--- 1/gtk2_ardour/transcode_video_dialog.cc
--- 2/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@@ -28,10 -28,7 +28,9 @@@
  #include <fcntl.h>
  
  #include <sigc++/bind.h>
- #include <libgen.h>
  
 +#include <glib/gstdio.h>
 +
  #include "pbd/error.h"
  #include "pbd/convert.h"
  #include "gtkmm2ext/utils.h"

diff --cc gtk2_ardour/utils.cc
Simple merge

diff --cc gtk2_ardour/utils.h
Simple merge

diff --cc gtk2_ardour/video_monitor.cc
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

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

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

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

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

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

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

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

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

diff --cc libs/ardour/wscript
index e8c9fb8328a7f9aace1a07b31684c4e7f11b9789,0fd5c4e80f0dbbe2f310eb0fa66a4baa4c2eddd4..6e57c455fa6f9535744f0e72b349e385697fd9c0
--- 1/libs/ardour/wscript
--- 2/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@@ -104,10 -104,8 +105,9 @@@ libardour_sources = 
          'interpolation.cc',
          'io.cc',
          'io_processor.cc',
-         'jack_slave.cc',
          'kmeterdsp.cc',
          'ladspa_plugin.cc',
 +        'ladspa_search_path.cc',
          'location.cc',
          'location_importer.cc',
          'ltc_slave.cc',
@@@ -340,14 -334,14 +340,14 @@@ 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']
+                         'libaudiographer','libltc','libtimecode']
      obj.vnum         = LIBARDOUR_LIB_VERSION
      obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
      obj.defines      = [

diff --cc libs/pbd/stacktrace.cc
Simple merge

diff --cc wscript
Simple merge