diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-22 15:29:44 -0400 |
| commit | 664e715a002450ac0f079411f6f051c122a4322a (patch) | |
| tree | 762f2a060843f77504ff39e2257ed4f32e6f83a1 /gtk2_ardour/ardour_ui.h | |
| parent | f86599cd74197ceb3e2e5cfe80a9a2dd5ee4201a (diff) | |
| parent | 61e66bb7631fc070a629d83e91855f58d7fb2489 (diff) | |
merge from master
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 1052ee23a6..9de5df3b9c 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -71,7 +71,6 @@ #include "ardour_window.h" #include "editing.h" #include "meterbridge.h" -#include "nsm.h" #include "ui_config.h" #include "enums.h" #include "visibility_group.h" @@ -104,6 +103,7 @@ class SpeakerDialog; class ThemeManager; class TimeInfoBox; class MidiTracer; +class NSM_Client; class LevelMeterHBox; class GlobalPortMatrixWindow; class GUIObjectState; @@ -691,7 +691,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool first_idle (); - void no_memory_warning (); void check_memory_locking (); bool check_audioengine(); |