-#include <cstdio> // for snprintf, grrr
+/*
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cstdio> // for snprintf, grrr
#include <gtkmm/stock.h>
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
+
+#include "ardour_ui.h"
#include "tempo_dialog.h"
-#include "utils.h"
#include "i18n.h"
+using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR;
-
-TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, const string & action)
- : ArdourDialog ("tempo dialog"),
- bpm_frame (_("Beats per minute")),
- ok_button (action),
- cancel_button (_("Cancel")),
- when_bar_label (_("Bar")),
- when_beat_label (_("Beat")),
- when_table (2, 2),
- when_frame (_("Location"))
+using namespace PBD;
+
+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)
+ , tap_tempo_button (_("Tap tempo"))
{
- BBT_Time when;
+ Timecode::BBT_Time when;
Tempo tempo (map.tempo_at (frame));
map.bbt_time (frame, when);
- init (when, tempo.beats_per_minute(), true);
+ init (when, tempo.beats_per_minute(), tempo.note_type(), true);
}
-TempoDialog::TempoDialog (TempoSection& section, const string & action)
- : ArdourDialog ("tempo dialog"),
- bpm_frame (_("Beats per minute")),
- ok_button (action),
- cancel_button (_("Cancel")),
- when_bar_label (_("Bar")),
- when_beat_label (_("Beat")),
- when_table (2, 2),
- when_frame (_("Location"))
+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)
+ , tap_tempo_button (_("Tap tempo"))
{
- init (section.start(), section.beats_per_minute(), section.movable());
+ init (section.start(), section.beats_per_minute(), section.note_type(), section.movable());
}
void
-TempoDialog::init (const BBT_Time& when, double bpm, bool movable)
+TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, bool movable)
{
- snprintf (buf, sizeof (buf), "%.2f", bpm);
- bpm_entry.set_text (buf);
- bpm_entry.select_region (0, -1);
+ vector<string> strings;
+ NoteTypes::iterator x;
+
+ bpm_spinner.set_numeric (true);
+ bpm_spinner.set_digits (2);
+ bpm_spinner.set_wrap (true);
+ bpm_spinner.set_value (bpm);
+ bpm_spinner.set_alignment (1.0);
+
+ 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"
+ }
- hspacer1.set_border_width (5);
- hspacer1.pack_start (bpm_entry, false, false);
- vspacer1.set_border_width (5);
- vspacer1.pack_start (hspacer1, false, false);
+ Table* table;
+
+ if (ARDOUR_UI::config()->get_allow_non_quarter_pulse()) {
+ table = manage (new Table (5, 5));
+ } else {
+ table = manage (new Table (5, 4));
+ }
+
+ 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, 1, 0, 1);
+ table->attach (bpm_spinner, 1, 5, 0, 1);
- bpm_frame.add (vspacer1);
+ if (ARDOUR_UI::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;
+ }
+
+ 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);
if (movable) {
- 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_entry.set_alignment (1.0);
+ when_beat_entry.set_alignment (1.0);
+
when_bar_label.set_name ("MetricLabel");
when_beat_label.set_name ("MetricLabel");
-
- Gtkmm2ext::set_size_request_to_display_given_text (when_bar_entry, "999g", 5, 7);
- Gtkmm2ext::set_size_request_to_display_given_text (when_beat_entry, "999g", 5, 7);
-
- when_table.set_homogeneous (true);
- when_table.set_row_spacings (2);
- when_table.set_col_spacings (2);
- when_table.set_border_width (5);
-
- when_table.attach (when_bar_label, 0, 1, 0, 1, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND);
- when_table.attach (when_bar_entry, 0, 1, 1, 2, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND);
-
- when_table.attach (when_beat_label, 1, 2, 0, 1, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
- when_table.attach (when_beat_entry, 1, 2, 1, 2, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
-
- when_frame.set_name ("MetricDialogFrame");
- when_frame.add (when_table);
-
- get_vbox()->pack_start (when_frame, false, false);
+
+ 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, row, row+1);
}
- bpm_frame.set_name ("MetricDialogFrame");
- bpm_entry.set_name ("MetricEntry");
+ get_vbox()->set_border_width (12);
+ get_vbox()->pack_end (*table);
+ table->show_all ();
- get_vbox()->pack_start (bpm_frame, false, false);
-
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::APPLY, RESPONSE_ACCEPT);
- set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
+ set_response_sensitive (RESPONSE_ACCEPT, true);
set_default_response (RESPONSE_ACCEPT);
- get_vbox()->show_all();
- bpm_entry.show();
+ bpm_spinner.show ();
+ tap_tempo_button.show ();
+ get_vbox()->pack_end (tap_tempo_button);
+ bpm_spinner.grab_focus ();
set_name ("MetricDialog");
- bpm_entry.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT));
- bpm_entry.signal_key_release_event().connect (mem_fun (*this, &TempoDialog::bpm_key_release));
+
+ 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));
+ tap_tempo_button.signal_button_press_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_button_press), false);
+ tap_tempo_button.signal_focus_out_event().connect (sigc::mem_fun (*this, &TempoDialog::tap_tempo_focus_out));
+
+ tapped = false;
}
bool
-TempoDialog::bpm_key_release (GdkEventKey* ev)
+TempoDialog::is_user_input_valid() const
+{
+ return (when_beat_entry.get_text() != "")
+ && (when_bar_entry.get_text() != "")
+ && (when_bar_entry.get_text() != "0");
+}
+
+void
+TempoDialog::bpm_changed ()
+{
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
+}
+
+bool
+TempoDialog::bpm_button_press (GdkEventButton*)
{
- if (bpm_entry.get_text() != "") {
- set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
- } else {
- set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
- }
return false;
}
-double
-TempoDialog::get_bpm ()
+bool
+TempoDialog::bpm_button_release (GdkEventButton*)
{
- double bpm;
-
- if (sscanf (bpm_entry.get_text().c_str(), "%lf", &bpm) != 1) {
- return 0;
- }
+ /* the value has been modified, accept should work now */
- return bpm;
-}
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
+ return false;
+}
bool
-TempoDialog::get_bbt_time (BBT_Time& requested)
+TempoDialog::entry_key_release (GdkEventKey*)
+{
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
+ return false;
+}
+
+double
+TempoDialog::get_bpm ()
+{
+ return bpm_spinner.get_value ();
+}
+
+bool
+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;
}
+ requested.ticks = 0;
+
return true;
}
+double
+TempoDialog::get_note_type ()
+{
+ NoteTypes::iterator x = note_types.find (pulse_selector.get_active_text());
+
+ if (x == note_types.end()) {
+ error << string_compose(_("incomprehensible pulse note type (%1)"), pulse_selector.get_active_text()) << endmsg;
+ return 0;
+ }
-MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, const string & action)
- : ArdourDialog ("meter dialog"),
- note_frame (_("Meter denominator")),
- bpb_frame (_("Beats per bar")),
- ok_button (action),
- cancel_button (_("Cancel")),
- when_bar_label (_("Bar")),
- when_beat_label (_("Beat")),
- when_frame (_("Location"))
+ return x->second;
+}
+
+void
+TempoDialog::pulse_change ()
+{
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
+}
+
+bool
+TempoDialog::tap_tempo_button_press (GdkEventButton *ev)
{
- BBT_Time when;
- frame = map.round_to_bar(frame,0);
+ gint64 now;
+ now = g_get_monotonic_time (); // microseconds
+
+ if (tapped) {
+ double interval, bpm;
+ static const double decay = 0.5;
+
+ interval = (now - last_tap) * 1.0e-6;
+ if (interval <= 6.0) {
+ // <= 6 seconds (say): >= 10 bpm
+ if (average_interval > 0) {
+ if (average_interval > interval / 1.2 && average_interval < interval * 1.2) {
+ average_interval = interval * decay
+ + average_interval * (1.0-decay);
+ } else {
+ average_interval = 0;
+ }
+ } else {
+ average_interval = interval;
+ }
+
+ if (average_interval > 0) {
+ bpm = 60.0 / average_interval;
+ bpm_spinner.set_value (bpm);
+ }
+ } else {
+ average_interval = 0;
+ }
+ } else {
+ average_interval = 0;
+ tapped = true;
+ }
+ last_tap = now;
+}
+
+bool
+TempoDialog::tap_tempo_focus_out (GdkEventFocus* )
+{
+ tapped = false;
+ return false;
+}
+
+MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
+ : ArdourDialog (_("New Meter"))
+{
+ Timecode::BBT_Time when;
+ frame = map.round_to_bar(frame, RoundNearest);
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"),
- note_frame (_("Meter denominator")),
- bpb_frame (_("Beats per bar")),
- ok_button (action),
- cancel_button (_("Cancel")),
- when_bar_label (_("Bar")),
- when_beat_label (_("Beat")),
- when_frame (_("Location"))
+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<string> strings;
+ NoteTypes::iterator x;
+
snprintf (buf, sizeof (buf), "%.2f", bpb);
bpb_entry.set_text (buf);
bpb_entry.select_region (0, -1);
- Gtkmm2ext::set_size_request_to_display_given_text (bpb_entry, "999999g", 5, 5);
-
- 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)"));
+ bpb_entry.set_alignment (1.0);
+
+ 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);
-
- 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)"));
-
- /* strings.back() just happens to be the longest one to display */
- // GTK2FIX
- //Gtkmm2ext::set_size_request_to_display_given_text (note_types, "thirty-second (32)", 7, 7);
-
- hspacer1.set_border_width (5);
- hspacer1.pack_start (note_types, false, false);
- vspacer1.set_border_width (5);
- vspacer1.pack_start (hspacer1, false, false);
-
- hspacer2.set_border_width (5);
- hspacer2.pack_start (bpb_entry, false, false);
- vspacer2.set_border_width (5);
- vspacer2.pack_start (hspacer2, false, false);
-
- note_frame.add (vspacer1);
- bpb_frame.add (vspacer2);
+ 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));
+ Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_LEFT, ALIGN_CENTER));
+ Table* table = manage (new Table (3, 2));
+ table->set_spacings (6);
+
+ 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_type, 1, 2, 1, 2, FILL|EXPAND, SHRINK);
+
+ snprintf (buf, sizeof (buf), "%" PRIu32, when.bars);
+ when_bar_entry.set_text (buf);
+ when_bar_entry.set_alignment (1.0);
if (movable) {
- 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_label.set_name ("MetricLabel");
- when_beat_label.set_name ("MetricLabel");
-
- Gtkmm2ext::set_size_request_to_display_given_text (when_bar_entry, "999g", 5, 7);
- Gtkmm2ext::set_size_request_to_display_given_text (when_beat_entry, "999g", 5, 7);
-
- when_table.set_homogeneous (true);
- when_table.set_row_spacings (2);
- when_table.set_col_spacings (2);
- when_table.set_border_width (5);
-
- when_table.attach (when_bar_label, 0, 1, 0, 1, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND);
- when_table.attach (when_bar_entry, 0, 1, 1, 2, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND);
-
- when_table.attach (when_beat_label, 1, 2, 0, 1, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
- when_table.attach (when_beat_entry, 1, 2, 1, 2, Gtk::AttachOptions(0), Gtk::AttachOptions(0));
-
- when_frame.set_name ("MetricDialogFrame");
- when_frame.add (when_table);
-
- get_vbox()->pack_start (when_frame, false, false);
+ 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);
+ table->attach (when_bar_entry, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND);
}
- get_vbox()->pack_start (bpb_frame, false, false);
- get_vbox()->pack_start (note_frame, false, false);
-
- bpb_frame.set_name ("MetricDialogFrame");
- note_frame.set_name ("MetricDialogFrame");
- bpb_entry.set_name ("MetricEntry");
+
+ get_vbox()->set_border_width (12);
+ get_vbox()->pack_start (*table, false, false);
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::APPLY, RESPONSE_ACCEPT);
- set_response_sensitive (RESPONSE_ACCEPT, false);
+ set_response_sensitive (RESPONSE_ACCEPT, true);
set_default_response (RESPONSE_ACCEPT);
get_vbox()->show_all ();
- bpb_entry.show ();
set_name ("MetricDialog");
- bpb_entry.signal_activate().connect (bind (mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT));
- bpb_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::bpb_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::bpb_key_release (GdkEventKey* ev)
+MeterDialog::is_user_input_valid() const
{
- if (bpb_entry.get_text() != "") {
- set_response_sensitive (RESPONSE_ACCEPT, true);
- } else {
- set_response_sensitive (RESPONSE_ACCEPT, false);
+ return (when_bar_entry.get_text() != "")
+ && (when_bar_entry.get_text() != "0")
+ && (bpb_entry.get_text() != "");
+}
+
+bool
+MeterDialog::entry_key_press (GdkEventKey* ev)
+{
+
+ switch (ev->keyval) {
+
+ case GDK_0:
+ case GDK_1:
+ case GDK_2:
+ case GDK_3:
+ case GDK_4:
+ case GDK_5:
+ case GDK_6:
+ case GDK_7:
+ case GDK_8:
+ case GDK_9:
+ case GDK_KP_0:
+ case GDK_KP_1:
+ case GDK_KP_2:
+ case GDK_KP_3:
+ case GDK_KP_4:
+ case GDK_KP_5:
+ case GDK_KP_6:
+ case GDK_KP_7:
+ case GDK_KP_8:
+ case GDK_KP_9:
+ case GDK_period:
+ case GDK_comma:
+ case GDK_KP_Delete:
+ case GDK_KP_Enter:
+ case GDK_Delete:
+ case GDK_BackSpace:
+ case GDK_Escape:
+ case GDK_Return:
+ case GDK_Home:
+ case GDK_End:
+ case GDK_Left:
+ case GDK_Right:
+ case GDK_Num_Lock:
+ case GDK_Tab:
+ return FALSE;
+ default:
+ break;
}
+
+ return TRUE;
+}
+
+bool
+MeterDialog::entry_key_release (GdkEventKey*)
+{
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
return false;
}
void
-MeterDialog::note_types_change ()
+MeterDialog::note_type_change ()
{
- set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
+ set_response_sensitive (RESPONSE_ACCEPT, is_user_input_valid());
}
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<string>::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)
{
- requested.ticks = 0;
-
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;
- }
+
+ requested.beats = 1;
+ requested.ticks = 0;
return true;
}
projects / ardour.git / blobdiff