merge with master

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/editor.h
index 0647b1708916ee38203a205f08ebae0b41a60781,6c0a52fa4278270928e5ad06dc9db7e3b5962233..e7fcc11a3f33c0e366795b8fd0998f5b48993fbd
--- 1/gtk2_ardour/editor.h
--- 2/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@@ -57,7 -61,14 +57,6 @@@
  #include "enums.h"
  #include "editor_items.h"
  #include "region_selection.h"
- #include "window_proxy.h"
 -#include "canvas.h"
 -
 -namespace Gnome {
 -      namespace Canvas {
 -              class NoEventText;
 -              class CanvasNoteEvent;
 -      }
 -}
  
  namespace Gtkmm2ext {
        class TearOff;

diff --cc gtk2_ardour/shuttle_control.cc
Simple merge

diff --cc gtk2_ardour/video_image_frame.cc
index c892bacfa684f72abb6e83919743156692eb96bb,46fd64413dec6e4881414280b4429da078ab0faa..e9520634bb14ce81f4521ab74ffb2f9d7694781e
--- 1/gtk2_ardour/video_image_frame.cc
--- 2/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@@ -249,11 -245,11 +249,11 @@@ VideoImageFrame::http_download_done (ch
        }
  
        exposeimg();
 -      /* don't request frames too quickly, wait after user has zoomed */
 -      usleep(40000);
 +      /* don't request frames rapidly, wait after user has zoomed */
 +      usleep(20000);
  
        if (queued_request) {
-               http_maybe_get_again();
+               http_get_again(want_video_frame_number);
        }
        pthread_mutex_unlock(&request_lock);
  }

diff --cc gtk2_ardour/video_image_frame.h
Simple merge

diff --cc gtk2_ardour/wscript
index 90417bf2c18bb61201e5a784d798e3828c47d5b8,0cd0f338fb3d861ba1614421ff9b4e665213fb49..c473a4569bf4b43a92fe7862d54eb216476bb4f2
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -52,8 -52,18 +52,9 @@@ gtk2_ardour_sources = 
          'automation_streamview.cc',
          'automation_time_axis.cc',
          'axis_view.cc',
+         'big_clock_window.cc',
          'bundle_manager.cc',
          'button_joiner.cc',
 -        'canvas-flag.cc',
 -        'canvas-hit.cc',
 -        'canvas-note-event.cc',
 -        'canvas-note.cc',
 -        'canvas_patch_change.cc',
 -        'canvas-simpleline.c',
 -        'canvas-simplerect.c',
 -        'canvas-sysex.cc',
 -        'canvas-waveview.c',
          'clock_group.cc',
          'configinfo.cc',
          'control_point.cc',
@@@ -233,7 -242,8 +234,7 @@@
          'version.cc',
          'visibility_group.cc',
          'volume_controller.cc',
-         'window_proxy.cc',
 -        'waveview.cc',
+         'window_manager.cc',
  # video-timeline related sources:
          'video_image_frame.cc',
          'add_video_dialog.cc',