projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: whitespace
[ardour.git]
/
gtk2_ardour
/
tempo_dialog.h
diff --git
a/gtk2_ardour/tempo_dialog.h
b/gtk2_ardour/tempo_dialog.h
index 842c2f2c3c3b532e273247ce8a232ba94ae42034..f9f0dd34a01e423b107b4b6a9022cc0d43344a8d 100644
(file)
--- a/
gtk2_ardour/tempo_dialog.h
+++ b/
gtk2_ardour/tempo_dialog.h
@@
-38,16
+38,18
@@
class TempoDialog : public ArdourDialog
{
public:
class TempoDialog : public ArdourDialog
{
public:
- TempoDialog (ARDOUR::TempoMap&,
fram
epos_t, const std::string & action);
- TempoDialog (ARDOUR::TempoSection&, const std::string & action);
+ TempoDialog (ARDOUR::TempoMap&,
sampl
epos_t, const std::string & action);
+ TempoDialog (ARDOUR::Tempo
Map&, ARDOUR::Tempo
Section&, const std::string & action);
double get_bpm ();
double get_bpm ();
+ double get_end_bpm ();
double get_note_type ();
bool get_bbt_time (Timecode::BBT_Time&);
double get_note_type ();
bool get_bbt_time (Timecode::BBT_Time&);
- ARDOUR::TempoSection::TempoSectionType get_tempo_type ();
+ ARDOUR::TempoSection::Type get_tempo_type ();
+ ARDOUR::PositionLockStyle get_lock_style ();
private:
private:
- void init (const Timecode::BBT_Time& start, double
, double, bool
);
+ void init (const Timecode::BBT_Time& start, double
bpm, double end_bpm, double note_type, ARDOUR::TempoSection::Type type, bool movable, ARDOUR::PositionLockStyle style
);
bool is_user_input_valid() const;
void bpm_changed ();
bool bpm_button_press (GdkEventButton* );
bool is_user_input_valid() const;
void bpm_changed ();
bool bpm_button_press (GdkEventButton* );
@@
-55,24
+57,37
@@
private:
bool entry_key_release (GdkEventKey* );
void pulse_change ();
void tempo_type_change ();
bool entry_key_release (GdkEventKey* );
void pulse_change ();
void tempo_type_change ();
- bool tap_tempo_button_press (GdkEventButton* );
+ void lock_style_change ();
+ bool tap_tempo_key_press (GdkEventKey*);
+ bool tap_tempo_button_press (GdkEventButton*);
bool tap_tempo_focus_out (GdkEventFocus* );
bool tap_tempo_focus_out (GdkEventFocus* );
+ void tap_tempo ();
+
typedef std::map<std::string,float> NoteTypes;
NoteTypes note_types;
typedef std::map<std::string,float> NoteTypes;
NoteTypes note_types;
- typedef std::map<std::string, ARDOUR::TempoSection::T
empoSectionT
ype> TempoTypes;
+ typedef std::map<std::string, ARDOUR::TempoSection::Type> TempoTypes;
TempoTypes tempo_types;
TempoTypes tempo_types;
+ typedef std::map<std::string, ARDOUR::PositionLockStyle> LockStyles;
+ LockStyles lock_styles;
+
bool tapped; // whether the tap-tempo button has been clicked
double sum_x, sum_xx, sum_xy, sum_y;
double tap_count;
double last_t;
gint64 first_t;
bool tapped; // whether the tap-tempo button has been clicked
double sum_x, sum_xx, sum_xy, sum_y;
double tap_count;
double last_t;
gint64 first_t;
+ ARDOUR::TempoMap* _map;
+ ARDOUR::TempoSection* _section;
+
Gtk::ComboBoxText pulse_selector;
Gtk::Adjustment bpm_adjustment;
Gtk::SpinButton bpm_spinner;
Gtk::ComboBoxText pulse_selector;
Gtk::Adjustment bpm_adjustment;
Gtk::SpinButton bpm_spinner;
+ Gtk::Adjustment end_bpm_adjustment;
+ Gtk::SpinButton end_bpm_spinner;
+ Gtk::Label _end_bpm_label;
Gtk::Entry when_bar_entry;
Gtk::Entry when_beat_entry;
Gtk::Label when_bar_label;
Gtk::Entry when_bar_entry;
Gtk::Entry when_beat_entry;
Gtk::Label when_bar_label;
@@
-80,32
+95,38
@@
private:
Gtk::Label pulse_selector_label;
Gtk::Button tap_tempo_button;
Gtk::ComboBoxText tempo_type;
Gtk::Label pulse_selector_label;
Gtk::Button tap_tempo_button;
Gtk::ComboBoxText tempo_type;
-
+ Gtk::ComboBoxText lock_style;
};
class MeterDialog : public ArdourDialog
{
public:
};
class MeterDialog : public ArdourDialog
{
public:
- MeterDialog (ARDOUR::TempoMap&,
fram
epos_t, const std::string & action);
- MeterDialog (ARDOUR::MeterSection&, const std::string & action);
+ MeterDialog (ARDOUR::TempoMap&,
sampl
epos_t, const std::string & action);
+ MeterDialog (ARDOUR::
TempoMap&, ARDOUR::
MeterSection&, const std::string & action);
double get_bpb ();
double get_note_type ();
double get_bpb ();
double get_note_type ();
+ ARDOUR::PositionLockStyle get_lock_style ();
bool get_bbt_time (Timecode::BBT_Time&);
private:
bool get_bbt_time (Timecode::BBT_Time&);
private:
- void init (const Timecode::BBT_Time&, double, double, bool);
+ void init (const Timecode::BBT_Time&, double, double, bool
, ARDOUR::PositionLockStyle style
);
bool is_user_input_valid() const;
bool entry_key_press (GdkEventKey* );
bool entry_key_release (GdkEventKey* );
void note_type_change ();
bool is_user_input_valid() const;
bool entry_key_press (GdkEventKey* );
bool entry_key_release (GdkEventKey* );
void note_type_change ();
+ void lock_style_change ();
typedef std::map<std::string,float> NoteTypes;
NoteTypes note_types;
typedef std::map<std::string,float> NoteTypes;
NoteTypes note_types;
+ typedef std::map<std::string, ARDOUR::PositionLockStyle> LockStyles;
+ LockStyles lock_styles;
+
Gtk::Entry bpb_entry;
Gtk::ComboBoxText note_type;
Gtk::Entry bpb_entry;
Gtk::ComboBoxText note_type;
+ Gtk::ComboBoxText lock_style;
std::vector<std::string> strings;
Gtk::Button ok_button;
Gtk::Button cancel_button;
std::vector<std::string> strings;
Gtk::Button ok_button;
Gtk::Button cancel_button;