ardour/livetrax
13
0
Fork 0
Code

remove 2 more NUTEMPO warnings by use Editor::default_time_domain() appropriately (but perhaps without enough user control)

Browse Source
This commit is contained in:
Paul Davis 2021-02-13 22:23:10 -07:00
parent 433a9ebe48
commit b66b98ce58
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/editor_drag.cc
View File

@ -300,7 +300,14 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
/* we set up x/y dragging constraints on first move */ /* we set up x/y dragging constraints on first move */
_constraint_pressed = ArdourKeyboard::indicates_constraint (event->button.state); _constraint_pressed = ArdourKeyboard::indicates_constraint (event->button.state);
_raw_grab_time = timepos_t (_editor->canvas_event_sample (event, &_grab_x, &_grab_y)); const samplepos_t pos = _editor->canvas_event_sample (event, &_grab_x, &_grab_y);
if (_editor->default_time_domain() == Temporal::AudioTime) {
_raw_grab_time = timepos_t (pos);
} else {
_raw_grab_time = timepos_t (timepos_t (pos).beats());
}
_grab_button = event->button.button; _grab_button = event->button.button;
setup_pointer_offset (); setup_pointer_offset ();
@ -2598,6 +2605,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move)
if (_region) { if (_region) {
timepos_t const pos (adjusted_current_time (event).beats()); timepos_t const pos (adjusted_current_time (event).beats());
if (pos <= grab_time()) { if (pos <= grab_time()) {
_region->set_initial_position (pos); _region->set_initial_position (pos);
} }
@ -5016,8 +5024,13 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/)
_fixed_grab_x = _point->get_x() + _editor->time_to_pixel_unrounded (timepos_t (_point->line().offset())); _fixed_grab_x = _point->get_x() + _editor->time_to_pixel_unrounded (timepos_t (_point->line().offset()));
_fixed_grab_y = _point->get_y(); _fixed_grab_y = _point->get_y();
#warning NUTEMPO is it right that this forced to be samples? samplepos_t s = _editor->pixel_to_sample (_fixed_grab_x);
setup_snap_delta (timepos_t (_editor->pixel_to_sample (_fixed_grab_x)));
if (_editor->default_time_domain() == Temporal::AudioTime) {
setup_snap_delta (timepos_t (s));
} else {
setup_snap_delta (timepos_t (timepos_t (s).beats()));
}
float const fraction = 1 - (_point->get_y() / _point->line().height()); float const fraction = 1 - (_point->get_y() / _point->line().height());
show_verbose_cursor_text (_point->line().get_verbose_cursor_string (fraction)); show_verbose_cursor_text (_point->line().get_verbose_cursor_string (fraction));
@ -5530,8 +5543,7 @@ TimeFXDrag::motion (GdkEvent* event, bool)
pair<TimeAxisView*, double> const tv = _editor->trackview_by_y_position (grab_y()); pair<TimeAxisView*, double> const tv = _editor->trackview_by_y_position (grab_y());
int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second;
int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers(); int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers();
#warning NUTEMPO should this really be in samples always timepos_t pf (_editor->canvas_event_time (event) + snap_delta (event->button.state));
timepos_t pf (timepos_t (_editor->canvas_event_sample (event)) + snap_delta (event->button.state));
_editor->snap_to_with_modifier (pf, event); _editor->snap_to_with_modifier (pf, event);
pf.shift_earlier (snap_delta (event->button.state)); pf.shift_earlier (snap_delta (event->button.state));