i/o button naming patch and imported file BWF timecode retention patch from nickm...

[ardour.git] / gtk2_ardour / panner_ui.h

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 3fb4632d13d0c366ae0d1c2d57078b05c5577274..119dda208ca30ec6b3e4dd43767d9bd39ac0b857 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -40,8 +40,9 @@ class PannerBar;
 class Panner2dWindow;
 
 namespace ARDOUR {
-       class IO;
        class Session;
+       class Panner;
+       class Delivery;
 }
 namespace Gtkmm2ext {
        class FastMeter;
@@ -58,7 +59,7 @@ class PannerUI : public Gtk::HBox
        PannerUI (ARDOUR::Session&);
        ~PannerUI ();
 
-       virtual void set_io (boost::shared_ptr<ARDOUR::IO>);
+       virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
 
        void pan_changed (void *);
 
@@ -70,18 +71,19 @@ class PannerUI : public Gtk::HBox
 
        void effective_pan_display ();
 
-       void set_meter_strip_name (string name);
+       void set_meter_strip_name (std::string name);
        boost::shared_ptr<PBD::Controllable> get_controllable();
 
   private:
        friend class MixerStrip;
 
-       boost::shared_ptr<ARDOUR::IO> _io;
+       boost::shared_ptr<ARDOUR::Panner> _panner;
        ARDOUR::Session& _session;
        std::vector<sigc::connection> connections;
 
        bool ignore_toggle;
        bool in_pan_update;
+       int _current_nouts;
 
        static const int pan_bar_height;
 
@@ -119,7 +121,6 @@ class PannerUI : public Gtk::HBox
 
        void pan_adjustment_changed (uint32_t which);
        void pan_value_changed (uint32_t which);
-       void pan_printer (char* buf, uint32_t, Gtk::Adjustment*);
        void update_pan_bars (bool only_if_aplay);
        void update_pan_linkage ();
        void update_pan_state ();