ardour/livetrax
13
0
Fork 0
Code

tempo dialog should use integer notes types, not double

Browse Source 
The days of "it's in Pi" are over.
This commit is contained in:
Paul Davis 2021-01-01 15:46:11 -07:00
parent 2c80aab912
commit b5e0bce101
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gtk2_ardour/tempo_dialog.cc
View File

@ -102,23 +102,23 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d
Gtkmm2ext::set_size_request_to_display_given_text (pulse_selector, _("one-hundred-twenty-eighth"), 3, 6); Gtkmm2ext::set_size_request_to_display_given_text (pulse_selector, _("one-hundred-twenty-eighth"), 3, 6);
note_types.insert (make_pair (_("whole"), 1.0)); note_types.insert (make_pair (_("whole"), 1));
strings.push_back (_("whole")); strings.push_back (_("whole"));
note_types.insert (make_pair (_("second"), 2.0)); note_types.insert (make_pair (_("second"), 2));
strings.push_back (_("second")); strings.push_back (_("second"));
note_types.insert (make_pair (_("third"), 3.0)); note_types.insert (make_pair (_("third"), 3));
strings.push_back (_("third")); strings.push_back (_("third"));
note_types.insert (make_pair (_("quarter"), 4.0)); note_types.insert (make_pair (_("quarter"), 4));
strings.push_back (_("quarter")); strings.push_back (_("quarter"));
note_types.insert (make_pair (_("eighth"), 8.0)); note_types.insert (make_pair (_("eighth"), 8));
strings.push_back (_("eighth")); strings.push_back (_("eighth"));
note_types.insert (make_pair (_("sixteenth"), 16.0)); note_types.insert (make_pair (_("sixteenth"), 16));
strings.push_back (_("sixteenth")); strings.push_back (_("sixteenth"));
note_types.insert (make_pair (_("thirty-second"), 32.0)); note_types.insert (make_pair (_("thirty-second"), 32));
strings.push_back (_("thirty-second")); strings.push_back (_("thirty-second"));
note_types.insert (make_pair (_("sixty-fourth"), 64.0)); note_types.insert (make_pair (_("sixty-fourth"), 64));
strings.push_back (_("sixty-fourth")); strings.push_back (_("sixty-fourth"));
note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128.0)); note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128));
strings.push_back (_("one-hundred-twenty-eighth")); strings.push_back (_("one-hundred-twenty-eighth"));
set_popdown_strings (pulse_selector, strings); set_popdown_strings (pulse_selector, strings);
@ -357,7 +357,7 @@ TempoDialog::get_bbt_time (Temporal::BBT_Time& requested)
return true; return true;
} }
double int
TempoDialog::get_note_type () TempoDialog::get_note_type ()
{ {
NoteTypes::iterator x = note_types.find (pulse_selector.get_active_text()); NoteTypes::iterator x = note_types.find (pulse_selector.get_active_text());
@ -513,23 +513,23 @@ MeterDialog::init (const Temporal::BBT_Time& when, double bpb, double divisor, b
bpb_entry.select_region (0, -1); bpb_entry.select_region (0, -1);
bpb_entry.set_alignment (1.0); bpb_entry.set_alignment (1.0);
note_types.insert (make_pair (_("whole"), 1.0)); note_types.insert (make_pair (_("whole"), 1));
strings.push_back (_("whole")); strings.push_back (_("whole"));
note_types.insert (make_pair (_("second"), 2.0)); note_types.insert (make_pair (_("second"), 2));
strings.push_back (_("second")); strings.push_back (_("second"));
note_types.insert (make_pair (_("third"), 3.0)); note_types.insert (make_pair (_("third"), 3));
strings.push_back (_("third")); strings.push_back (_("third"));
note_types.insert (make_pair (_("quarter"), 4.0)); note_types.insert (make_pair (_("quarter"), 4));
strings.push_back (_("quarter")); strings.push_back (_("quarter"));
note_types.insert (make_pair (_("eighth"), 8.0)); note_types.insert (make_pair (_("eighth"), 8));
strings.push_back (_("eighth")); strings.push_back (_("eighth"));
note_types.insert (make_pair (_("sixteenth"), 16.0)); note_types.insert (make_pair (_("sixteenth"), 16));
strings.push_back (_("sixteenth")); strings.push_back (_("sixteenth"));
note_types.insert (make_pair (_("thirty-second"), 32.0)); note_types.insert (make_pair (_("thirty-second"), 32));
strings.push_back (_("thirty-second")); strings.push_back (_("thirty-second"));
note_types.insert (make_pair (_("sixty-fourth"), 64.0)); note_types.insert (make_pair (_("sixty-fourth"), 64));
strings.push_back (_("sixty-fourth")); strings.push_back (_("sixty-fourth"));
note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128.0)); note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128));
strings.push_back (_("one-hundred-twenty-eighth")); strings.push_back (_("one-hundred-twenty-eighth"));
set_popdown_strings (note_type, strings); set_popdown_strings (note_type, strings);
@ -697,7 +697,7 @@ MeterDialog::get_bpb ()
return bpb; return bpb;
} }
double int
MeterDialog::get_note_type () MeterDialog::get_note_type ()
{ {
NoteTypes::iterator x = note_types.find (note_type.get_active_text()); NoteTypes::iterator x = note_types.find (note_type.get_active_text());

6
gtk2_ardour/tempo_dialog.h
View File

@ -48,7 +48,7 @@ public:
double get_bpm (); double get_bpm ();
double get_end_bpm (); double get_end_bpm ();
double get_note_type (); int get_note_type ();
bool get_bbt_time (Temporal::BBT_Time&); bool get_bbt_time (Temporal::BBT_Time&);
Temporal::Tempo::Type get_tempo_type (); Temporal::Tempo::Type get_tempo_type ();
Temporal::TimeDomain get_lock_style (); Temporal::TimeDomain get_lock_style ();
@ -69,7 +69,7 @@ private:
void tap_tempo (); void tap_tempo ();
typedef std::map<std::string,float> NoteTypes; typedef std::map<std::string,int> NoteTypes;
NoteTypes note_types; NoteTypes note_types;
typedef std::map<std::string, Temporal::Tempo::Type> TempoTypes; typedef std::map<std::string, Temporal::Tempo::Type> TempoTypes;
@ -110,7 +110,7 @@ public:
MeterDialog (Temporal::MeterPoint&, const std::string & action); MeterDialog (Temporal::MeterPoint&, const std::string & action);
double get_bpb (); double get_bpb ();
double get_note_type (); int get_note_type ();
Temporal::TimeDomain get_lock_style (); Temporal::TimeDomain get_lock_style ();
bool get_bbt_time (Temporal::BBT_Time&); bool get_bbt_time (Temporal::BBT_Time&);