smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Editor Summary: implement summary_zoom_step() to lessen redundant code.

Browse source
This commit is contained in:
Ben Loftis 2017-07-19 08:12:25 -05:00
parent 1955ff3ad2
commit 255d633edd
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gtk2_ardour/editor_summary.cc
View file

@ -544,6 +544,25 @@ EditorSummary::set_cursor (Position p)
} }
} }
void
EditorSummary::summary_zoom_step ( int steps /* negative steps to zoom "out" , positive steps to zoom "in" */ )
{
pair<double, double> xn;
get_editor (&xn);
// {
// xn.first = (_editor->leftmost_sample () - _start) * _x_scale;
// xn.second = xn.first + _editor->current_page_samples() * _x_scale;
// }
xn.first += steps;
xn.second -= steps;
set_overlays_dirty ();
set_editor_x (xn);
}
bool bool
EditorSummary::on_motion_notify_event (GdkEventMotion* ev) EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
{ {
@ -570,14 +589,7 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
double const dy = ev->y - _zoom_last_y; double const dy = ev->y - _zoom_last_y;
pair<double, double> xn; summary_zoom_step( dy );
get_editor (&xn);
xn.first -= dy;
xn.second += dy;
set_overlays_dirty ();
set_editor_x (xn);
_zoom_last_y = ev->y; _zoom_last_y = ev->y;
@ -675,29 +687,15 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
switch (ev->direction) { switch (ev->direction) {
case GDK_SCROLL_UP: { case GDK_SCROLL_UP: {
//ToDo: use function summary_zoom_in/out
pair<double, double> xn; summary_zoom_step( -2 );
get_editor (&xn);
xn.first += 2;
xn.second -= 2;
set_overlays_dirty ();
set_editor_x (xn);
return true; return true;
} break; } break;
case GDK_SCROLL_DOWN: { case GDK_SCROLL_DOWN: {
pair<double, double> xn;
get_editor (&xn);
xn.first -= 2; summary_zoom_step( 2 );
xn.second += 2;
set_overlays_dirty ();
set_editor_x (xn);
return true; return true;
} break; } break;

2
gtk2_ardour/editor_summary.h
View file

@ -83,6 +83,8 @@ private:
framepos_t position_to_playhead_frame_to_position (double pos) const; framepos_t position_to_playhead_frame_to_position (double pos) const;
void set_overlays_dirty (int, int, int, int); void set_overlays_dirty (int, int, int, int);
void summary_zoom_step ( int steps );
framepos_t _start; ///< start frame of the overview framepos_t _start; ///< start frame of the overview
framepos_t _end; ///< end frame of the overview framepos_t _end; ///< end frame of the overview