X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=cca9e6f7c5a3fc6e2602697a272e45bd6f651f94;hb=91c057494be9f97020211ee1855c2d1d190df95c;hp=b78d57df63adf2d3f3af50aa439a5f8013d59699;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index b78d57df63..cca9e6f7c5 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -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);
@@ -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
@@ -182,7 +189,7 @@ TempoDialog::get_bpm ()
 }
 
 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;
@@ -232,12 +239,12 @@ 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;
+	Timecode::BBT_Time when;
 	frame = map.round_to_bar(frame,0);
 	Meter meter (map.meter_at(frame));
 
@@ -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);
@@ -324,14 +331,14 @@ 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
@@ -440,9 +447,8 @@ 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;
 	}