1 files changed, 20 insertions, 34 deletions

diff --git a/src/mov_encoder_writer.cc b/src/mov_encoder_writer.cc
index 1773527..7866995 100644
--- a/src/mov_encoder_writer.cc
+++ b/src/mov_encoder_writer.cc
@@ -24,38 +24,32 @@
  *    along with MIaV; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include <config.h>
 #include "mov_encoder_writer.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-
 #include <pthread.h>
 #include <semaphore.h>
-
 #include <errno.h>
-
 #include <string>
-using namespace std;
+#include <time.h>
 
-#include "miav_config.h"
+using namespace std;
 
-#include <time.h>
+#include <hugin.hpp>
 
+#include "miav_config.h"
 #include "multiplexer.h"
 #include "libmplex_wrapper.h"
-
 #include "multicast_configuration.h"
 
 MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr, 
                                    ThreadSafeQueuePriority *video_q,
-                                   ThreadSafeQueuePriority *audio_q,
-                                   Info *i)
+                                   ThreadSafeQueuePriority *audio_q)
 {
-  info = i;
-  info->info("MovEncoderWriter");
+  DEBUG(mov, "MovEncoderWriter");
 
   // Create path and filename
   char fname[256];
@@ -82,23 +76,21 @@ MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr,
 
   sprintf(fname, "%s/%s/%s/%s-%s-", server_root->c_str(), birthmonth, cpr, cpr, date);
 
-  file = new File(fname, "mpg", info);
+  file = new File(fname, "mpg");
 
-  MulticastConfiguration mcconfig(info, ETC"/multicast.conf");
+  MulticastConfiguration mcconfig(ETC"/multicast.conf");
 
   mcastconf_t mcclientconf = mcconfig.getConf((char*)clientip);
 
-  info->info("Client: %s - Enabled: %s - Addr: %s - Port: %d - WithAudio: %s", 
-             mcclientconf.client.c_str(),
-             mcclientconf.enabled?"Yes\0":"No\0",
-             mcclientconf.addr.c_str(),
-             mcclientconf.port,
-             mcclientconf.with_audio?"Yes\0":"No\0");
-
+  INFO(mov, "Client: %s - Enabled: %s - Addr: %s - Port: %d - WithAudio: %s", 
+       mcclientconf.client.c_str(),
+       mcclientconf.enabled?"Yes\0":"No\0",
+       mcclientconf.addr.c_str(),
+       mcclientconf.port,
+       mcclientconf.with_audio?"Yes\0":"No\0");
 
   multicast = NULL;
-  if(mcclientconf.enabled) multicast = new Multicast(info, 
-                                                     mcclientconf);
+  if(mcclientconf.enabled) multicast = new Multicast(mcclientconf);
 
   video_queue = video_q;
   audio_queue = audio_q;
@@ -108,30 +100,24 @@ MovEncoderWriter::MovEncoderWriter(const char *clientip, const char* cpr,
 
 MovEncoderWriter::~MovEncoderWriter()
 {
-  info->info("~MovEncoderWriter");
+  DEBUG(mov, "~MovEncoderWriter");
   delete file;
   if(multicast) delete multicast;
 }
 
 void MovEncoderWriter::thread_main()
 {
-  info->info("MovEncoderWriter::run");
+  DEBUG(mov, "MovEncoderWriter::run");
 
 #ifdef WITH_LIBMPLEX
-  LibMPlexWrapper mplex(info,
-                        file,
-                        video_queue,
-                        audio_queue);
+  LibMPlexWrapper mplex(file, video_queue, audio_queue);
   mplex.multiplex();
 #else/*WITH_LIBMPLEX*/
-  Multiplexer multiplexer(file, multicast,
-                          info, &running, 
-                          video_queue,
-                          audio_queue);
+  Multiplexer multiplexer(file, multicast, &running, video_queue, audio_queue);
   multiplexer.multiplex();
 #endif/*WITH_LIBMPLEX*/
 
-  info->info("MovEncoderWriter::stop");
+  DEBUG(mov, "MovEncoderWriter::stop");
 }
 
 void MovEncoderWriter::setSaveState(n_savestate savestate)