diff --git a/gtk2_ardour/ardour-sae.bindings.in b/gtk2_ardour/ardour-sae.bindings.in index 7c19ac5d6a..e9e51ce50b 100644 --- a/gtk2_ardour/ardour-sae.bindings.in +++ b/gtk2_ardour/ardour-sae.bindings.in @@ -1,4 +1,4 @@ -; ardour-2.0beta11.1 GtkAccelMap rc-file -*- scheme -*- +; ardour GtkAccelMap rc-file -*- scheme -*- ; this file is an automated accelerator map dump ; ; (gtk_accel_path "/RegionList/RegionListSort" "") diff --git a/gtk2_ardour/ardour.bindings.in b/gtk2_ardour/ardour.bindings.in index f57101969f..6191944392 100644 --- a/gtk2_ardour/ardour.bindings.in +++ b/gtk2_ardour/ardour.bindings.in @@ -1,4 +1,4 @@ -; ardour-2.0beta11.1 GtkAccelMap rc-file -*- scheme -*- +; ardour GtkAccelMap rc-file -*- scheme -*- ; this file is an automated accelerator map dump ; ; (gtk_accel_path "/RegionList/RegionListSort" "") diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index b933238e11..f6e3301164 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -3310,7 +3310,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event) } if (sync_frame - sync_offset <= sync_frame) { - pending_region_position = sync_frame - (sync_dir*sync_offset); + pending_region_position = sync_frame + (sync_dir*sync_offset); } else { pending_region_position = 0; } diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index e340ac0d69..053ed782a2 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -35,7 +35,7 @@ KeyEditor::KeyEditor () view.set_headers_visible (true); view.get_selection()->set_mode (SELECTION_SINGLE); view.set_reorderable (false); - view.set_size_request (300,200); + view.set_size_request (500,300); view.set_enable_search (false); view.set_rules_hint (true); view.set_name (X_("KeyEditorTree")); diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 7956f65bd9..e824eebaf0 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -698,14 +698,16 @@ Region::adjust_to_sync (nframes_t pos) { int sync_dir; nframes_t offset = sync_offset (sync_dir); + + // cerr << "adjusting pos = " << pos << " to sync at " << _sync_position << " offset = " << offset << " with dir = " << sync_dir << endl; if (sync_dir > 0) { if (max_frames - pos > offset) { - pos += offset; + pos -= offset; } } else { if (pos > offset) { - pos -= offset; + pos += offset; } else { pos = 0; }