1 files changed, 29 insertions, 5 deletions

diff --git a/src/stable/myriad.cpp b/src/stable/myriad.cpp
index 03cffa9..492676e 100644
--- a/src/stable/myriad.cpp
+++ b/src/stable/myriad.cpp
@@ -129,6 +129,19 @@ Bu::MyriadStream Bu::Myriad::open( Bu::Myriad::StreamId iStream,
     return Bu::MyriadStream( *this, pStream, eMode );
 }
 
+Bu::Myriad::StreamId Bu::Myriad::allocate()
+{
+    Bu::MutexLocker l( mAccess );
+
+    Stream *pStream = new Stream( *this, ++iLastUsedIndex, 0 );
+    mhStream.lock();
+    hStream.insert( pStream->iStream, pStream );
+    mhStream.unlock();
+    bStructureChanged = true;
+
+    return pStream->iStream;
+}
+
 void Bu::Myriad::erase( Bu::Myriad::StreamId iStream )
 {
     // For now, let's prevent you from erasing a stream if it's open.
@@ -252,6 +265,19 @@ int32_t Bu::Myriad::getTotalUnusedBytes(int32_t iAssumeBlockSize ) const
     return iTotal;
 }
 
+Bu::Myriad::StreamIdList Bu::Myriad::getStreamList() const
+{
+    mhStream.lock();
+    StreamIdList lIds = hStream.getKeys();
+    mhStream.unlock();
+    lIds.sort();
+    if( lIds.first() == 0 )
+    {
+        lIds.eraseFirst();
+    }
+    return lIds;
+}
+
 Bu::BitString Bu::Myriad::buildBlockUseMap() const
 {
     Bu::MutexLocker l( mAccess );
@@ -264,10 +290,10 @@ Bu::BitString Bu::Myriad::buildBlockUseMap() const
     return bsMap;
 }
 
-Bu::Array<int32_t> Bu::Myriad::buildBlockMap() const
+Bu::Myriad::StreamIdArray Bu::Myriad::buildBlockMap() const
 {
     Bu::MutexLocker l( mAccess );
-    Bu::Array<int32_t> bm( iBlockCount );
+    StreamIdArray bm( iBlockCount );
     for( int j = 0; j < iBlockCount; j++ )
     {
         bm.append( -1 );
@@ -768,9 +794,7 @@ int32_t Bu::Myriad::Stream::read( int32_t iStart, void *pTarget,
 
     if( iStart+iSize >= this->iSize )
     {
-        int32_t iDiff = (iStart+iSize)-this->iSize;
-        iSize -= iDiff;
-        iStart += iDiff;
+        iSize = this->iSize-iStart;
     }
 
     while( iSize > 0 )