projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[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 8d92f70ae2d7d1957e9b891e538192c098091fb1..4f5614e32a0e278ffb9879673833eae5424103e8 100644
(file)
--- a/
gtk2_ardour/ardour_ui_mixer.cc
+++ b/
gtk2_ardour/ardour_ui_mixer.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
/* This file contains any ARDOUR_UI methods that require knowledge of
*/
/* This file contains any ARDOUR_UI methods that require knowledge of
@@
-24,22
+23,49
@@
is to cut down on the nasty compile times for these classes.
*/
is to cut down on the nasty compile times for these classes.
*/
+#include "gtkmm2ext/keyboard.h"
+
+#include "actions.h"
#include "ardour_ui.h"
#include "mixer_ui.h"
#include "ardour_ui.h"
#include "mixer_ui.h"
+#include "meterbridge.h"
+
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace ARDOUR;
+using namespace PBD;
int
ARDOUR_UI::create_mixer ()
{
try {
int
ARDOUR_UI::create_mixer ()
{
try {
- mixer = new Mixer_UI (*engine);
- }
+ mixer = Mixer_UI::instance ();
+ mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+ }
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));
+
return 0;
}
return 0;
}
+
+
+int
+ARDOUR_UI::create_meterbridge ()
+
+{
+ try {
+ meterbridge = Meterbridge::instance ();
+ }
+
+ catch (failed_constructor& err) {
+ return -1;
+ }
+
+ return 0;
+}
+