aboutsummaryrefslogtreecommitdiff
path: root/src/stable/myriad.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/stable/myriad.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/stable/myriad.h b/src/stable/myriad.h
index 3382ab5..14e8c73 100644
--- a/src/stable/myriad.h
+++ b/src/stable/myriad.h
@@ -13,6 +13,7 @@
13#include "bu/exceptionbase.h" 13#include "bu/exceptionbase.h"
14#include "bu/array.h" 14#include "bu/array.h"
15#include "bu/hash.h" 15#include "bu/hash.h"
16#include "bu/mutex.h"
16 17
17namespace Bu 18namespace Bu
18{ 19{
@@ -153,6 +154,13 @@ namespace Bu
153 * depending on weather or not it's a Myriad stream. This will throw 154 * depending on weather or not it's a Myriad stream. This will throw
154 * an exception if the stream is empty, or is not random access. 155 * an exception if the stream is empty, or is not random access.
155 */ 156 */
157 static bool isMyriad( Bu::Stream &sStore, uint8_t &uVer );
158
159 /**
160 * Read the first few bytes from the given stream and return true/false
161 * depending on weather or not it's a Myriad stream. This will throw
162 * an exception if the stream is empty, or is not random access.
163 */
156 static bool isMyriad( Bu::Stream &sStore ); 164 static bool isMyriad( Bu::Stream &sStore );
157 165
158 const Bu::BitString &getBlocksUsed() const; 166 const Bu::BitString &getBlocksUsed() const;
@@ -216,6 +224,9 @@ namespace Bu
216 typedef Bu::Hash<int, Block *> BlockHash; 224 typedef Bu::Hash<int, Block *> BlockHash;
217 BlockHash hActiveBlocks; 225 BlockHash hActiveBlocks;
218 bool bHeaderChanged; 226 bool bHeaderChanged;
227
228 Bu::Mutex mHeader;
229 Bu::Mutex mActiveBlocks;
219 }; 230 };
220}; 231};
221 232