set midi-metric ticks depending on meter-type

[ardour.git] / gtk2_ardour / tempo_dialog.cc

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 0edc098c86ba1f6bec2a9f797c88f60adfee804e..b601734beeae4ee4a442d547ad63d287f3e72e0e 100644 (file)
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -36,7 +36,7 @@ using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
 
-TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action)
+TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
        : ArdourDialog (_("New Tempo"))
        , bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
        , bpm_spinner (bpm_adjustment)
@@ -51,8 +51,8 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action
        init (when, tempo.beats_per_minute(), tempo.note_type(), true);
 }
 
-TempoDialog::TempoDialog (TempoSection& section, const string & action)
-       : ArdourDialog ("Edit Tempo")
+TempoDialog::TempoDialog (TempoSection& section, const string&)
+       : ArdourDialog (_("Edit Tempo"))
        , bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
        , bpm_spinner (bpm_adjustment)
        , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER)
@@ -83,6 +83,8 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
        strings.push_back (_("quarter"));
        note_types.insert (make_pair (_("eighth"), 8.0));
        strings.push_back (_("eighth"));
+       note_types.insert (make_pair (_("sixteenth"), 16.0));
+       strings.push_back (_("sixteenth"));
        note_types.insert (make_pair (_("thirty-second"), 32.0));
        strings.push_back (_("thirty-second"));
        note_types.insert (make_pair (_("sixty-fourth"), 64.0));
@@ -135,9 +137,6 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type,
                snprintf (buf, sizeof (buf), "%" PRIu32, when.beats);
                when_beat_entry.set_text (buf);
 
-               when_bar_entry.set_name ("MetricEntry");
-               when_beat_entry.set_name ("MetricEntry");
-
                when_bar_entry.set_width_chars(4);
                when_beat_entry.set_width_chars (4);
 
@@ -252,8 +251,8 @@ TempoDialog::pulse_change ()
 }
 
 
-MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action)
-       : ArdourDialog ("New Meter")
+MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
+       : ArdourDialog (_("New Meter"))
 {
        Timecode::BBT_Time when;
        frame = map.round_to_bar(frame,0);
@@ -263,8 +262,8 @@ MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action
        init (when, meter.divisions_per_bar(), meter.note_divisor(), true);
 }
 
-MeterDialog::MeterDialog (MeterSection& section, const string & action)
-       : ArdourDialog ("Edit Meter")
+MeterDialog::MeterDialog (MeterSection& section, const string&)
+       : ArdourDialog (_("Edit Meter"))
 {
        init (section.start(), section.divisions_per_bar(), section.note_divisor(), section.movable());
 }
@@ -290,6 +289,8 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
        strings.push_back (_("quarter"));
        note_types.insert (make_pair (_("eighth"), 8.0));
        strings.push_back (_("eighth"));
+       note_types.insert (make_pair (_("sixteenth"), 16.0));
+       strings.push_back (_("sixteenth"));
        note_types.insert (make_pair (_("thirty-second"), 32.0));
        strings.push_back (_("thirty-second"));
        note_types.insert (make_pair (_("sixty-fourth"), 64.0));
@@ -325,7 +326,6 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
 
                snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
                when_bar_entry.set_text (buf);
-               when_bar_entry.set_name ("MetricEntry");
 
                Label* when_label = manage (new Label(_("Meter begins at bar:"), ALIGN_LEFT, ALIGN_CENTER));
 
@@ -338,8 +338,6 @@ MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, b
        get_vbox()->set_border_width (12);
        get_vbox()->pack_start (*table, false, false);
 
-       bpb_entry.set_name ("MetricEntry");
-
        add_button (Stock::CANCEL, RESPONSE_CANCEL);
        add_button (Stock::APPLY, RESPONSE_ACCEPT);
        set_response_sensitive (RESPONSE_ACCEPT, false);
@@ -455,7 +453,6 @@ MeterDialog::get_bbt_time (Timecode::BBT_Time& requested)
        }
 
        requested.beats = 1;
-
        requested.ticks = 0;
 
        return true;