diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-21 19:15:08 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-03 16:11:24 -0400 |
| commit | da7a86025626a022b141d37623f3c16ef21a34a6 (patch) | |
| tree | 7df4c8f8961c73c7e3dc2fb5fc6e17b08df1be2c /gtk2_ardour/editor.h | |
| parent | bf7b35388b245f894c4ef739d5231a82ef1448dc (diff) | |
remove useless groups from timebar area, clarify scroll group naming in editor
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 9f71ec620f..daa417543b 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -446,9 +446,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD _stepping_axis_view = v; } - ArdourCanvas::Group* get_trackview_group () const { return _trackview_group; } - ArdourCanvas::Group* get_time_bars_group () const; - ArdourCanvas::Group* get_track_canvas_group () const; + ArdourCanvas::Group* get_trackview_group () const { return _trackview_group; } + ArdourCanvas::Group* get_hscroll_group () const { return h_scroll_group; } + ArdourCanvas::Group* get_vscroll_group () const { return v_scroll_group; } + ArdourCanvas::Group* get_hvscroll_group () const { return hv_scroll_group; } + ArdourCanvas::GtkCanvasViewport* get_track_canvas () const; void override_visible_track_count (); @@ -707,11 +709,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::EventBox time_bars_event_box; Gtk::EventBox ruler_label_event_box; - ArdourCanvas::Group *minsec_group; ArdourCanvas::Pixbuf *logo_item; +#if 0 + /* these will be needed when we have canvas rulers */ + ArdourCanvas::Group *minsec_group; ArdourCanvas::Group *bbt_group; ArdourCanvas::Group *timecode_group; ArdourCanvas::Group *frame_group; +#endif + ArdourCanvas::Group *tempo_group; ArdourCanvas::Group *meter_group; ArdourCanvas::Group *marker_group; @@ -722,13 +728,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* parent for groups which themselves contain time markers */ ArdourCanvas::Group* _time_markers_group; - ArdourCanvas::Group* meter_bar_group; - ArdourCanvas::Group* tempo_bar_group; - ArdourCanvas::Group* marker_bar_group; - ArdourCanvas::Group* range_marker_bar_group; - ArdourCanvas::Group* transport_marker_bar_group; - ArdourCanvas::Group* cd_marker_bar_group; - /* The group containing all other groups that are scrolled vertically and horizontally. */ |