X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.h;h=dc014d485c888fdc11f090c4ba449e477a2a23da;hb=refs%2Fheads%2Fcarl-master;hp=48b1ab9378023fac60b605a1415e658cb030441e;hpb=d06de26a4fd828b6a0a9da8718e3b0c829a4d162;p=ardour.git diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h index 48b1ab9378..dc014d485c 100644 --- a/gtk2_ardour/editor_summary.h +++ b/gtk2_ardour/editor_summary.h @@ -1,21 +1,23 @@ /* - Copyright (C) 2009 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ + * Copyright (C) 2009-2012 Carl Hetherington + * Copyright (C) 2009-2017 Paul Davis + * Copyright (C) 2012-2017 Robin Gareus + * Copyright (C) 2017-2019 Ben Loftis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #ifndef __gtk_ardour_editor_summary_h__ #define __gtk_ardour_editor_summary_h__ @@ -49,17 +51,10 @@ private: enum Position { LEFT, - LEFT_TOP, - TOP, - RIGHT_TOP, RIGHT, - RIGHT_BOTTOM, BOTTOM, - LEFT_BOTTOM, INSIDE, - BELOW_OR_ABOVE, - TO_LEFT_OR_RIGHT, - OTHERWISE_OUTSIDE + TO_LEFT_OR_RIGHT }; void on_size_request (Gtk::Requisition *); @@ -67,52 +62,61 @@ private: bool on_button_release_event (GdkEventButton *); bool on_motion_notify_event (GdkEventMotion *); bool on_scroll_event (GdkEventScroll *); - bool on_key_press_event (GdkEventKey*); - bool on_key_release_event (GdkEventKey*); - bool on_enter_notify_event (GdkEventCrossing*); - bool on_leave_notify_event (GdkEventCrossing*); + bool on_key_press_event (GdkEventKey*); + bool on_key_release_event (GdkEventKey*); + bool on_enter_notify_event (GdkEventCrossing*); + bool on_leave_notify_event (GdkEventCrossing*); + + void reset_to_extents (); void centre_on_click (GdkEventButton *); void render (Cairo::RefPtr const&, cairo_rectangle_t*); void render_region (RegionView*, cairo_t*, double) const; - void get_editor (std::pair *, std::pair *) const; - void set_editor (double, double); - void set_editor (std::pair, double); - void set_editor (std::pair, std::pair); + void get_editor (std::pair* x, std::pair* y = NULL) const; + void set_editor (double); + void set_editor (std::pair); void set_editor_x (double); void set_editor_x (std::pair); - void set_editor_y (double); - void set_editor_y (std::pair); - void playhead_position_changed (framepos_t); - double summary_y_to_editor (double) const; + void playhead_position_changed (samplepos_t); double editor_y_to_summary (double) const; Position get_position (double, double) const; void set_cursor (Position); void route_gui_changed (PBD::PropertyChange const&); bool suspending_editor_updates () const; - double playhead_frame_to_position (framepos_t) const; - framepos_t position_to_playhead_frame_to_position (double pos) const; - void set_overlays_dirty (int, int, int, int); + double playhead_sample_to_position (samplepos_t) const; + samplepos_t position_to_playhead_sample_to_position (double pos) const; + void set_overlays_dirty_rect (int, int, int, int); + + void summary_zoom_step ( int steps ); - framepos_t _start; ///< start frame of the overview - framepos_t _end; ///< end frame of the overview + samplepos_t _start; ///< start sample of the overview + samplepos_t _end; ///< end sample of the overview - /** fraction of the session length by which the overview size should extend past the start and end markers */ - double _overhang_fraction; + samplepos_t _leftmost; ///< the earliest sample we ever viewed + samplepos_t _rightmost; ///< the latest sample we ever viewed - double _x_scale; ///< pixels per frame for the x axis of the pixmap + double _x_scale; ///< pixels per sample for the x axis of the pixmap double _track_height; double _last_playhead; std::pair _start_editor_x; - std::pair _start_editor_y; double _start_mouse_x; double _start_mouse_y; Position _start_position; bool _move_dragging; - bool _moved; + + void set_colors (); + uint32_t _phead_color; + + //used for zooming + int _last_mx; + int _last_my; + int _last_dx; + int _last_dy; + int _last_y_delta; + std::pair _view_rectangle_x; std::pair _view_rectangle_y; @@ -120,8 +124,8 @@ private: std::pair _pending_editor_y; bool _pending_editor_changed; - bool _zoom_dragging; - Position _zoom_position; + bool _zoom_trim_dragging; + Position _zoom_trim_position; bool _old_follow_playhead; cairo_surface_t* _image;