1 files changed, 29 insertions, 12 deletions

diff --git a/src/myriad.h b/src/myriad.h
index f6d5e51..0344057 100644
--- a/src/myriad.h
+++ b/src/myriad.h
@@ -30,7 +30,7 @@ namespace Bu
          * Header format is as follows:
          *
          * MMMMvBssssSSSS*
-         * M = Magic number
+         * M = Magic number (FFC399BD)
          * v = version number
          * B = Bits per int
          * s = Blocksize in bytes
@@ -95,12 +95,12 @@ namespace Bu
                 /**
                  * Delete a stream that's already within the Myriad.
                  */
-                void deleteStream( int iID );
+                void deleteStream( int iId );
 
                 /**
                  * Return a new Stream object assosiated with the given stream ID.
                  */
-                MyriadStream openStream( int iID );
+                MyriadStream openStream( int iId );
 
                 int getBlockSize();
                 int getNumBlocks();
@@ -118,25 +118,42 @@ namespace Bu
                 {
                         blockUnused     =       0xFFFFFFFFUL
                 };
+                
+                typedef Bu::Array<int> BlockArray;
+                class Stream
+                {
+                public:
+                        int iId;
+                        int iSize;
+                        BlockArray aBlocks;
+                };
+                typedef Bu::Array<Stream *> StreamArray;
+
+                class Block
+                {
+                public:
+                        char *pData;
+                        bool bChanged;
+                        int iBlockIndex;
+                };
 
                 void updateHeader();
                 int findEmptyBlock();
 
+                /**
+                 *@todo Change this to use a binary search, it's nicer.
+                 */
+                Stream *findStream( int iId );
+
+                Block *getBlock( int iBlock );
+                void releaseBlock( Block *pBlock );
+
         private:
                 Bu::Stream &sStore;
                 int iBlockSize;
                 int iBlocks;
                 int iUsed;
                 Bu::BitString bsBlockUsed;
-                typedef Bu::Array<int> BlockArray;
-                class Stream
-                {
-                public:
-                        int iId;
-                        int iSize;
-                        BlockArray aBlocks;
-                };
-                typedef Bu::Array<Stream *> StreamArray;
                 StreamArray aStreams;
         };
 };