Added Phase control mackie controls as part of the Trim (track) vpot assignment.

[ardour.git] / libs / surfaces / mackie / strip.h

diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 55a6fbef8c97b68d5245c5233a1295438cf8993e..e2f701830a0003cce56914b6850277656b5671cd 100644 (file)
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -60,22 +60,21 @@ public:
        void set_route (boost::shared_ptr<ARDOUR::Route>, bool with_messages = true);
 
        // call all signal handlers manually
-       void notify_all();
+       void notify_all ();
 
        void handle_button (Button&, ButtonState bs);
        void handle_fader (Fader&, float position);
        void handle_fader_touch (Fader&, bool touch_on);
        void handle_pot (Pot&, float delta);
 
-       void periodic (uint64_t now_usecs);
-       void redisplay ();
+       void periodic (ARDOUR::microseconds_t now_usecs);
+       void redisplay (ARDOUR::microseconds_t now_usecs);
 
        MidiByteArray display (uint32_t line_number, const std::string&);
        MidiByteArray blank_display (uint32_t line_number);
 
        void zero ();
 
-       void flip_mode_changed (bool notify=false);
        void potmode_changed (bool notify=false);
 
        void lock_controls ();
@@ -86,6 +85,9 @@ public:
 
        void notify_metering_state_changed();
 
+       void block_screen_display_for (uint32_t msecs);
+       void block_vpot_mode_display_for (uint32_t msecs);
+
 private:
        Button*  _solo;
        Button*  _recenable;
@@ -101,11 +103,12 @@ private:
        bool     _controls_locked;
        bool     _transport_is_rolling;
        bool     _metering_active;
-       uint64_t _reset_display_at;
+       uint64_t _block_vpot_mode_redisplay_until;
+       uint64_t _block_screen_redisplay_until;
        boost::shared_ptr<ARDOUR::Route> _route;
        PBD::ScopedConnectionList route_connections;
 
-       int      _pan_mode;
+       ARDOUR::AutomationType  _pan_mode;
 
        float _last_gain_position_written;
        float _last_pan_azi_position_written;
@@ -122,15 +125,14 @@ private:
        void notify_active_changed ();
        void notify_route_deleted ();
        void notify_trim_changed (bool force_update = true);
+       void notify_phase_changed (bool force_update = true);
 
        void update_automation ();
        void update_meter ();
 
        std::string vpot_mode_string () const;
 
-       void queue_display_reset (uint32_t msecs);
-       void clear_display_reset ();
-       void reset_display ();
+       void return_to_vpot_mode_display ();
 
        struct RedisplayRequest {
                ARDOUR::AutomationType type;
@@ -142,25 +144,22 @@ private:
        void do_parameter_display (ARDOUR::AutomationType, float val);
        void queue_parameter_display (ARDOUR::AutomationType, float val);
 
-       typedef std::map<std::string,boost::shared_ptr<ARDOUR::Bundle> > BundleMap;
-       BundleMap input_bundles;
-       BundleMap output_bundles;
-
-       void build_input_list (const ARDOUR::ChanCount&);
-       void build_output_list (const ARDOUR::ChanCount&);
-       void maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<ARDOUR::Bundle>, bool for_input, const ARDOUR::ChanCount&);
-
        void select_event (Button&, ButtonState);
        void vselect_event (Button&, ButtonState);
        void fader_touch_event (Button&, ButtonState);
 
        std::vector<Evoral::Parameter> possible_pot_parameters;
+       std::vector<Evoral::Parameter> possible_trim_parameters;
        void next_pot_mode ();
        void set_vpot_parameter (Evoral::Parameter);
+       void show_route_name ();
 
        void reset_saved_values ();
 
-       std::map<Evoral::Parameter,Control*> control_by_parameter;
+       bool is_midi_track () const;
+
+       typedef std::map<Evoral::Parameter,Control*> ControlParameterMap;
+       ControlParameterMap control_by_parameter;
 };
 
 }