merge with master

diff --cc gtk2_ardour/editor.h
Simple merge

diff --cc gtk2_ardour/editor_actions.cc
Simple merge

diff --cc gtk2_ardour/editor_mouse.cc
index e75d51313e3d8ae9f4caab6d53af6289a2513f92,be716d64d0015557240c85e3cbce75291ec8409a..cb23e7d2d127f495a401bab5b383822b139d2e4e
--- 1/gtk2_ardour/editor_mouse.cc
--- 2/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@@ -2623,9 -2592,11 +2617,8 @@@ Editor::add_region_drag (ArdourCanvas::
        if (Config->get_edit_mode() == Splice) {
                _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer()));
        } else {
-               RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id);
-               _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false));
+               _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, false));
        }
 -
 -      /* sync the canvas to what we think is its current state */
 -      update_canvas_now();
  }
  
  void

diff --cc gtk2_ardour/gain_meter.cc
Simple merge

diff --cc gtk2_ardour/public_editor.h
Simple merge

diff --cc gtk2_ardour/route_time_axis.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
index 264b868d63fbb46c54afb1fb3ddba45b84212e3f,2c265365faa9d786f6ad7e8bf8e938e18ba767ea..3f69eea6e628dbd62e84f5d7fa9c044ad5d68f51
--- 1/gtk2_ardour/video_monitor.cc
--- 2/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@@ -436,12 -490,14 +490,14 @@@ VideoMonitor::set_offset (ARDOUR::frame
  
        /* Note: pull-up/down are applied here: frame_rate() vs. nominal_frame_rate() */
        if (_session->config.get_use_video_file_fps()) {
 -              video_frame_offset = floor(offset * fps / audio_frame_rate);
 +              video_frame_offset = floor(offset * fps / audio_sample_rate);
        } else {
 -              video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_frame_rate);
 +              video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_sample_rate);
        }
  
-       // TODO remember if changed..
+       if (video_offset == video_frame_offset) { return; }
+       video_offset = video_frame_offset;
+ 
        std::ostringstream osstream1; osstream1 << -1 * video_frame_offset;
        process->write_to_stdin("set offset " + osstream1.str() + "\n");
  }

diff --cc gtk2_ardour/video_timeline.cc
index 3e7ef8f0a959339863b6b631489ac6ef57037709,8f68174997d494aedf95bfc1ee14ea1d4a33613d..6f2c34dd91b913dddc781391406d8b45c5ffb9d7
--- 1/gtk2_ardour/video_timeline.cc
--- 2/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@@ -423,13 -425,14 +423,14 @@@ VideoTimeLine::update_video_timeline(
                } else {
                        int vfcount=remaining.front();
                        remaining.pop_front();
-                       framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */
-                       framepos_t vframeno = rint ((vfpos - GOFFSET) / apv);  /* unit: video-frames */
+                       framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */
+                       framepos_t vframeno = rint ((vfpos - video_offset) / apv);  /* unit: video-frames */
                        int rightend = -1; /* unit: pixels */
-                       if (vfpos + vtl_dist > video_start_offset + video_duration + GOFFSET) {
-                               rightend = display_vframe_width * (video_start_offset + video_duration + GOFFSET - vfpos) / vtl_dist;
+                       if (vfpos + vtl_dist > video_start_offset + video_duration + video_offset) {
+                               rightend = display_vframe_width * (video_start_offset + video_duration + video_offset - vfpos) / vtl_dist;
+                               //printf("lf(n): %lu\n", vframeno); // XXX
                        }
 -                      frame->set_position(vfpos-leftmost_frame);
 +                      frame->set_position(vfpos);
                        frame->set_videoframe(vframeno, rightend);
                }
        }

diff --cc gtk2_ardour/video_timeline.h
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

diff --cc libs/ardour/wscript
Simple merge

diff --cc wscript
Simple merge