projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add canvas-based Meter object
[ardour.git]
/
gtk2_ardour
/
ardour_ui_mixer.cc
diff --git
a/gtk2_ardour/ardour_ui_mixer.cc
b/gtk2_ardour/ardour_ui_mixer.cc
index a0b0519a26740507fcf1b319f60136c94b8f1e4c..4f5614e32a0e278ffb9879673833eae5424103e8 100644
(file)
--- a/
gtk2_ardour/ardour_ui_mixer.cc
+++ b/
gtk2_ardour/ardour_ui_mixer.cc
@@
-30,7
+30,7
@@
#include "mixer_ui.h"
#include "meterbridge.h"
#include "mixer_ui.h"
#include "meterbridge.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
@@
-42,14
+42,13
@@
ARDOUR_UI::create_mixer ()
try {
mixer = Mixer_UI::instance ();
mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
try {
mixer = Mixer_UI::instance ();
mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
- mixer->add_to_notebook (_tabs, _("Mixer"));
}
catch (failed_constructor& err) {
return -1;
}
}
catch (failed_constructor& err) {
return -1;
}
- mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
+
//
mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
return 0;
}
return 0;
}