Browse Source

UI: Move ProjectorType enum to projector header

Shaolin 7 years ago
parent
commit
abbcb6ae88
3 changed files with 9 additions and 9 deletions
  1. 1 7
      UI/window-basic-main.hpp
  2. 1 1
      UI/window-projector.cpp
  3. 7 1
      UI/window-projector.hpp

+ 1 - 7
UI/window-basic-main.hpp

@@ -29,6 +29,7 @@
 #include "window-basic-transform.hpp"
 #include "window-basic-transform.hpp"
 #include "window-basic-adv-audio.hpp"
 #include "window-basic-adv-audio.hpp"
 #include "window-basic-filters.hpp"
 #include "window-basic-filters.hpp"
+#include "window-projector.hpp"
 
 
 #include <obs-frontend-internal.hpp>
 #include <obs-frontend-internal.hpp>
 
 
@@ -67,13 +68,6 @@ enum class QtDataRole {
 	OBSSignals,
 	OBSSignals,
 };
 };
 
 
-enum class ProjectorType {
-	Source,
-	Preview,
-	StudioProgram,
-	Multiview
-};
-
 struct QuickTransition {
 struct QuickTransition {
 	QPushButton *button = nullptr;
 	QPushButton *button = nullptr;
 	OBSSource source;
 	OBSSource source;

+ 1 - 1
UI/window-projector.cpp

@@ -3,7 +3,7 @@
 #include <QMouseEvent>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QMenu>
 #include <QScreen>
 #include <QScreen>
-#include "window-projector.hpp"
+#include "window-basic-main.hpp"
 #include "display-helpers.hpp"
 #include "display-helpers.hpp"
 #include "qt-wrappers.hpp"
 #include "qt-wrappers.hpp"
 #include "platform.hpp"
 #include "platform.hpp"

+ 7 - 1
UI/window-projector.hpp

@@ -2,7 +2,13 @@
 
 
 #include <obs.hpp>
 #include <obs.hpp>
 #include "qt-display.hpp"
 #include "qt-display.hpp"
-#include "window-basic-main.hpp"
+
+enum class ProjectorType {
+	Source,
+	Preview,
+	StudioProgram,
+	Multiview
+};
 
 
 class QMouseEvent;
 class QMouseEvent;