summaryrefslogtreecommitdiff
path: root/src/mov_encoder_writer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mov_encoder_writer.cc')
-rw-r--r--src/mov_encoder_writer.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mov_encoder_writer.cc b/src/mov_encoder_writer.cc
index 7866995..c3e4c03 100644
--- a/src/mov_encoder_writer.cc
+++ b/src/mov_encoder_writer.cc
@@ -42,7 +42,6 @@ using namespace std;
#include "miav_config.h"
#include "multiplexer.h"
-#include "libmplex_wrapper.h"
#include "multicast_configuration.h"
MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr,
@@ -78,6 +77,7 @@ MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr,
file = new File(fname, "mpg");
+ /* // DISABLE MULTICAST
MulticastConfiguration mcconfig(ETC"/multicast.conf");
mcastconf_t mcclientconf = mcconfig.getConf((char*)clientip);
@@ -91,6 +91,7 @@ MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr,
multicast = NULL;
if(mcclientconf.enabled) multicast = new Multicast(mcclientconf);
+ */
video_queue = video_q;
audio_queue = audio_q;
@@ -109,13 +110,8 @@ void MovEncoderWriter::thread_main()
{
DEBUG(mov, "MovEncoderWriter::run");
-#ifdef WITH_LIBMPLEX
- LibMPlexWrapper mplex(file, video_queue, audio_queue);
- mplex.multiplex();
-#else/*WITH_LIBMPLEX*/
Multiplexer multiplexer(file, multicast, &running, video_queue, audio_queue);
multiplexer.multiplex();
-#endif/*WITH_LIBMPLEX*/
DEBUG(mov, "MovEncoderWriter::stop");
}