From cf2a45e9b788252fa10e103266a4ff4d3b1eeeb2 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Fri, 2 Oct 2015 11:54:46 -0400
Subject: [PATCH] build: remove video_mixer.h dependency on some headers
This dependency causes a almost complet build if only video_mixer
is changed.
Issue: #81174
Change-Id: I1d374b582e6f388962ff78f67ee03b967ee82779
---
src/conference.cpp | 1 +
src/conference.h | 8 +++++---
src/media/video/video_sender.h | 1 -
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/conference.cpp b/src/conference.cpp
index 19df4d4ea3..46b15c4f8d 100644
--- a/src/conference.cpp
+++ b/src/conference.cpp
@@ -30,6 +30,7 @@
#include "sip/sipcall.h"
#include "client/videomanager.h"
#include "video/video_input.h"
+#include "video/video_mixer.h"
#endif
#include "call_factory.h"
diff --git a/src/conference.h b/src/conference.h
index daaf1c25e4..d55dd5396b 100644
--- a/src/conference.h
+++ b/src/conference.h
@@ -30,12 +30,14 @@
#include "audio/recordable.h"
+namespace ring {
+
#ifdef RING_VIDEO
-#include "video/video_mixer.h"
+namespace video {
+class VideoMixer;
+}
#endif
-namespace ring {
-
typedef std::set<std::string> ParticipantSet;
class Conference : public Recordable {
diff --git a/src/media/video/video_sender.h b/src/media/video/video_sender.h
index e6b6413004..e5a4511fbf 100644
--- a/src/media/video/video_sender.h
+++ b/src/media/video/video_sender.h
@@ -25,7 +25,6 @@
#include "noncopyable.h"
#include "media_encoder.h"
#include "media_io_handle.h"
-#include "video_mixer.h"
#include <map>
#include <string>
--
GitLab