Apply patch from mantis 2761 from tinram to add padding and make a string translatable.

[ardour.git] / gtk2_ardour / panner_ui.h

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 76589782331ea7e4f53ff063291ae765e2117f93..95e1e6c688e565dbfbcf1a30657151c5ffa845f0 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_panner_ui_h__
@@ -37,14 +36,16 @@
 #include "enums.h"
 
 class Panner2d;
+class PannerBar;
+class Panner2dWindow;
 
 namespace ARDOUR {
-       class IO;
        class Session;
+       class Panner;
+       class Delivery;
 }
 namespace Gtkmm2ext {
        class FastMeter;
-       class BarController;
 }
 
 namespace Gtk {
@@ -55,9 +56,11 @@ namespace Gtk {
 class PannerUI : public Gtk::HBox
 {
   public:
-       PannerUI (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
+       PannerUI (ARDOUR::Session&);
        ~PannerUI ();
 
+       virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
+
        void pan_changed (void *);
 
        void update_pan_sensitive ();
@@ -68,17 +71,23 @@ 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;
 
-       Panner2d*   panner;
+       static const int pan_bar_height;
+
+       Panner2d*       panner;
+       Panner2dWindow* big_window;
 
        Gtk::VBox           pan_bar_packer;
        Gtk::Adjustment     hAdjustment;
@@ -98,23 +107,24 @@ class PannerUI : public Gtk::HBox
        bool panning_link_button_press (GdkEventButton*);
        bool panning_link_button_release (GdkEventButton*);
 
-       Gtk::Menu pan_astate_menu;
-       Gtk::Menu pan_astyle_menu;
+       Gtk::Menu* pan_astate_menu;
+       Gtk::Menu* pan_astyle_menu;
 
        Gtk::Button pan_automation_style_button;
        Gtk::ToggleButton pan_automation_state_button;
 
        void panning_link_direction_clicked ();
 
-       vector<Gtk::Adjustment*> pan_adjustments;
-       vector<Gtkmm2ext::BarController*> pan_bars;
+       std::vector<Gtk::Adjustment*> pan_adjustments;
+       std::vector<PannerBar*> pan_bars;
 
        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 ();
+       void build_astate_menu ();
+       void build_astyle_menu ();
 
        void panner_changed ();
        
@@ -132,7 +142,8 @@ class PannerUI : public Gtk::HBox
        Gtk::CheckMenuItem* bypass_menu_item;
        void build_pan_menu (uint32_t which);
        void pan_mute (uint32_t which);
-       void pan_reset ();
+       void pan_reset (uint32_t);
+       void pan_reset_all ();
        void pan_bypass_toggle ();
 
        void pan_automation_state_changed();