Clean up checks.

[ardour.git] / gtk2_ardour / editor.h

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 834313f9aee917ee52f2ea843dd1bb43a0417c15..571b612294203eb40d317ee9a8ad46c1f91f80ee 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -25,6 +25,7 @@
 #include <set>
 #include <string>
 #include <sys/time.h>
+#include <bitset>
 
 #include <glibmm/ustring.h>
 
@@ -44,13 +45,14 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/dndtreeview.h>
 
-#include <pbd/stateful.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
-#include <ardour/stretch.h>
-#include <ardour/location.h>
-#include <ardour/audioregion.h>
-#include <ardour/track.h>
+#include "pbd/stateful.h"
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/stretch.h"
+#include "ardour/location.h"
+#include "ardour/audioregion.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
 
 #include "audio_clock.h"
 #include "gtk-custom-ruler.h"
@@ -108,6 +110,8 @@ class ControlPoint;
 class SoundFileOmega;
 class RhythmFerret;
 class AnalysisWindow;
+class BundleManager;
+class GlobalPortMatrixWindow;
 
 /* <CMT Additions> */
 class ImageFrameView;
@@ -392,6 +396,8 @@ class Editor : public PublicEditor
        void toggle_meter_updating();
 
        void show_rhythm_ferret();
+       void show_bundle_manager ();
+       void show_global_port_matrix (ARDOUR::DataType);
 
        void goto_visual_state (uint32_t);
        void save_visual_state (uint32_t);
@@ -589,7 +595,7 @@ class Editor : public PublicEditor
 
        void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList&, Gtk::Menu_Helpers::MenuElem, bool) const;
 
-       void handle_new_route (ARDOUR::Session::RouteList&);
+       void handle_new_route (ARDOUR::RouteList&);
        void remove_route (TimeAxisView *);
        bool route_removal;
 
@@ -988,6 +994,9 @@ class Editor : public PublicEditor
 
        void region_list_region_changed (ARDOUR::Change, boost::weak_ptr<ARDOUR::Region>);
        void region_list_selection_changed ();
+       sigc::connection region_list_change_connection;
+       void set_selected_in_region_list(RegionSelection&);
+       bool set_selected_in_region_list_subrow(boost::shared_ptr<ARDOUR::Region>, Gtk::TreeModel::Row const &, int);
        bool region_list_selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
        void region_name_edit (const Glib::ustring&, const Glib::ustring&);
        void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions);
@@ -1071,7 +1080,7 @@ class Editor : public PublicEditor
 
        /* track views */
        TrackViewList  track_views;
-       TimeAxisView     *trackview_by_y_position (double ypos);
+       std::pair<TimeAxisView*, ARDOUR::layer_t> trackview_by_y_position (double);
 
        static Gdk::Cursor* cross_hair_cursor;
        static Gdk::Cursor* trimmer_cursor;
@@ -1296,7 +1305,7 @@ class Editor : public PublicEditor
 
        /* import specific info */
 
-       struct EditorImportStatus : public ARDOUR::Session::import_status {
+       struct EditorImportStatus : public ARDOUR::Session::ImportStatus {
            Editing::ImportMode mode;
            nframes64_t pos;
            int target_tracks;
@@ -1442,7 +1451,7 @@ class Editor : public PublicEditor
        void region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
        void create_region_drag_motion_callback (ArdourCanvas::Item*, GdkEvent*);
        void create_region_drag_finished_callback (ArdourCanvas::Item*, GdkEvent*);
-       bool check_region_drag_possible (RouteTimeAxisView**);
+       bool check_region_drag_possible (RouteTimeAxisView**, ARDOUR::layer_t*);
        void possibly_copy_regions_during_grab (GdkEvent*);
        void region_drag_splice_motion_callback (ArdourCanvas::Item*, GdkEvent*);
        void region_drag_splice_finished_callback (ArdourCanvas::Item*, GdkEvent*);
@@ -1754,7 +1763,7 @@ public:
        GroupedButtons          *midi_tool_button_set;
        void                     midi_edit_mode_toggled (Editing::MidiEditMode m);
        void                     midi_panic_button_pressed ();
-       bool                     is_midi_sound_notes_active () const { return midi_sound_notes.get_active(); }
+       bool                     sound_notes () const { return midi_sound_notes.get_active(); }
        
        bool                     ignore_midi_edit_mode_toggle;
 
@@ -1773,6 +1782,7 @@ public:
        void time_selection_changed ();
        void track_selection_changed ();
        void region_selection_changed ();
+       sigc::connection editor_regions_selection_changed_connection;
        void sensitize_the_right_region_actions (bool have_selected_regions);
        void point_selection_changed ();
        void marker_selection_changed ();
@@ -2341,15 +2351,11 @@ public:
        void snap_to_internal (nframes64_t& first, int32_t direction = 0, bool for_mark = false);
 
        RhythmFerret* rhythm_ferret;
+       BundleManager* _bundle_manager;
+       GlobalPortMatrixWindow* _global_port_matrix[ARDOUR::DataType::num_types];
 
        void fit_tracks ();
        void set_track_height (uint32_t h);
-       void set_track_height_largest ();
-       void set_track_height_large ();
-       void set_track_height_larger ();
-       void set_track_height_normal ();
-       void set_track_height_smaller ();
-       void set_track_height_small ();
 
        void remove_tracks ();
        void toggle_tracks_active ();
@@ -2361,6 +2367,12 @@ public:
        bool idle_resize();
        friend gboolean _idle_resize (gpointer);
        std::vector<TimeAxisView*> pending_resizes;
+
+       void visible_order_range (int*, int*) const;
+       bool y_movement_disallowed (int, int, int, int, int, std::bitset<512> const &, std::vector<int32_t> const &) const;
+
+       void located ();
+       bool _pending_locate_request;
 };
 
 #endif /* __ardour_editor_h__ */