improve sysex data display.

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 0106f343822c9ea17961fac6a10d1bfb4e5f0740..fa5ed9057a2cc67309683414c19b5b5d581dc430 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -256,7 +256,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        Selection& get_selection() const { return *selection; }
        bool get_selection_extents (framepos_t &start, framepos_t &end) const;  // the time extents of the current selection, whether Range, Region(s), Control Points, or Notes
        Selection& get_cut_buffer() const { return *cut_buffer; }
-       void track_mixer_selection ();
 
        bool extend_selection_to_track (TimeAxisView&);
 
@@ -367,8 +366,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        /* fades */
 
-       void toggle_region_fades (int dir);
-       void update_region_fade_visibility ();
+       void toggle_region_fades (int dir);
+       void update_region_fade_visibility ();
 
        /* redirect shared ops menu. caller must free returned menu */
 
@@ -453,20 +452,20 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
 
-       void snap_to (framepos_t&       first,
-                     ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                     bool              for_mark  = false,
-                     bool              ensure_snap = false);
+       void snap_to (ARDOUR::MusicFrame& first,
+                     ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
+                     bool                for_mark  = false,
+                     bool                ensure_snap = false);
 
-       void snap_to_with_modifier (framepos_t&       first,
-                                   GdkEvent const *  ev,
-                                   ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                                   bool              for_mark  = false);
+       void snap_to_with_modifier (ARDOUR::MusicFrame& first,
+                                   GdkEvent const *    ev,
+                                   ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
+                                   bool                for_mark  = false);
 
-       void snap_to (framepos_t&       first,
-                     framepos_t&       last,
-                     ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                     bool              for_mark  = false);
+       void snap_to (ARDOUR::MusicFrame& first,
+                     ARDOUR::MusicFrame& last,
+                     ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
+                     bool                for_mark  = false);
 
        void begin_selection_op_history ();
        void begin_reversible_selection_op (std::string cmd_name);
@@ -543,7 +542,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        /* editing operations that need to be public */
        void mouse_add_new_marker (framepos_t where, bool is_cd=false);
-       void split_regions_at (framepos_t, RegionSelection&, const int32_t sub_num, bool snap = true);
+       void split_regions_at (ARDOUR::MusicFrame, RegionSelection&, bool snap = true);
        void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false);
        RegionSelection get_regions_from_selection_and_mouse (framepos_t);
 
@@ -1729,7 +1728,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void compute_current_bbt_points (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, framepos_t left, framepos_t right);
 
        void tempo_map_changed (const PBD::PropertyChange&);
-       void marker_position_changed ();
+       void tempometric_position_changed (const PBD::PropertyChange&);
        void redisplay_tempo (bool immediate_redraw);
 
        uint32_t bbt_beat_subdivision;
@@ -1831,6 +1830,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void setup_midi_toolbar ();
 
+       void presentation_info_changed (PBD::PropertyChange const &);
+
        /* selection process */
 
        Selection* selection;
@@ -2151,14 +2152,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void select_next_route ();
        void select_prev_route ();
 
-       void snap_to_internal (framepos_t&       first,
-                              ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                              bool              for_mark  = false,
-                              bool              ensure_snap = false);
+       void snap_to_internal (ARDOUR::MusicFrame& first,
+                              ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
+                              bool                for_mark  = false,
+                              bool                ensure_snap = false);
 
-       void timecode_snap_to_internal (framepos_t&       first,
-                                       ARDOUR::RoundMode direction = ARDOUR::RoundNearest,
-                                       bool              for_mark  = false);
+       void timecode_snap_to_internal (ARDOUR::MusicFrame& first,
+                                       ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
+                                       bool                for_mark  = false);
 
        RhythmFerret* rhythm_ferret;
 
@@ -2221,8 +2222,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool _region_selection_change_updates_region_list;
 
        void setup_fade_images ();
-       std::map<ARDOUR::FadeShape, Gtk::Image*> _fade_in_images;
-       std::map<ARDOUR::FadeShape, Gtk::Image*> _fade_out_images;
        std::map<ARDOUR::FadeShape, Gtk::Image*> _xfade_in_images;
        std::map<ARDOUR::FadeShape, Gtk::Image*> _xfade_out_images;