summaryrefslogtreecommitdiff
path: root/server/mov_encoder.cc
diff options
context:
space:
mode:
authordeva <deva>2006-07-20 17:53:17 +0000
committerdeva <deva>2006-07-20 17:53:17 +0000
commit7d39c063ea84b9b30dbe669ac4ae641a49506836 (patch)
treeef1ead10d1736e9ad7ffe139872c86fd2ee00901 /server/mov_encoder.cc
parentc8df40b62cf30029a4acd1a57c8c54add54dda9b (diff)
Utilized the global info object.
Utilized the global info object. Utilized the global info object.
Diffstat (limited to 'server/mov_encoder.cc')
-rw-r--r--server/mov_encoder.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/server/mov_encoder.cc b/server/mov_encoder.cc
index e9049a6..15135df 100644
--- a/server/mov_encoder.cc
+++ b/server/mov_encoder.cc
@@ -40,17 +40,16 @@
#include <unistd.h>
#include "miav_config.h"
+#include "info.h"
#include "libfame_wrapper.h"
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");
+ MIaV::info->info("MovEncoder");
running = r;
@@ -64,14 +63,14 @@ MovEncoder::MovEncoder(volatile bool *r, sem_t *r_sem,
MovEncoder::~MovEncoder()
{
- info->info("~MovEncoder");
+ MIaV::info->info("~MovEncoder");
}
// this runs in a thread
void MovEncoder::thread_main()
{
- info->info("MovEncoder::run");
+ MIaV::info->info("MovEncoder::run");
// Run with slightly lower priority than MovEncoderWriter AND AudioEncoder
nice(2);
@@ -81,7 +80,7 @@ void MovEncoder::thread_main()
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 +93,7 @@ void MovEncoder::thread_main()
// Check for end of stream
if(in_frame->endOfFrameStream == true) {
- info->info("endOfFrameStream in MovEncoder");
+ MIaV::info->info("endOfFrameStream in MovEncoder");
// Signal to stop running
*running = false;
@@ -127,7 +126,7 @@ void MovEncoder::thread_main()
}
}
- info->info("MovEncoder::stop");
+ MIaV::info->info("MovEncoder::stop");
}