Diff: SnEventFrame.h

Revision:

8:95a325df1f6b

Parent:

3:24c5f0f50bf1

Child:

12:d472f9811262

--- a/SnEventFrame.h	Sat Aug 04 01:48:55 2012 +0000
+++ b/SnEventFrame.h	Wed Aug 08 23:27:37 2012 +0000
@@ -8,7 +8,7 @@
     
  public:
     // i/o version
-    static const uint8_t     kIOVers;   // MUST BE INCREASED if any member var changes (==> also if kNchans, etc. change!)
+    static const uint8_t    kIOVers;   // MUST BE INCREASED if any member var changes (==> also if kNchans, etc. change!)
     static const uint32_t   kMaxSizeOf = 
             ((sizeof(uint32_t)*4u)+sizeof(int32_t)+sizeof(uint16_t)
             +(kTotSamps*sizeof(uint16_t))+1u);
@@ -55,6 +55,8 @@
           uint16_t& GetData(const uint8_t ch, const uint8_t sm)
         { return fData[(ch*kNsamps)+sm]; }
     
+    uint32_t GetEvtNum() const { return fEvtNum; }
+    
     void ClearEvent() {
         fMbedTime = fEvtNum = fTrgNum = 0;
         fTrgBits = 0;
@@ -85,7 +87,7 @@
     }
     
     static
-    uint32_t SizeOf(const uint8_t loseLSB, const uint8_t loseMSB) {
+    uint32_t SizeOf(const uint8_t rv, const uint8_t loseLSB, const uint8_t loseMSB) {
         // size of member vars + size of packed waveform + 1 for i/o version
         if ((loseLSB==0) && (loseMSB==0)) {
             return kMaxSizeOf;