prepare for musical-time preroll

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 84d4bd90d474fcfadc5f6da40512af60823b1343..14151b95ff67db0b019cf57a416ccf0295d869bb 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -67,6 +67,10 @@ namespace Gtkmm2ext {
        class Bindings;
 }
 
+namespace Evoral {
+       class SMF;
+}
+
 namespace ARDOUR {
        class AudioPlaylist;
        class AudioRegion;
@@ -130,6 +134,7 @@ class SoundFileOmega;
 class StreamView;
 class TempoLines;
 class TimeAxisView;
+class TimeInfoBox;
 class TimeFXDialog;
 class TimeSelection;
 class RegionLayeringOrderEditor;
@@ -256,9 +261,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool extend_selection_to_track (TimeAxisView&);
 
        void play_selection ();
-       framepos_t get_preroll ();
+       framepos_t get_preroll (framepos_t);
        void maybe_locate_with_edit_preroll (framepos_t);
        void play_with_preroll ();
+       void rec_with_preroll ();
        void select_all_in_track (Selection::Operation op);
        void select_all_objects (Selection::Operation op);
        void invert_selection_in_track ();
@@ -429,6 +435,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
                        Editing::ImportMode                   mode,
                        ARDOUR::SrcQuality                    quality,
                        ARDOUR::MidiTrackNameSource           mts,
+                       ARDOUR::MidiTempoMapDisposition       mtd,
                        framepos_t&                           pos,
                        boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
 
@@ -566,6 +573,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        PlaylistSelector* _playlist_selector;
 
+       TimeInfoBox*      _time_info_box;
+
        typedef std::pair<TimeAxisView*,XMLNode*> TAVState;
 
        struct VisualState {
@@ -618,6 +627,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        boost::optional<float>  pre_notebook_shrink_pane_width;
 
+       Gtk::VBox _editor_list_vbox;
        Gtk::Notebook _the_notebook;
        bool _notebook_shrunk;
        void add_notebook_page (std::string const &, Gtk::Widget &);
@@ -646,6 +656,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void toggle_marker_lines ();
        void set_marker_line_visibility (bool);
 
+       void jump_forward_to_mark ();
+       void jump_backward_to_mark ();
+
        uint32_t location_marker_color;
        uint32_t location_range_color;
        uint32_t location_loop_color;
@@ -1010,7 +1023,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        friend class EditorCursor;
 
-       EditorCursor*        playhead_cursor;
+       EditorCursor* playhead_cursor;
+       framepos_t playhead_cursor_sample () const;
 
        framepos_t get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, bool only_onscreen);
 
@@ -1045,7 +1059,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        Gtk::HBox           toplevel_hpacker;
 
-       Gtk::HBox           top_hbox;
        Gtk::HBox           bottom_hbox;
 
        Gtk::Table          edit_packer;
@@ -1328,8 +1341,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        /* import & embed */
 
        void add_external_audio_action (Editing::ImportMode);
-       void external_audio_dialog ();
-       void session_import_dialog ();
 
        int  check_whether_and_how_to_import(std::string, bool all_or_nothing = true);
        bool check_multichannel_status (const std::vector<std::string>& paths);
@@ -1392,6 +1403,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        AnalysisWindow* analysis_window;
 
+       /* import & embed */
+       void external_audio_dialog ();
+       void session_import_dialog ();
+
        /* import specific info */
 
        struct EditorImportStatus : public ARDOUR::ImportStatus {
@@ -1412,7 +1427,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void import_audio (bool as_tracks);
        void do_import (std::vector<std::string> paths, bool split, bool as_tracks);
-
+       void import_smf_tempo_map (Evoral::SMF const &, framepos_t pos);
        void move_to_start ();
        void move_to_end ();
        void center_playhead ();
@@ -1430,8 +1445,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void clear_locations ();
        void unhide_markers ();
        void unhide_ranges ();
-       void jump_forward_to_mark ();
-       void jump_backward_to_mark ();
        void cursor_align (bool playhead_to_edit);
        void toggle_skip_playback ();
 
@@ -1689,7 +1702,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
-       void build_range_marker_menu (bool, bool);
+       void build_range_marker_menu (ARDOUR::Location *, bool, bool);
        void build_marker_menu (ARDOUR::Location *);
        void build_tempo_marker_menu (TempoMarker *, bool);
        void build_meter_marker_menu (MeterMarker *, bool);
@@ -1806,6 +1819,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        Glib::RefPtr<Gtk::RadioAction> zoom_focus_action (Editing::ZoomFocus);
 
+       Gtk::HBox           _track_box;
+
        Gtk::HBox           _zoom_box;
        void                zoom_adjustment_changed();
 
@@ -1814,9 +1829,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void setup_tooltips ();
 
        Gtk::HBox                toolbar_hbox;
-       Gtk::EventBox            toolbar_base;
-       Gtk::Frame               toolbar_frame;
-       Gtk::Viewport           _toolbar_viewport;
 
        void setup_midi_toolbar ();
 
@@ -1843,8 +1855,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void point_selection_changed ();
        void marker_selection_changed ();
 
-       bool _ignore_follow_edits;
-
        void cancel_selection ();
        void cancel_time_selection ();