Fix indentation 8 whitespaces to tab

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 1093fd18b4db9a28924ba6db764f7f6094ab0090..4be1a4c4d21a6a0d3d23835ed016daabd2480871 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -78,7 +78,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        boost::shared_ptr<ARDOUR::Stripable> stripable() const;
        ARDOUR::PresentationInfo const & presentation_info () const;
 
-        void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
+       void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
        void clear_lines ();
 

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 016e57945f65d07e88384a1966c85a9a92736d71..d5f7b46a37cea9ea9015cfa54bbcde8419ff01a6 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -67,7 +67,7 @@ AxisView::gui_property (const string& property_name) const
        if (property_hashtable.count(property_name)) {
                return property_hashtable[property_name];
        } else {
-         string rv = gui_object_state().get_string (state_id(), property_name);
+               string rv = gui_object_state().get_string (state_id(), property_name);
                property_hashtable.erase(property_name);
                property_hashtable.emplace(property_name, rv);
                return rv;

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index d5fb62c6ac63cf027a0a21ecac3ef8dfe13a0677..85fd5ac1e67bfa41c564fd0e0e17d420b9c36ff1 100644 (file)
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -89,7 +89,7 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
        struct MeterInfo {
            Gtkmm2ext::FastMeter *meter;
            gint16                width;
-            int                          length;
+               int                   length;
            bool                  packed;
            float                 max_peak;
 

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index fb0ba57496a4d325dbecb3883f5836b8e1238a18..fecd1750813d028ef1eef576aef23a88424ac94d 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -105,7 +105,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void maximise_mixer_space();
        void restore_mixer_space();
 
-        MonitorSection* monitor_section() const { return _monitor_section; }
+       MonitorSection* monitor_section() const { return _monitor_section; }
 
        void deselect_all_strip_processors();
        void delete_processors();
@@ -174,7 +174,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        bool masters_scroller_button_release (GdkEventButton*);
        void scroll_left ();
        void scroll_right ();
-        void toggle_midi_input_active (bool flip_others);
+       void toggle_midi_input_active (bool flip_others);
 
        void move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable>);
 
@@ -242,8 +242,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        void set_all_strips_visibility (bool yn);
        void set_all_audio_midi_visibility (int, bool);
-        void track_visibility_changed (std::string const & path);
-        void update_track_visibility ();
+       void track_visibility_changed (std::string const & path);
+       void update_track_visibility ();
 
        void hide_all_routes ();
        void show_all_routes ();
@@ -273,7 +273,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void track_column_click (gint);
        void build_track_menu ();
 
-        MonitorSection* _monitor_section;
+       MonitorSection* _monitor_section;
        PluginSelector    *_plugin_selector;
 
        void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr<ARDOUR::Stripable> ws);
@@ -336,10 +336,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        Width _strip_width;
 
-        void sync_presentation_info_from_treeview ();
-        void sync_treeview_from_presentation_info ();
+       void sync_presentation_info_from_treeview ();
+       void sync_treeview_from_presentation_info ();
 
-        bool ignore_reorder;
+       bool ignore_reorder;
 
        void parameter_changed (std::string const &);
        void set_route_group_activation (ARDOUR::RouteGroup *, bool);
@@ -354,7 +354,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
            it during a session teardown.
        */
        bool _in_group_rebuild_or_clear;
-        bool _route_deletion_in_progress;
+       bool _route_deletion_in_progress;
 
        void update_title ();
        MixerStrip* strip_by_x (int x);

diff --git a/gtk2_ardour/panner_interface.h b/gtk2_ardour/panner_interface.h
index 3e79c355365dd9dbedd56279f0fa8f1f019f8e1c..eb2ee4334ed0f135f536d82cfe8ed59e2734b4e2 100644 (file)
--- a/gtk2_ardour/panner_interface.h
+++ b/gtk2_ardour/panner_interface.h
@@ -66,8 +66,8 @@ protected:
 
        void value_change ();
 
-        bool on_enter_notify_event (GdkEventCrossing *);
-        bool on_leave_notify_event (GdkEventCrossing *);
+       bool on_enter_notify_event (GdkEventCrossing *);
+       bool on_leave_notify_event (GdkEventCrossing *);
        bool on_key_release_event  (GdkEventKey *);
        bool on_button_press_event (GdkEventButton*);
        bool on_button_release_event (GdkEventButton*);

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 0f8a0ea99e19ff6807e3959cd5101fcfaa023f37..3566d6624e85abd5d8eafc6784f90cd2e6122d41 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -250,7 +250,7 @@ protected:
        void create_mute_automation_child (const Evoral::Parameter &, bool);
        void setup_processor_menu_and_curves ();
        void route_color_changed ();
-        bool can_edit_name() const;
+       bool can_edit_name() const;
 
        boost::shared_ptr<AutomationTimeAxisView> gain_track;
        boost::shared_ptr<AutomationTimeAxisView> trim_track;

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index f93dbd165e040bac106b98da5ff587b1d268fcea..47ac4a11ecd3f7d38d2d0200fe42b2be065c5bf7 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1199,28 +1199,28 @@ RouteUI::update_solo_display ()
                solo_isolated_check->set_active (yn);
        }
 
-        set_button_names ();
+       set_button_names ();
 
-        if (solo_isolated_led) {
-               if (_route->solo_isolate_control()->solo_isolated()) {
+       if (solo_isolated_led) {
+               if (_route->solo_isolate_control()->solo_isolated()) {
                        solo_isolated_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_isolated_led->unset_active_state ();
                }
-        }
+       }
 
-        if (solo_safe_led) {
-               if (_route->solo_safe_control()->solo_safe()) {
+       if (solo_safe_led) {
+               if (_route->solo_safe_control()->solo_safe()) {
                        solo_safe_led->set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
                        solo_safe_led->unset_active_state ();
                }
-        }
+       }
 
        solo_button->set_active_state (solo_active_state (_route));
 
-        /* some changes to solo status can affect mute display, so catch up
-         */
+       /* some changes to solo status can affect mute display, so catch up
+        */
 
        update_mute_display ();
 }

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 75dab9fb233e4df0b2c0322d01bd17bf1183e3c7..d0b9d406c61f4dcf21eb7a6f9c1688920d6ceff4 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -123,8 +123,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
 
        Glib::RefPtr<Gdk::Pixbuf> solo_safe_pixbuf;
 
-        ArdourButton* solo_safe_led;
-        ArdourButton* solo_isolated_led;
+       ArdourButton* solo_safe_led;
+       ArdourButton* solo_isolated_led;
 
 
        Gtk::Label monitor_input_button_label;
@@ -184,8 +184,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void solo_isolated_toggle (void*, Gtk::CheckMenuItem*);
        void toggle_solo_isolated (Gtk::CheckMenuItem*);
 
-        bool solo_isolate_button_release (GdkEventButton*);
-        bool solo_safe_button_release (GdkEventButton*);
+       bool solo_isolate_button_release (GdkEventButton*);
+       bool solo_safe_button_release (GdkEventButton*);
 
        void solo_safe_toggle (void*, Gtk::CheckMenuItem*);
        void toggle_solo_safe (Gtk::CheckMenuItem*);
@@ -217,8 +217,8 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void set_route_active (bool, bool);
        void duplicate_selected_routes ();
 
-        Gtk::Menu* record_menu;
-        void build_record_menu ();
+       Gtk::Menu* record_menu;
+       void build_record_menu ();
 
        Gtk::CheckMenuItem *step_edit_item;
        void toggle_step_edit ();
@@ -282,10 +282,10 @@ class RouteUI : public virtual ARDOUR::SessionHandlePtr, public virtual PBD::Sco
        void reset ();
 
        void self_delete ();
-        virtual void start_step_editing () {}
-        virtual void stop_step_editing() {}
+       virtual void start_step_editing () {}
+       virtual void stop_step_editing() {}
 
-        void set_invert_sensitive (bool);
+       void set_invert_sensitive (bool);
        bool verify_new_route_name (const std::string& name);
 
        void route_gui_changed (PBD::PropertyChange const&);

diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index 855766b1c8ea9983dac0ff8227afd0d0905bb81f..f7df9e6da9cf9d7f89237efe43e5794f8be4698a 100644 (file)
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -632,63 +632,63 @@ StepEntry::register_actions ()
        myactions.register_action (group, "octave-9", _("Switch to the 10th octave"), sigc::mem_fun (*this, &StepEntry::octave_9));
        myactions.register_action (group, "octave-10", _("Switch to the 11th octave"), sigc::mem_fun (*this, &StepEntry::octave_10));
 
-        myactions.register_toggle_action (group, "toggle-triplet", _("Toggle Triple Notes"),
-                                          sigc::mem_fun (*this, &StepEntry::toggle_triplet));
-
-        myactions.register_toggle_action (group, "toggle-chord", _("Toggle Chord Entry"),
-                                          sigc::mem_fun (*this, &StepEntry::toggle_chord));
-        myactions.register_action (group, "sustain", _("Sustain Selected Notes by Note Length"),
-                                   sigc::mem_fun (*this, &StepEntry::do_sustain));
-
-        myactions.register_action (group, "sync-to-edit-point", _("Move Insert Position to Edit Point"),
-                                   sigc::mem_fun (*this, &StepEntry::sync_to_edit_point));
-        myactions.register_action (group, "back", _("Move Insert Position Back by Note Length"),
-                                   sigc::mem_fun (*this, &StepEntry::back));
-        RadioAction::Group note_length_group;
-
-        myactions.register_radio_action (group, note_length_group, "note-length-whole",
-                                         _("Set Note Length to Whole"), sigc::mem_fun (*this, &StepEntry::note_length_change), 1);
-        myactions.register_radio_action (group, note_length_group, "note-length-half",
-                                         _("Set Note Length to 1/2"), sigc::mem_fun (*this, &StepEntry::note_length_change), 2);
-        myactions.register_radio_action (group, note_length_group, "note-length-third",
-                                         _("Set Note Length to 1/3"), sigc::mem_fun (*this, &StepEntry::note_length_change), 3);
-        myactions.register_radio_action (group, note_length_group, "note-length-quarter",
-                                         _("Set Note Length to 1/4"), sigc::mem_fun (*this, &StepEntry::note_length_change), 4);
-        myactions.register_radio_action (group, note_length_group, "note-length-eighth",
-                                         _("Set Note Length to 1/8"), sigc::mem_fun (*this, &StepEntry::note_length_change), 8);
-        myactions.register_radio_action (group, note_length_group, "note-length-sixteenth",
-                                         _("Set Note Length to 1/16"), sigc::mem_fun (*this, &StepEntry::note_length_change), 16);
-        myactions.register_radio_action (group, note_length_group, "note-length-thirtysecond",
-                                         _("Set Note Length to 1/32"), sigc::mem_fun (*this, &StepEntry::note_length_change), 32);
-        myactions.register_radio_action (group, note_length_group, "note-length-sixtyfourth",
-                                         _("Set Note Length to 1/64"), sigc::mem_fun (*this, &StepEntry::note_length_change), 64);
-
-        RadioAction::Group note_velocity_group;
-
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-ppp",
-                                         _("Set Note Velocity to Pianississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 1);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-pp",
-                                         _("Set Note Velocity to Pianissimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 16);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-p",
-                                         _("Set Note Velocity to Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 32);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-mp",
-                                         _("Set Note Velocity to Mezzo-Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 64);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-mf",
-                                         _("Set Note Velocity to Mezzo-Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 80);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-f",
-                                         _("Set Note Velocity to Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 96);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-ff",
-                                         _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 112);
-        myactions.register_radio_action (group, note_velocity_group, "note-velocity-fff",
-                                         _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 127);
-
-
-        RadioAction::Group dot_group;
-
-        myactions.register_radio_action (group, dot_group, "no-dotted", _("No Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 0);
-        myactions.register_radio_action (group, dot_group, "toggle-dotted", _("Toggled Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 1);
-        myactions.register_radio_action (group, dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 2);
-        myactions.register_radio_action (group, dot_group, "toggle-triple-dotted", _("Toggled Triple-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 3);
+       myactions.register_toggle_action (group, "toggle-triplet", _("Toggle Triple Notes"),
+                                         sigc::mem_fun (*this, &StepEntry::toggle_triplet));
+
+       myactions.register_toggle_action (group, "toggle-chord", _("Toggle Chord Entry"),
+                                         sigc::mem_fun (*this, &StepEntry::toggle_chord));
+       myactions.register_action (group, "sustain", _("Sustain Selected Notes by Note Length"),
+                                  sigc::mem_fun (*this, &StepEntry::do_sustain));
+
+       myactions.register_action (group, "sync-to-edit-point", _("Move Insert Position to Edit Point"),
+                                  sigc::mem_fun (*this, &StepEntry::sync_to_edit_point));
+       myactions.register_action (group, "back", _("Move Insert Position Back by Note Length"),
+                                  sigc::mem_fun (*this, &StepEntry::back));
+       RadioAction::Group note_length_group;
+
+       myactions.register_radio_action (group, note_length_group, "note-length-whole",
+                                        _("Set Note Length to Whole"), sigc::mem_fun (*this, &StepEntry::note_length_change), 1);
+       myactions.register_radio_action (group, note_length_group, "note-length-half",
+                                        _("Set Note Length to 1/2"), sigc::mem_fun (*this, &StepEntry::note_length_change), 2);
+       myactions.register_radio_action (group, note_length_group, "note-length-third",
+                                        _("Set Note Length to 1/3"), sigc::mem_fun (*this, &StepEntry::note_length_change), 3);
+       myactions.register_radio_action (group, note_length_group, "note-length-quarter",
+                                        _("Set Note Length to 1/4"), sigc::mem_fun (*this, &StepEntry::note_length_change), 4);
+       myactions.register_radio_action (group, note_length_group, "note-length-eighth",
+                                        _("Set Note Length to 1/8"), sigc::mem_fun (*this, &StepEntry::note_length_change), 8);
+       myactions.register_radio_action (group, note_length_group, "note-length-sixteenth",
+                                        _("Set Note Length to 1/16"), sigc::mem_fun (*this, &StepEntry::note_length_change), 16);
+       myactions.register_radio_action (group, note_length_group, "note-length-thirtysecond",
+                                        _("Set Note Length to 1/32"), sigc::mem_fun (*this, &StepEntry::note_length_change), 32);
+       myactions.register_radio_action (group, note_length_group, "note-length-sixtyfourth",
+                                        _("Set Note Length to 1/64"), sigc::mem_fun (*this, &StepEntry::note_length_change), 64);
+
+       RadioAction::Group note_velocity_group;
+
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-ppp",
+                                        _("Set Note Velocity to Pianississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 1);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-pp",
+                                        _("Set Note Velocity to Pianissimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 16);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-p",
+                                        _("Set Note Velocity to Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 32);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-mp",
+                                        _("Set Note Velocity to Mezzo-Piano"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 64);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-mf",
+                                        _("Set Note Velocity to Mezzo-Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 80);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-f",
+                                        _("Set Note Velocity to Forte"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 96);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-ff",
+                                        _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 112);
+       myactions.register_radio_action (group, note_velocity_group, "note-velocity-fff",
+                                        _("Set Note Velocity to Fortississimo"), sigc::mem_fun (*this, &StepEntry::note_velocity_change), 127);
+
+
+       RadioAction::Group dot_group;
+
+       myactions.register_radio_action (group, dot_group, "no-dotted", _("No Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 0);
+       myactions.register_radio_action (group, dot_group, "toggle-dotted", _("Toggled Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 1);
+       myactions.register_radio_action (group, dot_group, "toggle-double-dotted", _("Toggled Double-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 2);
+       myactions.register_radio_action (group, dot_group, "toggle-triple-dotted", _("Toggled Triple-Dotted Notes"), sigc::mem_fun (*this, &StepEntry::dot_change), 3);
 }
 
 void

diff --git a/gtk2_ardour/step_entry.h b/gtk2_ardour/step_entry.h
index 26c46d5c51150a24f54c4c0419205c55d89d16f0..685f859302301b84f2fdd59bd8a8b6cedc9e6580 100644 (file)
--- a/gtk2_ardour/step_entry.h
+++ b/gtk2_ardour/step_entry.h
@@ -34,175 +34,175 @@ class StepEditor;
 
 class StepEntry : public ArdourWindow
 {
-  public:
-        StepEntry (StepEditor&);
-        ~StepEntry ();
-
-        void note_off_event_handler (int note);
-        void rest_event_handler ();
-
-        Evoral::Beats note_length();
-        uint8_t note_velocity() const;
-        uint8_t note_channel() const;
-
-        int current_octave () const { return (int) floor (octave_adjustment.get_value()); }
-
-  private:
-        Evoral::Beats _current_note_length;
-        uint8_t _current_note_velocity;
-
-        Gtk::VBox packer;
-        Gtk::HBox upper_box;
-        Gtk::HBox note_length_box;
-        Gtk::HBox note_velocity_box;
-
-        Gtk::ToggleButton chord_button;
-        Gtk::ToggleButton triplet_button;
-        Gtk::ToggleButton dot0_button;
-        Gtk::ToggleButton dot1_button;
-        Gtk::ToggleButton dot2_button;
-        Gtk::ToggleButton dot3_button;
-        Gtk::Adjustment   dot_adjustment;
-        Gtk::VBox dot_box1;
-        Gtk::VBox dot_box2;
-        Gtk::ToggleButton restart_button;
-
-        Gtk::VBox   resync_box;
-        Gtk::Button beat_resync_button;
-        Gtk::Button bar_resync_button;
-        Gtk::Button resync_button;
-
-        Gtk::Button sustain_button;
-        Gtk::Button rest_button;
-        Gtk::Button grid_rest_button;
-        Gtk::VBox   rest_box;
-
-        Gtk::Button back_button;
-
-        Gtk::RadioButton length_1_button;
-        Gtk::RadioButton length_2_button;
-        Gtk::RadioButton length_4_button;
-        Gtk::RadioButton length_8_button;
-        Gtk::RadioButton length_12_button;
-        Gtk::RadioButton length_16_button;
-        Gtk::RadioButton length_32_button;
-        Gtk::RadioButton length_64_button;
-
-        Gtk::RadioButton velocity_ppp_button;
-        Gtk::RadioButton velocity_pp_button;
-        Gtk::RadioButton velocity_p_button;
-        Gtk::RadioButton velocity_mp_button;
-        Gtk::RadioButton velocity_mf_button;
-        Gtk::RadioButton velocity_f_button;
-        Gtk::RadioButton velocity_ff_button;
-        Gtk::RadioButton velocity_fff_button;
-
-        Gtk::Adjustment channel_adjustment;
-        Gtk::SpinButton channel_spinner;
-
-        Gtk::Adjustment octave_adjustment;
-        Gtk::SpinButton octave_spinner;
-
-        Gtk::Adjustment length_divisor_adjustment;
-        Gtk::SpinButton length_divisor_spinner;
-
-        Gtk::Adjustment velocity_adjustment;
-        Gtk::SpinButton velocity_spinner;
-
-        Gtk::Adjustment bank_adjustment;
-        Gtk::SpinButton bank_spinner;
-        Gtk::Button     bank_button;
-
-        Gtk::Adjustment program_adjustment;
-        Gtk::SpinButton program_spinner;
-        Gtk::Button     program_button;
-
-        void length_changed ();
-        void velocity_changed ();
-        void velocity_value_change ();
-        void length_value_change ();
-
-        PianoKeyboard* _piano;
-        Gtk::Widget* piano;
-        StepEditor*   se;
-
-        void bank_click ();
-        void program_click ();
-        void beat_resync_click ();
-        void bar_resync_click ();
-
-        bool piano_enter_notify_event (GdkEventCrossing *ev);
-        bool on_key_release_event (GdkEventKey*);
-        bool on_key_press_event (GdkEventKey*);
-
-        void on_show ();
-
-        /* actions */
-
-        void register_actions ();
-
-        void insert_note (uint8_t);
-        void insert_rest ();
-        void insert_grid_rest ();
-
-        void insert_a ();
-        void insert_asharp ();
-        void insert_b ();
-        void insert_c ();
-        void insert_csharp ();
-        void insert_d ();
-        void insert_dsharp ();
-        void insert_e ();
-        void insert_f ();
-        void insert_fsharp ();
-        void insert_g ();
-        void insert_gsharp ();
-
-        void note_length_change (GtkAction*);
-        void note_velocity_change (GtkAction*);
-
-        bool radio_button_press (GdkEventButton*);
-        bool radio_button_release (GdkEventButton*, Gtk::RadioButton*, int);
-
-        void load_bindings ();
+public:
+       StepEntry (StepEditor&);
+       ~StepEntry ();
+
+       void note_off_event_handler (int note);
+       void rest_event_handler ();
+
+       Evoral::Beats note_length();
+       uint8_t note_velocity() const;
+       uint8_t note_channel() const;
+
+       int current_octave () const { return (int) floor (octave_adjustment.get_value()); }
+
+private:
+       Evoral::Beats _current_note_length;
+       uint8_t _current_note_velocity;
+
+       Gtk::VBox packer;
+       Gtk::HBox upper_box;
+       Gtk::HBox note_length_box;
+       Gtk::HBox note_velocity_box;
+
+       Gtk::ToggleButton chord_button;
+       Gtk::ToggleButton triplet_button;
+       Gtk::ToggleButton dot0_button;
+       Gtk::ToggleButton dot1_button;
+       Gtk::ToggleButton dot2_button;
+       Gtk::ToggleButton dot3_button;
+       Gtk::Adjustment   dot_adjustment;
+       Gtk::VBox dot_box1;
+       Gtk::VBox dot_box2;
+       Gtk::ToggleButton restart_button;
+
+       Gtk::VBox   resync_box;
+       Gtk::Button beat_resync_button;
+       Gtk::Button bar_resync_button;
+       Gtk::Button resync_button;
+
+       Gtk::Button sustain_button;
+       Gtk::Button rest_button;
+       Gtk::Button grid_rest_button;
+       Gtk::VBox   rest_box;
+
+       Gtk::Button back_button;
+
+       Gtk::RadioButton length_1_button;
+       Gtk::RadioButton length_2_button;
+       Gtk::RadioButton length_4_button;
+       Gtk::RadioButton length_8_button;
+       Gtk::RadioButton length_12_button;
+       Gtk::RadioButton length_16_button;
+       Gtk::RadioButton length_32_button;
+       Gtk::RadioButton length_64_button;
+
+       Gtk::RadioButton velocity_ppp_button;
+       Gtk::RadioButton velocity_pp_button;
+       Gtk::RadioButton velocity_p_button;
+       Gtk::RadioButton velocity_mp_button;
+       Gtk::RadioButton velocity_mf_button;
+       Gtk::RadioButton velocity_f_button;
+       Gtk::RadioButton velocity_ff_button;
+       Gtk::RadioButton velocity_fff_button;
+
+       Gtk::Adjustment channel_adjustment;
+       Gtk::SpinButton channel_spinner;
+
+       Gtk::Adjustment octave_adjustment;
+       Gtk::SpinButton octave_spinner;
+
+       Gtk::Adjustment length_divisor_adjustment;
+       Gtk::SpinButton length_divisor_spinner;
+
+       Gtk::Adjustment velocity_adjustment;
+       Gtk::SpinButton velocity_spinner;
+
+       Gtk::Adjustment bank_adjustment;
+       Gtk::SpinButton bank_spinner;
+       Gtk::Button     bank_button;
+
+       Gtk::Adjustment program_adjustment;
+       Gtk::SpinButton program_spinner;
+       Gtk::Button     program_button;
+
+       void length_changed ();
+       void velocity_changed ();
+       void velocity_value_change ();
+       void length_value_change ();
+
+       PianoKeyboard* _piano;
+       Gtk::Widget* piano;
+       StepEditor*   se;
+
+       void bank_click ();
+       void program_click ();
+       void beat_resync_click ();
+       void bar_resync_click ();
+
+       bool piano_enter_notify_event (GdkEventCrossing *ev);
+       bool on_key_release_event (GdkEventKey*);
+       bool on_key_press_event (GdkEventKey*);
+
+       void on_show ();
+
+       /* actions */
+
+       void register_actions ();
+
+       void insert_note (uint8_t);
+       void insert_rest ();
+       void insert_grid_rest ();
+
+       void insert_a ();
+       void insert_asharp ();
+       void insert_b ();
+       void insert_c ();
+       void insert_csharp ();
+       void insert_d ();
+       void insert_dsharp ();
+       void insert_e ();
+       void insert_f ();
+       void insert_fsharp ();
+       void insert_g ();
+       void insert_gsharp ();
+
+       void note_length_change (GtkAction*);
+       void note_velocity_change (GtkAction*);
+
+       bool radio_button_press (GdkEventButton*);
+       bool radio_button_release (GdkEventButton*, Gtk::RadioButton*, int);
+
+       void load_bindings ();
        Gtkmm2ext::ActionMap myactions;
        Gtkmm2ext::Bindings*  bindings;
 
-        void inc_note_velocity ();
-        void dec_note_velocity ();
-        void next_note_velocity ();
-        void prev_note_velocity ();
-
-        void inc_note_length ();
-        void dec_note_length ();
-        void next_note_length ();
-        void prev_note_length ();
-
-        void next_octave ();
-        void prev_octave ();
-
-        void octave_n (int n);
-        void octave_0 () { octave_n (0); }
-        void octave_1 () { octave_n (1); }
-        void octave_2 () { octave_n (2); }
-        void octave_3 () { octave_n (3); }
-        void octave_4 () { octave_n (4); }
-        void octave_5 () { octave_n (5); }
-        void octave_6 () { octave_n (6); }
-        void octave_7 () { octave_n (7); }
-        void octave_8 () { octave_n (8); }
-        void octave_9 () { octave_n (9); }
-        void octave_10 () { octave_n (10); }
-
-        void dot_change (GtkAction*);
-        void dot_value_change ();
-
-        void toggle_triplet();
-        void toggle_chord();
-
-        void do_sustain ();
-        void back();
-        void sync_to_edit_point ();
+       void inc_note_velocity ();
+       void dec_note_velocity ();
+       void next_note_velocity ();
+       void prev_note_velocity ();
+
+       void inc_note_length ();
+       void dec_note_length ();
+       void next_note_length ();
+       void prev_note_length ();
+
+       void next_octave ();
+       void prev_octave ();
+
+       void octave_n (int n);
+       void octave_0 () { octave_n (0); }
+       void octave_1 () { octave_n (1); }
+       void octave_2 () { octave_n (2); }
+       void octave_3 () { octave_n (3); }
+       void octave_4 () { octave_n (4); }
+       void octave_5 () { octave_n (5); }
+       void octave_6 () { octave_n (6); }
+       void octave_7 () { octave_n (7); }
+       void octave_8 () { octave_n (8); }
+       void octave_9 () { octave_n (9); }
+       void octave_10 () { octave_n (10); }
+
+       void dot_change (GtkAction*);
+       void dot_value_change ();
+
+       void toggle_triplet();
+       void toggle_chord();
+
+       void do_sustain ();
+       void back();
+       void sync_to_edit_point ();
 };
 
 #endif /* __gtk2_ardour_step_entry_h__ */

diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index ba9823214691c920157ae789d69cf27e0894d0c6..282d85d12f23b2f83cfb0c2443a782e7798bb385 100644 (file)
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -29,11 +29,11 @@ namespace ARDOUR {
 }
 
 namespace PBD {
-        class Controllable;
+       class Controllable;
 }
 
 namespace ARDOUR {
-        class Panner;
+       class Panner;
 }
 
 class StereoPanner : public PannerInterface
@@ -42,8 +42,8 @@ class StereoPanner : public PannerInterface
        StereoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
        ~StereoPanner ();
 
-        boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
-        boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
+       boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
+       boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
 
        sigc::signal<void> StartPositionGesture;
        sigc::signal<void> StopPositionGesture;
@@ -55,52 +55,52 @@ class StereoPanner : public PannerInterface
        bool on_button_press_event (GdkEventButton*);
        bool on_button_release_event (GdkEventButton*);
        bool on_motion_notify_event (GdkEventMotion*);
-        bool on_scroll_event (GdkEventScroll*);
-        bool on_key_press_event (GdkEventKey*);
+       bool on_scroll_event (GdkEventScroll*);
+       bool on_key_press_event (GdkEventKey*);
 
   private:
        PannerEditor* editor ();
        boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
 
-        boost::shared_ptr<PBD::Controllable> position_control;
-        boost::shared_ptr<PBD::Controllable> width_control;
-        PBD::ScopedConnectionList panvalue_connections;
-        PBD::ScopedConnectionList panshell_connections;
-        bool dragging_position;
-        bool dragging_left;
-        bool dragging_right;
-        int drag_start_x;
-        int last_drag_x;
-        double accumulated_delta;
-        bool detented;
-
-        BindingProxy position_binder;
-        BindingProxy width_binder;
-
-        void set_tooltip ();
-
-        struct ColorScheme {
-            uint32_t outline;
-            uint32_t fill;
-            uint32_t text;
-            uint32_t background;
-            uint32_t rule;
-        };
-
-        enum State {
-                Normal,
-                Mono,
-                Inverted
-        };
+       boost::shared_ptr<PBD::Controllable> position_control;
+       boost::shared_ptr<PBD::Controllable> width_control;
+       PBD::ScopedConnectionList panvalue_connections;
+       PBD::ScopedConnectionList panshell_connections;
+       bool dragging_position;
+       bool dragging_left;
+       bool dragging_right;
+       int drag_start_x;
+       int last_drag_x;
+       double accumulated_delta;
+       bool detented;
+
+       BindingProxy position_binder;
+       BindingProxy width_binder;
+
+       void set_tooltip ();
+
+       struct ColorScheme {
+               uint32_t outline;
+               uint32_t fill;
+               uint32_t text;
+               uint32_t background;
+               uint32_t rule;
+       };
+
+       enum State {
+               Normal,
+               Mono,
+               Inverted
+       };
 
        bool _dragging;
 
        static Pango::AttrList panner_font_attributes;
        static bool have_font;
 
-        static ColorScheme colors[3];
-        static void set_colors ();
-        static bool have_colors;
+       static ColorScheme colors[3];
+       static void set_colors ();
+       static bool have_colors;
        void color_handler ();
        void bypass_handler ();
        void pannable_handler ();

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 749df465a4ed76d45be08814be38772991e81215..19bf84b1bc516eab10fd2e4d48ed91c49e6c47c8 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -33,7 +33,7 @@ namespace ArdourCanvas {
        class Pixbuf;
        class Rectangle;
        class Item;
-        class Container;
+       class Container;
        class Text;
 }
 
@@ -158,9 +158,9 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
        TimeAxisViewItem (const TimeAxisViewItem&);
 
-        void init (ArdourCanvas::Item*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
+       void init (ArdourCanvas::Item*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
 
-        virtual bool canvas_group_event (GdkEvent*);
+       virtual bool canvas_group_event (GdkEvent*);
 
        virtual void set_colors();
        virtual void set_frame_color();
@@ -227,7 +227,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        ArdourCanvas::Rectangle* frame_handle_start; ///< `frame' (fade) handle for the start of the item, or 0
        ArdourCanvas::Rectangle* frame_handle_end; ///< `frame' (fade) handle for the end of the item, or 0
 
-        bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
+       bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
 
        double _height;
        Visibility visibility;
@@ -238,10 +238,9 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
         double _width;
 
 private:
-
        void parameter_changed (std::string);
-        void manage_name_highlight ();
-        void manage_name_text ();
+       void manage_name_highlight ();
+       void manage_name_text ();
 
 }; /* class TimeAxisViewItem */
 

diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index a57460c31bb5cde87831e34c2cff0c467617ed36..2cd517a342c9d218122d2a9528117fe9774df33e 100644 (file)
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -106,7 +106,7 @@ class LIBARDOUR_API AutomationList : public PBD::StatefulDestructible, public Ev
 
        void start_touch (double when);
        void stop_touch (bool mark, double when);
-        bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
+       bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
        bool writing() const { return _state == Write; }
        bool touch_enabled() const { return _state == Touch; }
 

diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 48f9ee16e9fc3b0312e20daf4948d9ac8b40ade9..362a49851a854b838a8580da077ce2a8f1a47b18 100644 (file)
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -171,8 +171,8 @@ public:
                return fabs (a.azi - b.azi) < 1.0;
        }
 
-        virtual void freeze ();
-        virtual void thaw ();
+       virtual void freeze ();
+       virtual void thaw ();
 
 protected:
        boost::shared_ptr<Pannable> _pannable;
@@ -182,7 +182,7 @@ protected:
                                               framepos_t start, framepos_t end, pframes_t nframes,
                                               pan_t** buffers, uint32_t which) = 0;
 
-        int32_t _frozen;
+       int32_t _frozen;
 };
 
 } // namespace

diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp
index 5a9fc588b2591f1aa31f4be7242397e02d65c346..e327cb10c1bd0831166b771afeecdb5257ae013b 100644 (file)
--- a/libs/evoral/evoral/ControlSet.hpp
+++ b/libs/evoral/evoral/ControlSet.hpp
@@ -66,7 +66,7 @@ public:
 
        void what_has_data(std::set<Parameter>&) const;
 
-        Glib::Threads::Mutex& control_lock() const { return _control_lock; }
+       Glib::Threads::Mutex& control_lock() const { return _control_lock; }
 
 protected:
        virtual void control_list_marked_dirty () {}

diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index 06d68a706fba688a26b00050ead19d65352d300e..67543fd898462876e0cc46a5ce2d06784bb85e53 100644 (file)
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -46,17 +46,17 @@ class Panner1in2out : public Panner
     bool clamp_position (double&);
        std::pair<double, double> position_range () const;
 
-        double position() const;
+       double position() const;
 
-        ChanCount in() const { return ChanCount (DataType::AUDIO, 1); }
-        ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
+       ChanCount in() const { return ChanCount (DataType::AUDIO, 1); }
+       ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
 
-        std::set<Evoral::Parameter> what_can_be_automated() const;
+       std::set<Evoral::Parameter> what_can_be_automated() const;
 
-        static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
+       static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-        std::string describe_parameter (Evoral::Parameter);
-        std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
+       std::string describe_parameter (Evoral::Parameter);
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();
 
@@ -71,11 +71,11 @@ class Panner1in2out : public Panner
        float right_interp;
 
        void distribute_one (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which);
-        void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
-                                       framepos_t start, framepos_t end, pframes_t nframes,
-                                       pan_t** buffers, uint32_t which);
+       void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
+                                      framepos_t start, framepos_t end, pframes_t nframes,
+                                      pan_t** buffers, uint32_t which);
 
-        void update ();
+       void update ();
 };
 
 } // namespace

diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h
index 4c71a27c183955456f98dba41ec3a9eb2c71265a..f67ac1081b40b9167db48967957c42b10460dd7b 100644 (file)
--- a/libs/panners/2in2out/panner_2in2out.h
+++ b/libs/panners/2in2out/panner_2in2out.h
@@ -43,34 +43,34 @@ class Panner2in2out : public Panner
        Panner2in2out (boost::shared_ptr<Pannable>);
        ~Panner2in2out ();
 
-        ChanCount in() const { return ChanCount (DataType::AUDIO, 2); }
-        ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
+       ChanCount in() const { return ChanCount (DataType::AUDIO, 2); }
+       ChanCount out() const { return ChanCount (DataType::AUDIO, 2); }
 
-        bool clamp_position (double&);
-        bool clamp_width (double&);
+       bool clamp_position (double&);
+       bool clamp_width (double&);
 
        std::pair<double, double> position_range () const;
        std::pair<double, double> width_range () const;
 
-        void set_position (double);
-        void set_width (double);
+       void set_position (double);
+       void set_width (double);
 
-        double position () const;
-        double width () const;
+       double position () const;
+       double width () const;
 
        std::set<Evoral::Parameter> what_can_be_automated() const;
 
        static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-        std::string describe_parameter (Evoral::Parameter);
-        std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
+       std::string describe_parameter (Evoral::Parameter);
+       std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
        XMLNode& get_state ();
 
-        void update ();
+       void update ();
 
        void reset ();
-        void thaw ();
+       void thaw ();
 
   protected:
        float left[2];
@@ -81,12 +81,12 @@ class Panner2in2out : public Panner
        float right_interp[2];
 
   private:
-        bool clamp_stereo_pan (double& direction_as_lr_fract, double& width);
+       bool clamp_stereo_pan (double& direction_as_lr_fract, double& width);
 
-        void distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which);
-        void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
-                                       framepos_t start, framepos_t end, pframes_t nframes,
-                                       pan_t** buffers, uint32_t which);
+       void distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which);
+       void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs,
+                                      framepos_t start, framepos_t end, pframes_t nframes,
+                                      pan_t** buffers, uint32_t which);
 };
 
 } // namespace

diff --git a/libs/timecode/src/bbt_time.cc b/libs/timecode/src/bbt_time.cc
index b2cf9dadfe5dff4688a18435b716f9896ac29c32..826f0cd91f9233487ec925f9b56f3bddb76f3c67 100644 (file)
--- a/libs/timecode/src/bbt_time.cc
+++ b/libs/timecode/src/bbt_time.cc
@@ -35,14 +35,14 @@ const double BBT_Time::ticks_per_beat = 1920.0;
 
 BBT_Time::BBT_Time (double dbeats)
 {
-        /* NOTE: this does not construct a BBT time in a canonical form,
-           in that beats may be a very large number, and bars will
-           always be zero.
-        */
+       /* NOTE: this does not construct a BBT time in a canonical form,
+          in that beats may be a very large number, and bars will
+          always be zero.
+       */
 
        assert (dbeats >= 0);
 
-        bars = 0;
-        beats = lrint (floor (dbeats));
-        ticks = lrint (floor (BBT_Time::ticks_per_beat * fmod (dbeats, 1.0)));
+       bars = 0;
+       beats = lrint (floor (dbeats));
+       ticks = lrint (floor (BBT_Time::ticks_per_beat * fmod (dbeats, 1.0)));
 }

diff --git a/libs/timecode/timecode/bbt_time.h b/libs/timecode/timecode/bbt_time.h
index 8b92f6efa94eaa3e53f56103aeb42a47649e8b02..b3ba3a6b571c50d0b9b4571463298dd337be1180 100644 (file)
--- a/libs/timecode/timecode/bbt_time.h
+++ b/libs/timecode/timecode/bbt_time.h
@@ -41,7 +41,7 @@ struct LIBTIMECODE_API BBT_Time {
        BBT_Time (uint32_t ba, uint32_t be, uint32_t t)
                : bars (ba), beats (be), ticks (t) {}
 
-        BBT_Time (double beats);
+       BBT_Time (double beats);
 
        bool operator< (const BBT_Time& other) const {
                return bars < other.bars ||