v1.03 prerelease - Full Linux port of crnlib/crunch, in progress - still more testing to do, and some cmd line options (such as -timestamp) don't work under linux yet, but the core stuff (compression/decompression/transcoding) should work fine and performance under Linux is comparable to Windows. The 3 examples haven't been ported yet.

2012-04-26 07:14:21 +00:00
parent fffd983ffa
commit f63e26aee6
89 changed files with 3547 additions and 3829 deletions
@@ -8,32 +8,32 @@ namespace crnlib
   class dynamic_stream : public data_stream
   {
   public:
-      dynamic_stream(uint initial_size, const wchar_t* pName = L"dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable) : 
+      dynamic_stream(uint initial_size, const char* pName = "dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable) :
         data_stream(pName, attribs),
         m_ofs(0)
      {
         open(initial_size, pName, attribs);
      }
-      
-      dynamic_stream(const void* pBuf, uint size, const wchar_t* pName = L"dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable) : 
+
+      dynamic_stream(const void* pBuf, uint size, const char* pName = "dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable) :
         data_stream(pName, attribs),
         m_ofs(0)
      {
         open(pBuf, size, pName, attribs);
      }
-      
-      dynamic_stream() : 
+
+      dynamic_stream() :
         data_stream(),
         m_ofs(0)
      {
         open();
      }
-      
+
      virtual ~dynamic_stream()
      {
      }
-      
-      bool open(uint initial_size = 0, const wchar_t* pName = L"dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable)
+
+      bool open(uint initial_size = 0, const char* pName = "dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable)
      {
         close();

@@ -41,24 +41,24 @@ namespace crnlib
         m_buf.clear();
         m_buf.resize(initial_size);
         m_ofs = 0;
-         m_name.set(pName ? pName : L"dynamic_stream");
+         m_name.set(pName ? pName : "dynamic_stream");
         m_attribs = static_cast<attribs_t>(attribs);
         return true;
      }
-      
-      bool reopen(const wchar_t* pName, uint attribs)
+
+      bool reopen(const char* pName, uint attribs)
      {
         if (!m_opened)
         {
            return open(0, pName, attribs);
         }
-         
-         m_name.set(pName ? pName : L"dynamic_stream");
+
+         m_name.set(pName ? pName : "dynamic_stream");
         m_attribs = static_cast<attribs_t>(attribs);
         return true;
      }
-      
-      bool open(const void* pBuf, uint size, const wchar_t* pName = L"dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable)
+
+      bool open(const void* pBuf, uint size, const char* pName = "dynamic_stream", uint attribs = cDataStreamSeekable | cDataStreamWritable | cDataStreamReadable)
      {
         if (!m_opened)
         {
@@ -70,14 +70,14 @@ namespace crnlib
               memcpy(&m_buf[0], pBuf, size);
            }
            m_ofs = 0;
-            m_name.set(pName ? pName : L"dynamic_stream");
+            m_name.set(pName ? pName : "dynamic_stream");
            m_attribs = static_cast<attribs_t>(attribs);
            return true;
         }
-         
+
         return false;
      }
-      
+
      virtual bool close()
      {
         if (m_opened)
@@ -87,10 +87,10 @@ namespace crnlib
            m_ofs = 0;
            return true;
         }
-         
+
         return false;
      }
-      
+
      const crnlib::vector<uint8>& get_buf() const { return m_buf; }
            crnlib::vector<uint8>& get_buf()       { return m_buf; }

@@ -101,102 +101,102 @@ namespace crnlib
            m_buf.reserve(size);
         }
      }
-   
+
      virtual const void* get_ptr() const { return m_buf.empty() ? NULL : &m_buf[0]; }
-      
+
      virtual uint read(void* pBuf, uint len)
      {
         CRNLIB_ASSERT(pBuf && (len <= 0x7FFFFFFF));
-         
+
         if ((!m_opened) || (!is_readable()) || (!len))
            return 0;
-         
+
         CRNLIB_ASSERT(m_ofs <= m_buf.size());
-         
+
         uint bytes_left = m_buf.size() - m_ofs;
-         
+
         len = math::minimum<uint>(len, bytes_left);
-         
+
         if (len)
            memcpy(pBuf, &m_buf[m_ofs], len);
-       
+
         m_ofs += len;
-           
+
         return len;
      }
-      
+
      virtual uint write(const void* pBuf, uint len)
      {
         CRNLIB_ASSERT(pBuf && (len <= 0x7FFFFFFF));
-         
+
         if ((!m_opened) || (!is_writable()) || (!len))
            return 0;
-         
+
         CRNLIB_ASSERT(m_ofs <= m_buf.size());
-         
+
         uint new_ofs = m_ofs + len;
         if (new_ofs > m_buf.size())
            m_buf.resize(new_ofs);
-         
+
         memcpy(&m_buf[m_ofs], pBuf, len);
         m_ofs = new_ofs;

         return len;
      }
-      
+
      virtual bool flush()
      {
         if (!m_opened)
            return false;
-            
+
         return true;
      }

-      virtual uint64 get_size() 
-      { 
+      virtual uint64 get_size()
+      {
         if (!m_opened)
            return 0;
-            
-         return m_buf.size(); 
+
+         return m_buf.size();
      }
-      
+
      virtual uint64 get_remaining()
      {
         if (!m_opened)
            return 0;
-            
+
         CRNLIB_ASSERT(m_ofs <= m_buf.size());
-         
+
         return m_buf.size() - m_ofs;
      }

-      virtual uint64 get_ofs() 
+      virtual uint64 get_ofs()
      {
         if (!m_opened)
            return 0;
-            
+
         return m_ofs;
      }
-      
-      virtual bool seek(int64 ofs, bool relative) 
+
+      virtual bool seek(int64 ofs, bool relative)
      {
         if ((!m_opened) || (!is_seekable()))
            return false;
-            
+
         int64 new_ofs = relative ? (m_ofs + ofs) : ofs;
-         
+
         if (new_ofs < 0)
            return false;
         else if (new_ofs > m_buf.size())
            return false;
-         
+
         m_ofs = static_cast<uint>(new_ofs);
-         
+
         post_seek();
-         
+
         return true;
      }
-               
+
   private:
      crnlib::vector<uint8>    m_buf;
      uint                    m_ofs;