use constructor syntax

[ardour.git] / libs / surfaces / faderport8 / fp8_strip.h

diff --git a/libs/surfaces/faderport8/fp8_strip.h b/libs/surfaces/faderport8/fp8_strip.h
index 366dca97f2800bfcf368d9b1473f9391098fd495..200dae86cb9da725b6274ef1a2354ef430dc52cc 100644 (file)
--- a/libs/surfaces/faderport8/fp8_strip.h
+++ b/libs/surfaces/faderport8/fp8_strip.h
@@ -81,6 +81,7 @@ public:
                CTRL_TEXT2  = 0x400,
                CTRL_TEXT3  = 0x800,
 
+               CTRL_TEXT01 = 0x300,
                CTRL_TEXT   = 0xf00,
                CTRL_ALL    = 0xfff,
        };
@@ -106,7 +107,7 @@ private:
        PBD::ScopedConnection _base_connection; // periodic
        PBD::ScopedConnectionList _button_connections;
 
-       boost::shared_ptr<ARDOUR::Stripable> _stripable;
+       std::string _stripable_name;
 
        boost::shared_ptr<ARDOUR::AutomationControl> _fader_ctrl;
        boost::shared_ptr<ARDOUR::AutomationControl> _mute_ctrl;
@@ -128,6 +129,8 @@ private:
        void set_x_select_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
        boost::function<void ()> _select_plugin_functor;
 
+       void drop_automation_controls ();
+
        PBD::Controllable::GroupControlDisposition group_mode () const;
 
        /* notifications, update view */
@@ -145,9 +148,10 @@ private:
        void set_recarm ();
 
        /* periodic poll, update view */
+       void set_strip_name ();
        void periodic_update_fader ();
        void periodic_update_meter ();
-       void periodic_update_timecode ();
+       void periodic_update_timecode (uint32_t);
        void periodic ();
 
        /* cache */
@@ -158,7 +162,7 @@ private:
 
        /* display */
        void set_strip_mode (uint8_t, bool clear = false);
-       void set_bar_mode (uint8_t);
+       void set_bar_mode (uint8_t, bool force = false);
 
        uint8_t _strip_mode;
        uint8_t _bar_mode;