From 0ff825e0e6fe5fc7238e3964d24779a07cb53518 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 14 May 2014 14:24:34 +0200 Subject: Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it. --- src/multiplexer.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/multiplexer.h') diff --git a/src/multiplexer.h b/src/multiplexer.h index 9959009..1d315fd 100644 --- a/src/multiplexer.h +++ b/src/multiplexer.h @@ -76,13 +76,14 @@ public: void multiplex(); -private: +protected: int Write(void* data, int size); int Write(char* data, int size); - int Write(unsigned long long int val); - int Write(long long int val); + int Write(uint64_t val); + int Write(int64_t val); int Write(long int val); int Write(unsigned long int val); + int Write24(uint32_t val); int Write(int val); int Write(unsigned int val); int Write(short int val); @@ -93,6 +94,7 @@ private: double written[NUM_TYPES]; void iso11172_stream(); + void pack_header(); bool pack(); void system_header(); bool packet(); -- cgit v1.2.3