ardour/livetrax
13
0
Fork 0
Code

clamp setting tempo via vertical drag.

Browse Source 
- a bit suboptimal. we really need the opposite of _trackview_only
	  to prevent jumping to track canvas scrolled coordinates in the first place.
This commit is contained in:
nick_m 2016-11-01 00:40:05 +11:00
parent dca96d8b5d
commit 1d540605ac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/editor_drag.cc
View File

@ -3271,6 +3271,7 @@ MeterMarkerDrag::aborted (bool moved)
TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
: Drag (e, i) : Drag (e, i)
, _copy (c) , _copy (c)
, _grab_bpm (0.0)
, before_state (0) , before_state (0)
{ {
DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n"); DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n");
@ -3278,6 +3279,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
_marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker")); _marker = reinterpret_cast<TempoMarker*> (_item->get_data ("marker"));
_real_section = &_marker->tempo(); _real_section = &_marker->tempo();
_movable = _real_section->movable(); _movable = _real_section->movable();
_grab_bpm = _real_section->beats_per_minute();
assert (_marker); assert (_marker);
} }
@ -3357,9 +3359,8 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
if (ArdourKeyboard::indicates_constraint (event->button.state)) { if (ArdourKeyboard::indicates_constraint (event->button.state)) {
/* use vertical movement to alter tempo .. should be log */ /* use vertical movement to alter tempo .. should be log */
double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0); double new_bpm = max (1.5, _grab_bpm + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0));
stringstream strs; stringstream strs;
_editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type())); _editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type()));
strs << new_bpm; strs << new_bpm;
show_verbose_cursor_text (strs.str()); show_verbose_cursor_text (strs.str());

1
gtk2_ardour/editor_drag.h
View File

@ -745,6 +745,7 @@ private:
bool _copy; bool _copy;
bool _movable; bool _movable;
double _grab_bpm;
XMLNode* before_state; XMLNode* before_state;
}; };