main.cc compiles.

[ardour.git] / gtk2_ardour / tempo_dialog.cc

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 0132aebfcb99a04d0857373f57b258302410e030..060cb9217f7538f9523af8a9cdf0e9d3d378ad00 100644 (file)
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -8,6 +8,7 @@
 #include "i18n.h"
 
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace ARDOUR;
 
 TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, string action)
@@ -175,6 +176,7 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova
        bpb_entry.select_region (0, -1);
        Gtkmm2ext::set_size_request_to_display_given_text (bpb_entry, "999999g", 5, 5);
 
+       vector<string> strings;
        
        strings.push_back (_("whole (1)"));
        strings.push_back (_("second (2)"));
@@ -299,7 +301,7 @@ MeterDialog::get_note_type ()
        for (i = strings.begin(); i != strings.end(); ++i) {
                if (text == *i) {
                        if (sscanf (text.c_str(), "%*[^0-9]%lf", &note_type) != 1) {
-                               error << compose(_("garbaged note type entry (%1)"), text) << endmsg;
+                               error << string_compose(_("garbaged note type entry (%1)"), text) << endmsg;
                                return 0;
                        } else {
                                break;
@@ -309,7 +311,7 @@ MeterDialog::get_note_type ()
        
        if (i == strings.end()) {
                if (sscanf (text.c_str(), "%lf", &note_type) != 1) {
-                       error << compose(_("incomprehensible note type entry (%1)"), text) << endmsg;
+                       error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg;
                        return 0;
                }
        }