diff --git a/src/conference.cpp b/src/conference.cpp index 19df4d4ea38be3858fedb1bf824069101ef6f9f4..46b15c4f8d47e4ee9a42324cdba0597d1e013f7b 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 daaf1c25e4b00f2389c98e9abd92a3f1026848c7..d55dd5396bd42e81510940ae3c9ece188bf3f58e 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 e6b6413004becc1167783817dfc5579d54dccf26..e5a4511fbfa70644299c7cdb15bfd0609f0bf439 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>