summaryrefslogtreecommitdiff
path: root/server/multiplexer.h
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/multiplexer.h
parentc8df40b62cf30029a4acd1a57c8c54add54dda9b (diff)
Utilized the global info object.
Utilized the global info object. Utilized the global info object.
Diffstat (limited to 'server/multiplexer.h')
-rw-r--r--server/multiplexer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/server/multiplexer.h b/server/multiplexer.h
index 9959009..521795d 100644
--- a/server/multiplexer.h
+++ b/server/multiplexer.h
@@ -34,7 +34,6 @@
#include "file.h"
#include "multicast.h"
-#include "info.h"
#include "frame.h"
#include "threadsafe_queue_priority.h"
@@ -69,7 +68,7 @@ typedef enum {
class Multiplexer {
public:
- Multiplexer(File *file, Multicast *m, Info *info, volatile bool *running,
+ Multiplexer(File *file, Multicast *m, volatile bool *running,
ThreadSafeQueuePriority *video_queue,
ThreadSafeQueuePriority *audio_queue);
~Multiplexer();
@@ -122,7 +121,6 @@ private:
File *file;
Multicast *multicast;
- Info *info;
volatile bool *running;
// Audio Header