Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / step_entry.h

diff --git a/gtk2_ardour/step_entry.h b/gtk2_ardour/step_entry.h
index 4723f569d727162c970ca73a6b9cc1b771c6fbeb..26c46d5c51150a24f54c4c0419205c55d89d16f0 100644 (file)
--- a/gtk2_ardour/step_entry.h
+++ b/gtk2_ardour/step_entry.h
@@ -27,12 +27,12 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm2ext/bindings.h>
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "gtk_pianokeyboard.h"
 
 class StepEditor;
 
-class StepEntry : public ArdourDialog
+class StepEntry : public ArdourWindow
 {
   public:
         StepEntry (StepEditor&);
@@ -41,14 +41,14 @@ class StepEntry : public ArdourDialog
         void note_off_event_handler (int note);
         void rest_event_handler ();
 
-        Evoral::MusicalTime note_length();
+        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::MusicalTime _current_note_length;
+        Evoral::Beats _current_note_length;
         uint8_t _current_note_velocity;
 
         Gtk::VBox packer;
@@ -140,7 +140,6 @@ class StepEntry : public ArdourDialog
         /* actions */
 
         void register_actions ();
-        Gtkmm2ext::ActionMap myactions;
 
         void insert_note (uint8_t);
         void insert_rest ();
@@ -158,7 +157,7 @@ class StepEntry : public ArdourDialog
         void insert_fsharp ();
         void insert_g ();
         void insert_gsharp ();
-        
+
         void note_length_change (GtkAction*);
         void note_velocity_change (GtkAction*);
 
@@ -166,7 +165,8 @@ class StepEntry : public ArdourDialog
         bool radio_button_release (GdkEventButton*, Gtk::RadioButton*, int);
 
         void load_bindings ();
-        Gtkmm2ext::Bindings  bindings;
+       Gtkmm2ext::ActionMap myactions;
+       Gtkmm2ext::Bindings*  bindings;
 
         void inc_note_velocity ();
         void dec_note_velocity ();
@@ -182,6 +182,7 @@ class StepEntry : public ArdourDialog
         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); }
@@ -192,14 +193,13 @@ class StepEntry : public ArdourDialog
         void octave_8 () { octave_n (8); }
         void octave_9 () { octave_n (9); }
         void octave_10 () { octave_n (10); }
-        void octave_11 () { octave_n (11); }
 
         void dot_change (GtkAction*);
         void dot_value_change ();
 
         void toggle_triplet();
         void toggle_chord();
-        
+
         void do_sustain ();
         void back();
         void sync_to_edit_point ();