Add mono switch to mixer strips (mantis 1068)

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 56e70425488dc98b548989f23dccc31434cb9a98..e8860cb907840ed772d5dbf950e13b28681f4abb 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        virtual ~TimeAxisView ();
 
        XMLNode& get_state ();
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
 
        /** @return index of this TimeAxisView within its parent */
        int order () const { return _order; }
@@ -163,7 +163,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
         */
        virtual void step_height (bool bigger);
 
-       virtual ARDOUR::RouteGroup* edit_group() const { return 0; }
+       virtual ARDOUR::RouteGroup* route_group() const { return 0; }
        virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); }
 
        virtual void show_feature_lines (const ARDOUR::AnalysisFeatureList&);
@@ -180,14 +180,14 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        virtual void reveal_dependent_views (TimeAxisViewItem&) {}
 
        /* editing operations */
-       
+
        virtual bool cut_copy_clear (Selection&, Editing::CutCopyOp) { return false; }
-       virtual bool paste (nframes_t, float times, Selection&, size_t nth) { return false; }
-       
+       virtual bool paste (nframes_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
+
        virtual void set_selected_regionviews (RegionSelection&) {}
        virtual void set_selected_points (PointSelection&) {}
 
-       virtual boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t pos, ARDOUR::RegionPoint, int32_t dir) {
+       virtual boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) {
                return boost::shared_ptr<ARDOUR::Region> ();
        }
 
@@ -210,18 +210,16 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /* call this on the parent */
 
-       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return 0; }
+       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter /*param*/) { return 0; }
 
        virtual LayerDisplay layer_display () const { return Overlaid; }
        virtual StreamView* view () const { return 0; }
-       
+
        typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
 
   protected:
        /* The Standard LHS Controls */
-       Gtk::Frame    controls_frame;
        Gtk::HBox     controls_hbox;
-       Gtk::EventBox controls_lhs_pad;
        Gtk::Table    controls_table;
        Gtk::EventBox controls_ebox;
        Gtk::VBox     controls_vbox;
@@ -243,7 +241,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        sigc::connection name_entry_key_timeout;
        bool name_entry_key_timed_out ();
        guint32 last_name_entry_key_press_event;
-       
+
        /* derived classes can override these */
 
        virtual void name_entry_changed ();
@@ -251,7 +249,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        virtual bool name_entry_focus_out (GdkEventFocus *ev);
 
        /** Handle mouse relaese on our LHS control name ebox.
-        * 
+        *
         *@ param ev the event
         */
        virtual bool controls_ebox_button_release (GdkEventButton *ev);
@@ -270,7 +268,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /** Do whatever needs to be done to dynamically reset the LHS control menu.
         */
-       virtual bool handle_display_menu_map_event (GdkEventAny *ev) { return false; }
+       virtual bool handle_display_menu_map_event (GdkEventAny * /*ev*/) { return false; }
 
        /** Build the standard LHS control size menu for the default heights options.
         */
@@ -283,7 +281,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        void popup_size_menu(guint32 when);
 
        /** Handle the size option of our main menu.
-        * 
+        *
         * @param ev the event
         */
        gint size_click(GdkEventButton *ev);
@@ -339,7 +337,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        ArdourCanvas::Group* _canvas_display;
        double _y_position;
        PublicEditor& _editor;
-       
+
 private:
 
        ArdourCanvas::Group* _canvas_background;
@@ -347,11 +345,10 @@ private:
        int _order;
        uint32_t _effective_height;
        double _resize_drag_start;
-       int32_t _resize_idle_target;
        ArdourCanvas::Group* _ghost_group;
 
        static int const _max_order;
-       
+
 }; /* class TimeAxisView */
 
 #endif /* __ardour_gtk_time_axis_h__ */