projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't show DSP stats of inserts that don't collect them.
[ardour.git]
/
gtk2_ardour
/
bundle_manager.cc
diff --git
a/gtk2_ardour/bundle_manager.cc
b/gtk2_ardour/bundle_manager.cc
index 035046c10b6b4eb4313ce5395f50d7ed888b00a2..3ae74d3a2c818dffdfefee3110ad2d4c3e29ea35 100644
(file)
--- 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 "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;
#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> bundle)
: PortMatrix (parent, session, DataType::NIL)
BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
: PortMatrix (parent, session, DataType::NIL)
@@
-202,13
+203,13
@@
BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
a = new Gtk::Alignment (0, 0.5, 0, 1);
a->add (_input_or_output);
t->attach (*Gtk::manage (a), 1, 2, 1, 2);
a = new Gtk::Alignment (0, 0.5, 0, 1);
a->add (_input_or_output);
t->attach (*Gtk::manage (a), 1, 2, 1, 2);
- _input_or_output.append_text (_("
Input
"));
- _input_or_output.append_text (_("
Output
"));
+ _input_or_output.append_text (_("
Destination
"));
+ _input_or_output.append_text (_("
Source
"));
if (bundle->ports_are_inputs()) {
if (bundle->ports_are_inputs()) {
- _input_or_output.set_active_text (_("
Input
"));
+ _input_or_output.set_active_text (_("
Source
"));
} else {
} else {
- _input_or_output.set_active_text (_("
Output
"));
+ _input_or_output.set_active_text (_("
Destination
"));
}
_input_or_output.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::input_or_output_changed));
}
_input_or_output.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::input_or_output_changed));
@@
-217,7
+218,6
@@
BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
get_vbox()->pack_start (_matrix);
get_vbox()->set_spacing (4);
get_vbox()->pack_start (_matrix);
get_vbox()->set_spacing (4);
- add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
show_all ();
signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press));
show_all ();
signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press));
@@
-242,7
+242,7
@@
BundleEditor::input_or_output_changed ()
{
_bundle->remove_ports_from_channels ();
{
_bundle->remove_ports_from_channels ();
- if (_input_or_output.get_active_text() == _("
Output
")) {
+ if (_input_or_output.get_active_text() == _("
Source
")) {
_bundle->set_ports_are_outputs ();
} else {
_bundle->set_ports_are_inputs ();
_bundle->set_ports_are_outputs ();
} else {
_bundle->set_ports_are_inputs ();
@@
-309,9
+309,6
@@
BundleManager::BundleManager (Session* session)
sigc::mem_fun (*this, &BundleManager::row_activated)
);
sigc::mem_fun (*this, &BundleManager::row_activated)
);
- Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
- close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide));
-
set_button_sensitivity ();
show_all ();
set_button_sensitivity ();
show_all ();
@@
-423,7
+420,6
@@
NameChannelDialog::NameChannelDialog ()
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
: ArdourDialog (_("Rename Channel")),
_bundle (b),
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
: ArdourDialog (_("Rename Channel")),
_bundle (b),
- _channel (c),
_adding (false)
{
_name.set_text (b->channel_name (c));
_adding (false)
{
_name.set_text (b->channel_name (c));