1 files changed, 9 insertions, 7 deletions
diff --git a/src/multiplexer.h b/src/multiplexer.h
index 1d315fd..9b2aed1 100644
--- a/src/multiplexer.h
+++ b/src/multiplexer.h
@@ -81,15 +81,17 @@ protected:
   int Write(char* data, int size);
   int Write(uint64_t val);
   int Write(int64_t val);
-  int Write(long int val);
-  int Write(unsigned long int val);
+  int Write(int32_t val);
+  int Write(uint32_t val);
   int Write24(uint32_t val);
+  /*
   int Write(int val);
   int Write(unsigned int val);
-  int Write(short int val);
-  int Write(unsigned short int val);
+  */
+  int Write(int16_t val);
+  int Write(uint16_t val);
 
-  unsigned long long int SCR;
+  uint64_t SCR;
 
   double written[NUM_TYPES];
 
@@ -112,8 +114,8 @@ protected:
                   ISO11172_2::sequence_header_2 *header2);
   */
   // Frequency variables
-  unsigned int write_system_header;
-  unsigned int write_audio_packet;
+  uint32_t write_system_header;
+  uint32_t write_audio_packet;
 
   Frame *getFrame(StreamType type);
   int read_stream(char *buf, unsigned int size, StreamType type);