Merge branch 'master' into windows+cc

Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

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_videotimeline.cc
index 1da9fb4f1983be0a25c11431c7c56833d864748a,7d1c009d5885abbeef0c198fcf65db85106c98e9..2526d7c16a3cc9190c2aea2528ca30d142986b5a
--- 1/gtk2_ardour/editor_videotimeline.cc
--- 2/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@@ -127,8 -138,12 +127,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/export_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/plugin_ui.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/public_editor.h
Simple merge

diff --cc gtk2_ardour/window_manager.h
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

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

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

diff --cc libs/ardour/test/test_common.cc
Simple merge

diff --cc libs/ardour/test/test_common.h
index 10bfdbc694d6e50f1ec80ded2d422db616098927,91fd066ac2e72e82f9ce13ec5f626c305c3990d8..bfda5435086d59d3fac1519784a1713815da21b3
--- 1/libs/ardour/test/test_common.h
--- 2/libs/ardour/test/test_common.h
+++ b/libs/ardour/test/test_common.h
@@@ -21,8 -21,10 +21,10 @@@
  
  #include "pbd/search_path.h"
  
 -PBD::SearchPath test_search_path ();
 +PBD::Searchpath test_search_path ();
  
- std::string new_test_output_dir ();
+ std::string new_test_output_dir (std::string prefix = "");
+ 
+ int get_test_sample_rate ();
  
  #endif

diff --cc libs/ardour/wscript
Simple merge

diff --cc libs/backends/jack/jack_utils.cc
Simple merge