diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2014-12-23 10:54:25 +0700 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
commit | b8e9ee50e0bd2ce8768e6dacf83a77112947a016 (patch) | |
tree | 13f121864f99c60f7b8b2a4ea9694b5ae6f81238 | |
parent | 513ecad1f01074354651b34db647b90254244fe6 (diff) |
Use Forward declaration for non-MSVC compilers in ardour_ui.h
I can't test this with MSVC so John might have to fix this, just
adding the necessary header includes inside MSVC specific ifdef
but I think it should be OK
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 27 | ||||
-rw-r--r-- | gtk2_ardour/monitor_section.cc | 1 |
2 files changed, 22 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index c9f0866f21..9e69038493 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -67,21 +67,22 @@ #include "video_timeline.h" -#include "about.h" +#include "add_route_dialog.h" #include "ardour_button.h" #include "ardour_dialog.h" #include "ardour_window.h" #include "editing.h" -#include "engine_dialog.h" -#include "export_video_dialog.h" #include "enums.h" #include "visibility_group.h" #include "window_manager.h" -#include "add_route_dialog.h" +#ifdef COMPILER_MSVC +#include "about.h" #include "add_video_dialog.h" #include "big_clock_window.h" #include "bundle_manager.h" +#include "engine_dialog.h" +#include "export_video_dialog.h" #include "global_port_matrix.h" #include "keyeditor.h" #include "location_ui.h" @@ -89,6 +90,22 @@ #include "route_params_ui.h" #include "session_option_editor.h" #include "speaker_dialog.h" +#else +class About; +class AddRouteDialog; +class AddVideoDialog; +class BigClockWindow; +class BundleManager; +class EngineControl; +class ExportVideoDialog; +class KeyEditor; +class LocationUIWindow; +class RCOptionEditor; +class RouteParams_UI; +class SessionOptionEditor; +class SpeakerDialog; +class GlobalPortMatrixWindow; +#endif class VideoTimeLine; class ArdourKeyboard; @@ -98,8 +115,6 @@ class ConnectionEditor; class MainClock; class Mixer_UI; class PublicEditor; -class RCOptionEditor; -class RouteParams_UI; class SaveAsDialog; class SessionDialog; class SessionOptionEditor; diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 1c0342d1ac..bae774d314 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -35,6 +35,7 @@ #include "ardour/monitor_processor.h" #include "ardour/port.h" #include "ardour/route.h" +#include "ardour/user_bundle.h" #include "ardour_ui.h" #include "gui_thread.h" |