X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftempo_dialog.cc;h=b601734beeae4ee4a442d547ad63d287f3e72e0e;hb=90ea64d1fc9e64347aca9df8c64ff0aeb674410d;hp=e83ff09a1daf5c2846196627e2bd2169e5e7a1de;hpb=cb160c81fa8bb1d2ba243cc6738996fd192e8245;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index e83ff09a1d..b601734bee 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +17,13 @@ */ -#include // for snprintf, grrr +#include // for snprintf, grrr #include -#include + +#include "gtkmm2ext/utils.h" + +#include "ardour/rc_configuration.h" #include "tempo_dialog.h" #include "utils.h" @@ -33,97 +36,121 @@ using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -TempoDialog::TempoDialog (TempoMap& map, nframes_t frame, const string & action) - : ArdourDialog (_("edit tempo")), - bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0, 1.0), - bpm_spinner (bpm_adjustment), - ok_button (action), - cancel_button (_("Cancel")), - when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER), - when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) +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) + , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER) + , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) + , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) { - BBT_Time when; + Timecode::BBT_Time when; Tempo tempo (map.tempo_at (frame)); map.bbt_time (frame, when); init (when, tempo.beats_per_minute(), tempo.note_type(), true); } -TempoDialog::TempoDialog (TempoSection& section, const string & action) - : ArdourDialog ("tempo dialog"), - bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0, 1.0), - bpm_spinner (bpm_adjustment), - ok_button (action), - cancel_button (_("Cancel")), - when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER), - when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) +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) + , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) + , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) { init (section.start(), section.beats_per_minute(), section.note_type(), section.movable()); } void -TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool movable) +TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bool movable) { + vector strings; + NoteTypes::iterator x; + bpm_spinner.set_numeric (true); bpm_spinner.set_digits (2); bpm_spinner.set_wrap (true); bpm_spinner.set_value (bpm); - strings.push_back (_("whole (1)")); - strings.push_back (_("second (2)")); - strings.push_back (_("third (3)")); - strings.push_back (_("quarter (4)")); - strings.push_back (_("eighth (8)")); - strings.push_back (_("sixteenth (16)")); - strings.push_back (_("thirty-second (32)")); + note_types.insert (make_pair (_("whole"), 1.0)); + strings.push_back (_("whole")); + note_types.insert (make_pair (_("second"), 2.0)); + strings.push_back (_("second")); + note_types.insert (make_pair (_("third"), 3.0)); + strings.push_back (_("third")); + note_types.insert (make_pair (_("quarter"), 4.0)); + 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)); + strings.push_back (_("sixty-fourth")); + note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128.0)); + strings.push_back (_("one-hundred-twenty-eighth")); + + set_popdown_strings (pulse_selector, strings); + + for (x = note_types.begin(); x != note_types.end(); ++x) { + if (x->second == note_type) { + pulse_selector.set_active_text (x->first); + break; + } + } + + if (x == note_types.end()) { + pulse_selector.set_active_text (strings[3]); // "quarter" + } - set_popdown_strings (note_types, strings, true); - - if (note_type == 1.0f) { - note_types.set_active_text (_("whole (1)")); - } else if (note_type == 2.0f) { - note_types.set_active_text (_("second (2)")); - } else if (note_type == 3.0f) { - note_types.set_active_text (_("third (3)")); - } else if (note_type == 4.0f) { - note_types.set_active_text (_("quarter (4)")); - } else if (note_type == 8.0f) { - note_types.set_active_text (_("eighth (8)")); - } else if (note_type == 16.0f) { - note_types.set_active_text (_("sixteenth (16)")); - } else if (note_type == 32.0f) { - note_types.set_active_text (_("thirty-second (32)")); + Table* table; + + if (Config->get_allow_non_quarter_pulse()) { + table = manage (new Table (5, 5)); } else { - note_types.set_active_text (_("quarter (4)")); + table = manage (new Table (5, 4)); } - Table* table = manage (new Table (3, 3)); table->set_spacings (6); + table->set_homogeneous (false); + int row; Label* bpm_label = manage (new Label(_("Beats per minute:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*bpm_label, 0, 2, 0, 1); - table->attach (bpm_spinner, 2, 3, 0, 1); + table->attach (*bpm_label, 0, 1, 0, 1); + table->attach (bpm_spinner, 1, 5, 0, 1); + + if (Config->get_allow_non_quarter_pulse()) { + table->attach (pulse_selector_label, 0, 1, 1, 2); + table->attach (pulse_selector, 1, 5, 1, 2); + row = 2; + } else { + row = 1; + } if (movable) { + char buf[64]; + snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); when_bar_entry.set_text (buf); 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); + when_bar_label.set_name ("MetricLabel"); when_beat_label.set_name ("MetricLabel"); - - table->attach (when_bar_label, 1, 2, 2, 3); - table->attach (when_bar_entry, 2, 3, 2, 3); - - table->attach (when_beat_label, 1, 2, 1, 2); - table->attach (when_beat_entry, 2, 3, 1, 2); - + + table->attach (when_bar_label, 1, 2, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + table->attach (when_bar_entry, 2, 3, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + + table->attach (when_beat_label, 3, 4, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + table->attach (when_beat_entry, 4, 5, row, row+1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*when_label, 0, 1, 1, 2); + table->attach (*when_label, 0, 1, row, row+1); } get_vbox()->set_border_width (12); @@ -139,14 +166,21 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova set_name ("MetricDialog"); - bpm_spinner.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); - bpm_spinner.signal_button_press_event().connect (mem_fun (*this, &TempoDialog::bpm_button_press), false); - bpm_spinner.signal_button_release_event().connect (mem_fun (*this, &TempoDialog::bpm_button_release), false); - when_bar_entry.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); - when_bar_entry.signal_key_release_event().connect (mem_fun (*this, &TempoDialog::entry_key_release), false); - when_beat_entry.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); - when_beat_entry.signal_key_release_event().connect (mem_fun (*this, &TempoDialog::entry_key_release), false); - note_types.signal_changed().connect (mem_fun (*this, &TempoDialog::note_types_change)); + bpm_spinner.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); + bpm_spinner.signal_button_press_event().connect (sigc::mem_fun (*this, &TempoDialog::bpm_button_press), false); + bpm_spinner.signal_button_release_event().connect (sigc::mem_fun (*this, &TempoDialog::bpm_button_release), false); + bpm_spinner.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::bpm_changed)); + when_bar_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); + when_bar_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TempoDialog::entry_key_release), false); + when_beat_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); + when_beat_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &TempoDialog::entry_key_release), false); + pulse_selector.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::pulse_change)); +} + +void +TempoDialog::bpm_changed () +{ + set_response_sensitive (RESPONSE_ACCEPT, true); } bool @@ -157,7 +191,7 @@ TempoDialog::bpm_button_press (GdkEventButton*) bool TempoDialog::bpm_button_release (GdkEventButton*) -{ +{ /* the value has been modified, accept should work now */ set_response_sensitive (RESPONSE_ACCEPT, true); @@ -166,7 +200,7 @@ TempoDialog::bpm_button_release (GdkEventButton*) bool TempoDialog::entry_key_release (GdkEventKey*) -{ +{ if (when_beat_entry.get_text() != "" && when_bar_entry.get_text() != "") { set_response_sensitive (RESPONSE_ACCEPT, true); } else { @@ -175,19 +209,19 @@ TempoDialog::entry_key_release (GdkEventKey*) return false; } -double +double TempoDialog::get_bpm () { return bpm_spinner.get_value (); -} +} bool -TempoDialog::get_bbt_time (BBT_Time& requested) +TempoDialog::get_bbt_time (Timecode::BBT_Time& requested) { if (sscanf (when_bar_entry.get_text().c_str(), "%" PRIu32, &requested.bars) != 1) { return false; } - + if (sscanf (when_beat_entry.get_text().c_str(), "%" PRIu32, &requested.beats) != 1) { return false; } @@ -200,92 +234,81 @@ TempoDialog::get_bbt_time (BBT_Time& requested) double TempoDialog::get_note_type () { - double note_type = 0; - vector::iterator i; - string text = note_types.get_active_text(); - - for (i = strings.begin(); i != strings.end(); ++i) { - if (text == *i) { - if (sscanf (text.c_str(), "%*[^0-9]%lf", ¬e_type) != 1) { - error << string_compose(_("garbaged note type entry (%1)"), text) << endmsg; - return 0; - } else { - break; - } - } - } + NoteTypes::iterator x = note_types.find (pulse_selector.get_active_text()); - if (i == strings.end()) { - if (sscanf (text.c_str(), "%lf", ¬e_type) != 1) { - error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg; - return 0; - } + if (x == note_types.end()) { + error << string_compose(_("incomprehensible pulse note type (%1)"), pulse_selector.get_active_text()) << endmsg; + return 0; } - return note_type; + return x->second; } void -TempoDialog::note_types_change () +TempoDialog::pulse_change () { set_response_sensitive (RESPONSE_ACCEPT, true); } -MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action) - : ArdourDialog ("meter dialog"), - ok_button (action), - cancel_button (_("Cancel")) +MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&) + : ArdourDialog (_("New Meter")) { - BBT_Time when; - frame = map.round_to_bar(frame,0); + Timecode::BBT_Time when; + frame = map.round_to_bar(frame,0); Meter meter (map.meter_at(frame)); map.bbt_time (frame, when); - init (when, meter.beats_per_bar(), meter.note_divisor(), true); + init (when, meter.divisions_per_bar(), meter.note_divisor(), true); } -MeterDialog::MeterDialog (MeterSection& section, const string & action) - : ArdourDialog ("meter dialog"), - ok_button (action), - cancel_button (_("Cancel")) +MeterDialog::MeterDialog (MeterSection& section, const string&) + : ArdourDialog (_("Edit Meter")) { - init (section.start(), section.beats_per_bar(), section.note_divisor(), section.movable()); + init (section.start(), section.divisions_per_bar(), section.note_divisor(), section.movable()); } void -MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool movable) +MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double divisor, bool movable) { + char buf[64]; + vector strings; + NoteTypes::iterator x; + snprintf (buf, sizeof (buf), "%.2f", bpb); bpb_entry.set_text (buf); bpb_entry.select_region (0, -1); - strings.push_back (_("whole (1)")); - strings.push_back (_("second (2)")); - strings.push_back (_("third (3)")); - strings.push_back (_("quarter (4)")); - strings.push_back (_("eighth (8)")); - strings.push_back (_("sixteenth (16)")); - strings.push_back (_("thirty-second (32)")); + note_types.insert (make_pair (_("whole"), 1.0)); + strings.push_back (_("whole")); + note_types.insert (make_pair (_("second"), 2.0)); + strings.push_back (_("second")); + note_types.insert (make_pair (_("third"), 3.0)); + strings.push_back (_("third")); + note_types.insert (make_pair (_("quarter"), 4.0)); + 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)); + strings.push_back (_("sixty-fourth")); + note_types.insert (make_pair (_("one-hundred-twenty-eighth"), 128.0)); + strings.push_back (_("one-hundred-twenty-eighth")); + + set_popdown_strings (note_type, strings); + + for (x = note_types.begin(); x != note_types.end(); ++x) { + if (x->second == divisor) { + note_type.set_active_text (x->first); + break; + } + } - set_popdown_strings (note_types, strings, true); - - if (note_type == 1.0f) { - note_types.set_active_text (_("whole (1)")); - } else if (note_type == 2.0f) { - note_types.set_active_text (_("second (2)")); - } else if (note_type == 3.0f) { - note_types.set_active_text (_("third (3)")); - } else if (note_type == 4.0f) { - note_types.set_active_text (_("quarter (4)")); - } else if (note_type == 8.0f) { - note_types.set_active_text (_("eighth (8)")); - } else if (note_type == 16.0f) { - note_types.set_active_text (_("sixteenth (16)")); - } else if (note_type == 32.0f) { - note_types.set_active_text (_("thirty-second (32)")); - } else { - note_types.set_active_text (_("quarter (4)")); + if (x == note_types.end()) { + note_type.set_active_text (strings[3]); // "quarter" } Label* note_label = manage (new Label (_("Note value:"), ALIGN_LEFT, ALIGN_CENTER)); @@ -296,13 +319,14 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova table->attach (*bpb_label, 0, 1, 0, 1, FILL|EXPAND, FILL|EXPAND); table->attach (bpb_entry, 1, 2, 0, 1, FILL|EXPAND, FILL|EXPAND); table->attach (*note_label, 0, 1, 1, 2, FILL|EXPAND, FILL|EXPAND); - table->attach (note_types, 1, 2, 1, 2, FILL|EXPAND, SHRINK); + table->attach (note_type, 1, 2, 1, 2, FILL|EXPAND, SHRINK); if (movable) { + char buf[64]; + 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)); table->attach (*when_label, 0, 1, 2, 3, FILL | EXPAND, FILL | EXPAND); @@ -314,8 +338,6 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova 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); @@ -324,21 +346,20 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova get_vbox()->show_all (); set_name ("MetricDialog"); - bpb_entry.signal_activate().connect (bind (mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); - bpb_entry.signal_key_press_event().connect (mem_fun (*this, &MeterDialog::entry_key_press), false); - bpb_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::entry_key_release)); - when_bar_entry.signal_activate().connect (bind (mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); - when_bar_entry.signal_key_press_event().connect (mem_fun (*this, &MeterDialog::entry_key_press), false); - when_bar_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::entry_key_release)); - - note_types.signal_changed().connect (mem_fun (*this, &MeterDialog::note_types_change)); + bpb_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); + bpb_entry.signal_key_press_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_press), false); + bpb_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_release)); + when_bar_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); + when_bar_entry.signal_key_press_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_press), false); + when_bar_entry.signal_key_release_event().connect (sigc::mem_fun (*this, &MeterDialog::entry_key_release)); + note_type.signal_changed().connect (sigc::mem_fun (*this, &MeterDialog::note_type_change)); } bool MeterDialog::entry_key_press (GdkEventKey* ev) { - switch (ev->keyval) { + switch (ev->keyval) { case GDK_0: case GDK_1: @@ -394,7 +415,7 @@ MeterDialog::entry_key_release (GdkEventKey*) } void -MeterDialog::note_types_change () +MeterDialog::note_type_change () { set_response_sensitive (RESPONSE_ACCEPT, true); } @@ -403,52 +424,35 @@ double MeterDialog::get_bpb () { double bpb = 0; - + if (sscanf (bpb_entry.get_text().c_str(), "%lf", &bpb) != 1) { return 0; } return bpb; } - + double MeterDialog::get_note_type () { - double note_type = 0; - vector::iterator i; - string text = note_types.get_active_text(); - - for (i = strings.begin(); i != strings.end(); ++i) { - if (text == *i) { - if (sscanf (text.c_str(), "%*[^0-9]%lf", ¬e_type) != 1) { - error << string_compose(_("garbaged note type entry (%1)"), text) << endmsg; - return 0; - } else { - break; - } - } - } + NoteTypes::iterator x = note_types.find (note_type.get_active_text()); - if (i == strings.end()) { - if (sscanf (text.c_str(), "%lf", ¬e_type) != 1) { - error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg; - return 0; - } + if (x == note_types.end()) { + error << string_compose(_("incomprehensible meter note type (%1)"), note_type.get_active_text()) << endmsg; + return 0; } - return note_type; + return x->second; } bool -MeterDialog::get_bbt_time (BBT_Time& requested) +MeterDialog::get_bbt_time (Timecode::BBT_Time& requested) { - if (sscanf (when_bar_entry.get_text().c_str(), "%" PRIu32, &requested.bars) != 1) { return false; } - - requested.beats = 1; + requested.beats = 1; requested.ticks = 0; return true;