Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b2e1a380341322797f4392503116186bdddba4cf..ebd735e335ef439f346eb794c6730fe99cf487b9 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -76,7 +76,6 @@ namespace Gtkmm2ext {
 }
 
 namespace ARDOUR {
-       class AudioDiskstream;
        class RouteGroup;
        class Playlist;
        class AudioPlaylist;
@@ -217,17 +216,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void consider_auditioning (boost::shared_ptr<ARDOUR::Region>);
        void hide_a_region (boost::shared_ptr<ARDOUR::Region>);
-       void remove_a_region (boost::shared_ptr<ARDOUR::Region>);
+       void show_a_region (boost::shared_ptr<ARDOUR::Region>);
 
 #ifdef USE_RUBBERBAND
        std::vector<std::string> rb_opt_strings;
 #endif
 
-       /* option editor-access */
-
-       void set_show_waveforms_recording (bool yn);
-       bool show_waveforms_recording() const { return _show_waveforms_recording; }
-
        /* things that need to be public to be used in the main menubar */
 
        void new_region_from_selection ();
@@ -367,7 +361,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        bool dragging_playhead () const { return _dragging_playhead; }
 
        void toggle_zero_line_visibility ();
-       void toggle_waveforms_while_recording ();
        void set_summary ();
        void set_group_tabs ();
        void toggle_measure_visibility ();
@@ -977,7 +970,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void queue_visual_change_y (double);
        void ensure_visual_change_idle_handler ();
 
-       void end_location_changed (ARDOUR::Location*);
+       void session_range_location_changed (ARDOUR::Location*);
 
        /* track views */
        TrackViewList track_views;
@@ -1098,6 +1091,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 
        void audition_region_from_region_list ();
        void hide_region_from_region_list ();
+       void show_region_in_region_list ();
 
        void align (ARDOUR::RegionPoint);
        void align_relative (ARDOUR::RegionPoint);
@@ -1161,7 +1155,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        void  drop_paths_part_two  (const std::vector<Glib::ustring>& paths, nframes64_t frame, double ypos);
 
        int  import_sndfiles (std::vector<Glib::ustring> paths, Editing::ImportMode mode,  ARDOUR::SrcQuality, nframes64_t& pos,
-                             int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool, uint32_t total);
+                             int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool);
        int  embed_sndfiles (std::vector<Glib::ustring> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode,
                             nframes64_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&);
 
@@ -1173,17 +1167,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const;
        boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const;
 
-       /* generic interthread progress window */
-
-       ArdourDialog* interthread_progress_window;
-       Gtk::Label interthread_progress_label;
-       Gtk::VBox interthread_progress_vbox;
-       Gtk::ProgressBar interthread_progress_bar;
-       Gtk::Button interthread_cancel_button;
-       Gtk::Label interthread_cancel_label;
-       sigc::connection  interthread_progress_connection;
-       void interthread_cancel_clicked ();
-       void build_interthread_progress_window ();
        ARDOUR::InterThreadInfo* current_interthread_info;
 
        AnalysisWindow* analysis_window;
@@ -1200,7 +1183,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        };
 
        EditorImportStatus import_status;
-       gint import_progress_timeout (void *);
        static void *_import_thread (void *);
        void* import_thread ();
        void finish_import ();
@@ -1425,8 +1407,6 @@ public:
        bool _follow_playhead;
         /// true if we scroll the tracks rather than the playhead
         bool _stationary_playhead;
-       /// true if waveforms should be shown while recording audio tracks, otherwise false
-       bool _show_waveforms_recording;
 
        ARDOUR::TempoMap::BBTPointList *current_bbt_points;
 
@@ -1479,13 +1459,13 @@ public:
        void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void build_range_marker_menu (bool loop_or_punch);
-       void build_marker_menu (bool start_or_end);
+       void build_marker_menu (bool);
        void build_tm_marker_menu ();
        void build_new_transport_marker_menu ();
 
        Gtk::Menu* tm_marker_menu;
        Gtk::Menu* marker_menu;
-       Gtk::Menu* start_end_marker_menu;
+       Gtk::Menu* session_range_marker_menu;
        Gtk::Menu* range_marker_menu;
        Gtk::Menu* transport_marker_menu;
        Gtk::Menu* new_transport_marker_menu;
@@ -1794,7 +1774,6 @@ public:
        /* freeze operations */
 
        ARDOUR::InterThreadInfo freeze_status;
-       gint freeze_progress_timeout (void *);
        static void* _freeze_thread (void*);
        void* freeze_thread ();