diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-28 15:05:57 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-28 15:05:57 +0200 |
| commit | 0332e496347f6b563abb86d4ef9650bbd6ebc3e1 (patch) | |
| tree | 74dadbe6e4f3216c8a3c8570e203aad0187febf3 /src/mov_encoder.cc | |
| parent | 8eb0759e2e8a5405b2dd9e6d72d3bd620b51bee4 (diff) | |
Port server to hugin.
Diffstat (limited to 'src/mov_encoder.cc')
| -rw-r--r-- | src/mov_encoder.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mov_encoder.cc b/src/mov_encoder.cc index 640239d..ae78ee2 100644 --- a/src/mov_encoder.cc +++ b/src/mov_encoder.cc @@ -39,6 +39,8 @@ // For nice #include <unistd.h> +#include <hugin.hpp> + #include "miav_config.h" #include "libfame_wrapper.h" @@ -46,11 +48,9 @@ MovEncoder::MovEncoder(volatile bool *r, sem_t *r_sem, ThreadSafeQueueFIFO *in, ThreadSafeQueuePriority *video_out, - ThreadSafeQueuePriority *audio_out, - Info *i) + ThreadSafeQueuePriority *audio_out) { - info = i; - info->info("MovEncoder"); + DEBUG(mov, "MovEncoder"); running = r; @@ -64,24 +64,24 @@ MovEncoder::MovEncoder(volatile bool *r, sem_t *r_sem, MovEncoder::~MovEncoder() { - info->info("~MovEncoder"); + DEBUG(mov, "~MovEncoder"); } // this runs in a thread void MovEncoder::thread_main() { - info->info("MovEncoder::run"); + DEBUG(mov, "MovEncoder::run"); // Run with slightly lower priority than MovEncoderWriter AND AudioEncoder - if(nice(2) == -1) info->warn("Could not set MovEncoder nice."); + if(nice(2) == -1) WARN(mov, "Could not set MovEncoder nice."); FrameVector *item; Frame *in_frame; Frame *out_v_frame; Frame *out_a_frame; - LibFAMEWrapper fame(info); + LibFAMEWrapper fame; // Process until running == false and the queue is empty while(*running) { @@ -94,7 +94,7 @@ void MovEncoder::thread_main() // Check for end of stream if(in_frame->endOfFrameStream == true) { - info->info("endOfFrameStream in MovEncoder"); + DEBUG(mov, "endOfFrameStream in MovEncoder"); // Signal to stop running *running = false; @@ -127,7 +127,7 @@ void MovEncoder::thread_main() } } - info->info("MovEncoder::stop"); + DEBUG(mov, "MovEncoder::stop"); } |