diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-28 16:06:57 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-28 16:06:57 +0200 |
| commit | 9fa8ce5d62a24efa4e5b584f5a6cf921e3052be8 (patch) | |
| tree | ae604136f508ae331833f2020601488951fa8c03 /src/mov_encoder_writer.cc | |
| parent | 468e65a82aa0b4f4bfd82eb98e7f22b130da9f98 (diff) | |
Don't include config.h everywhere.
Diffstat (limited to 'src/mov_encoder_writer.cc')
| -rw-r--r-- | src/mov_encoder_writer.cc | 8 |
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"); } |