X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=cca9e6f7c5a3fc6e2602697a272e45bd6f651f94;hb=a41af5ff3bd7bdf09fd2ded500d27b82266b05ec;hp=e83ff09a1daf5c2846196627e2bd2169e5e7a1de;hpb=cb160c81fa8bb1d2ba243cc6738996fd192e8245;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index e83ff09a1d..cca9e6f7c5 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,7 +17,7 @@ */ -#include // for snprintf, grrr +#include // for snprintf, grrr #include #include @@ -33,16 +33,16 @@ 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), +TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action) + : ArdourDialog (_("New Tempo")), + bpm_adjustment (60.0, 1.0, 999.9, 0.1, 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) { - BBT_Time when; + Timecode::BBT_Time when; Tempo tempo (map.tempo_at (frame)); map.bbt_time (frame, when); @@ -50,8 +50,8 @@ TempoDialog::TempoDialog (TempoMap& map, nframes_t frame, const string & action) } TempoDialog::TempoDialog (TempoSection& section, const string & action) - : ArdourDialog ("tempo dialog"), - bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0, 1.0), + : ArdourDialog ("Edit Tempo"), + bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0), bpm_spinner (bpm_adjustment), ok_button (action), cancel_button (_("Cancel")), @@ -62,7 +62,7 @@ TempoDialog::TempoDialog (TempoSection& section, const string & action) } 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) { bpm_spinner.set_numeric (true); bpm_spinner.set_digits (2); @@ -76,7 +76,7 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova strings.push_back (_("eighth (8)")); strings.push_back (_("sixteenth (16)")); strings.push_back (_("thirty-second (32)")); - + set_popdown_strings (note_types, strings, true); if (note_type == 1.0f) { @@ -109,19 +109,19 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova 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"); - + 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); - + Label* when_label = manage (new Label(_("Tempo begins at"), ALIGN_LEFT, ALIGN_CENTER)); table->attach (*when_label, 0, 1, 1, 2); } @@ -139,14 +139,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); + note_types.signal_changed().connect (sigc::mem_fun (*this, &TempoDialog::note_types_change)); +} + +void +TempoDialog::bpm_changed () +{ + set_response_sensitive (RESPONSE_ACCEPT, true); } bool @@ -157,7 +164,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 +173,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 +182,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; } @@ -203,7 +210,7 @@ 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) { @@ -213,8 +220,8 @@ TempoDialog::get_note_type () break; } } - } - + } + if (i == strings.end()) { if (sscanf (text.c_str(), "%lf", ¬e_type) != 1) { error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg; @@ -232,13 +239,13 @@ TempoDialog::note_types_change () } -MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action) - : ArdourDialog ("meter dialog"), +MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action) + : ArdourDialog ("New Meter"), ok_button (action), cancel_button (_("Cancel")) { - 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); @@ -246,7 +253,7 @@ MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action) } MeterDialog::MeterDialog (MeterSection& section, const string & action) - : ArdourDialog ("meter dialog"), + : ArdourDialog ("Edit Meter"), ok_button (action), cancel_button (_("Cancel")) { @@ -254,7 +261,7 @@ MeterDialog::MeterDialog (MeterSection& section, const string & action) } void -MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool movable) +MeterDialog::init (const Timecode::BBT_Time& when, double bpb, double note_type, bool movable) { snprintf (buf, sizeof (buf), "%.2f", bpb); bpb_entry.set_text (buf); @@ -267,7 +274,7 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova strings.push_back (_("eighth (8)")); strings.push_back (_("sixteenth (16)")); strings.push_back (_("thirty-second (32)")); - + set_popdown_strings (note_types, strings, true); if (note_type == 1.0f) { @@ -302,7 +309,7 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova 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); @@ -324,21 +331,21 @@ 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_types.signal_changed().connect (sigc::mem_fun (*this, &MeterDialog::note_types_change)); } bool MeterDialog::entry_key_press (GdkEventKey* ev) { - switch (ev->keyval) { + switch (ev->keyval) { case GDK_0: case GDK_1: @@ -403,21 +410,21 @@ 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) { @@ -427,8 +434,8 @@ MeterDialog::get_note_type () break; } } - } - + } + if (i == strings.end()) { if (sscanf (text.c_str(), "%lf", ¬e_type) != 1) { error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg; @@ -440,13 +447,12 @@ MeterDialog::get_note_type () } 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.ticks = 0;