projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracks build ... backends are hard-coded
[ardour.git]
/
gtk2_ardour
/
step_entry.h
diff --git
a/gtk2_ardour/step_entry.h
b/gtk2_ardour/step_entry.h
index 4723f569d727162c970ca73a6b9cc1b771c6fbeb..bd354f3f66dab68aab814b0606136d53d6d515e1 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 <gtkmm/adjustment.h>
#include <gtkmm2ext/bindings.h>
-#include "ardour_
dialog
.h"
+#include "ardour_
window
.h"
#include "gtk_pianokeyboard.h"
class StepEditor;
#include "gtk_pianokeyboard.h"
class StepEditor;
-class StepEntry : public Ardour
Dialog
+class StepEntry : public Ardour
Window
{
public:
StepEntry (StepEditor&);
{
public:
StepEntry (StepEditor&);
@@
-41,14
+41,14
@@
class StepEntry : public ArdourDialog
void note_off_event_handler (int note);
void rest_event_handler ();
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;
uint8_t note_velocity() const;
uint8_t note_channel() const;
-
+
int current_octave () const { return (int) floor (octave_adjustment.get_value()); }
int current_octave () const { return (int) floor (octave_adjustment.get_value()); }
-
+
private:
private:
- Evoral::
MusicalTime
_current_note_length;
+ Evoral::
Beats
_current_note_length;
uint8_t _current_note_velocity;
Gtk::VBox packer;
uint8_t _current_note_velocity;
Gtk::VBox packer;
@@
-158,7
+158,7
@@
class StepEntry : public ArdourDialog
void insert_fsharp ();
void insert_g ();
void insert_gsharp ();
void insert_fsharp ();
void insert_g ();
void insert_gsharp ();
-
+
void note_length_change (GtkAction*);
void note_velocity_change (GtkAction*);
void note_length_change (GtkAction*);
void note_velocity_change (GtkAction*);
@@
-182,6
+182,7
@@
class StepEntry : public ArdourDialog
void prev_octave ();
void octave_n (int n);
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_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_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 dot_change (GtkAction*);
void dot_value_change ();
void toggle_triplet();
void toggle_chord();
-
+
void do_sustain ();
void back();
void sync_to_edit_point ();
void do_sustain ();
void back();
void sync_to_edit_point ();