X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.h;h=b96f67ab6b5ca5014d7ce415857e096eab0c9c28;hb=69d043766f3e0f4715f6c9b32afa93069de7df61;hp=57e72393fad0053ff141b9f90f808a8802e24626;hpb=73f3e479d363ef35bb12a89b61d21609a7428e19;p=ardour.git

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 57e72393fa..b96f67ab6b 100644
--- 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;
@@ -428,6 +433,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	                Editing::ImportDisposition            disposition,
 	                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>());
 
@@ -565,6 +572,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 {
@@ -617,6 +626,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 &);
@@ -1009,7 +1019,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);
 
@@ -1044,7 +1055,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;
@@ -1304,8 +1314,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void loop_location (ARDOUR::Location&);
 
 	void calc_extra_zoom_edges(framepos_t &start, framepos_t &end);
-	void temporal_zoom_selection (bool both_axes = false);
-	void temporal_zoom_region (bool both_axes);
+	void temporal_zoom_selection (Editing::ZoomAxis);
 	void temporal_zoom_session ();
 	void temporal_zoom (framecnt_t samples_per_pixel);
 	void temporal_zoom_by_frame (framepos_t start, framepos_t end);
@@ -1412,7 +1421,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 ();
@@ -1656,6 +1665,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void edit_meter_marker (MeterMarker&);
 	void edit_control_point (ArdourCanvas::Item*);
 	void edit_notes (MidiRegionView*);
+	void edit_region (RegionView*);
+
+	void edit_current_meter ();
+	void edit_current_tempo ();
 
 	void marker_menu_edit ();
 	void marker_menu_remove ();
@@ -1685,7 +1698,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);
@@ -1802,6 +1815,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();
 
@@ -1810,9 +1825,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 ();
 
@@ -1839,8 +1851,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 ();