merge with master and fix 2 conflicts

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/ardour_ui_options.cc
index 55314037e37265ab8b6c72d3c643dca6674d23ec,0e28900450162f28e80d063720da5aa36095d9ac..fe88d8dff5b45210887412fa9b80d2ce65bcc9b2
--- 1/gtk2_ardour/ardour_ui_options.cc
--- 2/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@@ -29,12 -29,6 +29,10 @@@
  #include "ardour/rc_configuration.h"
  #include "ardour/session.h"
  
- #include "canvas/wave_view.h"
- 
 +#ifdef HAVE_LIBLO
 +#include "ardour/osc.h"
 +#endif
 +
  #include "audio_clock.h"
  #include "ardour_ui.h"
  #include "actions.h"

diff --cc gtk2_ardour/editor.cc
Simple merge

diff --cc gtk2_ardour/editor.h
index 566586ebe4d242a930acd06bf99d57097ac9dd7f,e9269841ff442e88a499536545f0e09b8781d3cd..c427429897a511876485395b54899495b66bec17
--- 1/gtk2_ardour/editor.h
--- 2/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@@ -895,10 -924,11 +895,10 @@@ class Editor : public PublicEditor, pub
        void toggle_ruler_video (bool onoff) {ruler_video_action->set_active(onoff);}
        int videotl_bar_height; /* in units of timebar_height; default: 4 */
        int get_videotl_bar_height () const { return videotl_bar_height; }
-       void export_video ();
+       void export_video (bool range = false);
        void toggle_region_video_lock ();
  
 -      Gtk::VBox          time_button_vbox;
 -      Gtk::HBox          time_button_hbox;
 +      Gtk::VBox          time_bars_vbox;
  
        friend class EditorCursor;
  

diff --cc gtk2_ardour/editor_ops.cc
Simple merge

diff --cc gtk2_ardour/editor_videotimeline.cc
index 4bf8b047cbbbe7177ef82d7e5d8bb31fb698b2e2,7d1c009d5885abbeef0c198fcf65db85106c98e9..83a9745b893b1399f374610a447a351dc2a96c46
--- 1/gtk2_ardour/editor_videotimeline.cc
--- 2/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@@ -125,8 -138,12 +125,8 @@@ Editor::export_video (bool range
                                break;
                }
        }
-       ExportVideoDialog dialog (_session, get_selection().time);
+       ExportVideoDialog dialog (_session, get_selection().time, range);
        Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
 +      (void) r; // keep gcc quiet
        dialog.hide();
 -#if 0
 -      if (r == Gtk::RESPONSE_ACCEPT) {
 -              ARDOUR_UI::instance()->popup_error(string_compose(_("Export Successful: %1"),dialog.get_exported_filename()));
 -      }
 -#endif
  }

diff --cc gtk2_ardour/gtk_pianokeyboard.c
Simple merge

diff --cc gtk2_ardour/public_editor.h
Simple merge

diff --cc gtk2_ardour/rc_option_editor.cc
Simple merge

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/graph.cc
Simple merge

diff --cc libs/ardour/wscript
index 733900e3f604b24993d8e0353119b63a4ed73129,e91d019dd54d06f5a9357722cc6c0e9478e81bbf..25741a77fe781792575b306b7efcbf9cf835c48e
--- 1/libs/ardour/wscript
--- 2/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@@ -334,10 -328,10 +328,10 @@@ 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',
+                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
                          'OSX','BOOST','CURL','DL']
      obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                          'libvampplugin','libtaglib','librubberband',

diff --cc libs/backends/jack/wscript
Simple merge

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

diff --cc wscript
Simple merge