summaryrefslogtreecommitdiff
path: root/gtk2_ardour/add_route_dialog.cc
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
commit49ab3aa0b3e78b635c22512b30f44b951c1401f7 (patch)
treea1380f163eb95d1e62698a919a451cc0892c1a80 /gtk2_ardour/add_route_dialog.cc
parentbc46c6e5d44de56a8ef290484766a0f3bcfbed65 (diff)
All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert. Various cleanups. git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/add_route_dialog.cc')
-rw-r--r--gtk2_ardour/add_route_dialog.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index f04ec7b707..ef8e601344 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -24,6 +24,7 @@
#include <sigc++/bind.h>
#include <gtkmm/stock.h>
#include <pbd/error.h>
+#include <pbd/convert.h>
#include <gtkmm2ext/utils.h>
#include "utils.h"
@@ -64,11 +65,11 @@ AddRouteDialog::AddRouteDialog ()
routes_spinner (routes_adjustment)
{
if (channel_combo_strings.empty()) {
- channel_combo_strings = internationalize (channel_setup_names);
+ channel_combo_strings = PBD::internationalize (channel_setup_names);
}
if (track_mode_strings.empty()) {
- track_mode_strings = internationalize (track_mode_names);
+ track_mode_strings = PBD::internationalize (track_mode_names);
}
set_name ("AddRouteDialog");
@@ -195,10 +196,10 @@ AddRouteDialog::channels ()
return 1;
} else if (str == _("Stereo")) {
return 2;
- } else if ((chns = atoi (str)) != 0) {
+ } else if ((chns = PBD::atoi (str)) != 0) {
return chns;
- } else {
- return 0;
- }
+ }
+
+ return 0;
}