summaryrefslogtreecommitdiff
path: root/src/multiplexer.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 15:05:57 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 15:05:57 +0200
commit0332e496347f6b563abb86d4ef9650bbd6ebc3e1 (patch)
tree74dadbe6e4f3216c8a3c8570e203aad0187febf3 /src/multiplexer.h
parent8eb0759e2e8a5405b2dd9e6d72d3bd620b51bee4 (diff)
Port server to hugin.
Diffstat (limited to 'src/multiplexer.h')
-rw-r--r--src/multiplexer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/multiplexer.h b/src/multiplexer.h
index 9b2aed1..889e7cc 100644
--- a/src/multiplexer.h
+++ b/src/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();
@@ -126,7 +125,6 @@ protected:
File *file;
Multicast *multicast;
- Info *info;
volatile bool *running;
// Audio Header