diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-11 09:11:53 -0400 |
| commit | 580520b12f90251e38d94a1a5d6a199b76142b0b (patch) | |
| tree | a20b79ac88794d4d92b88569e643ff67b515d6c3 /gtk2_ardour/ardour_ui.h | |
| parent | 0947791a800aa20ee0ea6a0334c789ab7a34fa90 (diff) | |
| parent | b649f0a21b711c68cba5e26945650fd36f657268 (diff) | |
fix conflicts caused by meterbridge merge
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 5d623a8731..b3b86af4f3 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -70,6 +70,7 @@ #include "ardour_dialog.h" #include "ardour_window.h" #include "editing.h" +#include "meterbridge.h" #include "nsm.h" #include "ui_config.h" #include "enums.h" @@ -305,6 +306,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void goto_editor_window (); void goto_mixer_window (); void toggle_mixer_window (); + void toggle_meterbridge (); void toggle_editor_mixer (); int setup_windows (); @@ -569,6 +571,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr PublicEditor *editor; int create_editor (); + Meterbridge *meterbridge; + int create_meterbridge (); /* Dialogs that can be created via new<T> */ WM::Proxy<SpeakerDialog> speaker_config_window; |