X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=234a603cbb6fd37cb047e237e076dfc26aa3392a;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=035046c10b6b4eb4313ce5395f50d7ed888b00a2;hpb=aaabaf5d3c8624f398809bb468e2b121a23abda0;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 035046c10b..234a603cbb 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -29,11 +29,12 @@ #include "ardour/user_bundle.h" #include "bundle_manager.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "utils.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr bundle) : PortMatrix (parent, session, DataType::NIL) @@ -423,7 +424,6 @@ NameChannelDialog::NameChannelDialog () NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint32_t c) : ArdourDialog (_("Rename Channel")), _bundle (b), - _channel (c), _adding (false) { _name.set_text (b->channel_name (c));