Merge pull request #20 from cinecert/htj2c

[asdcplib.git] / src / DCData_ByteStream_Parser.cpp

diff --git a/src/DCData_ByteStream_Parser.cpp b/src/DCData_ByteStream_Parser.cpp
index 73565d4a7d5564f7e573038ed353259875e64f3c..6025e3be9a0714dba7c6fe2d6ba3c81c0bf2fa9e 100644 (file)
--- a/src/DCData_ByteStream_Parser.cpp
+++ b/src/DCData_ByteStream_Parser.cpp
@@ -24,7 +24,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-/*! \file    AtmosSyncChannel_Mixer.h
+/*! \file    DCData_ByteStream_Parser.cpp
     \version $Id$
     \brief   AS-DCP library, Digital Cinema Data bytestream essence reader
 */
@@ -52,9 +52,8 @@ public:
 
   ~h__BytestreamParser() {}
 
-  Result_t OpenReadFrame(const char* filename, FrameBuffer& FB)
+  Result_t OpenReadFrame(const std::string& filename, FrameBuffer& FB)
   {
-    ASDCP_TEST_NULL_STR(filename);
     m_File.Close();
     Result_t result = m_File.OpenRead(filename);
 
@@ -95,7 +94,7 @@ ASDCP::DCData::BytestreamParser::~BytestreamParser()
 // Opens the stream for reading, parses enough data to provide a complete
 // set of stream metadata for the MXFWriter below.
 ASDCP::Result_t
-ASDCP::DCData::BytestreamParser::OpenReadFrame(const char* filename, FrameBuffer& FB) const
+ASDCP::DCData::BytestreamParser::OpenReadFrame(const std::string& filename, FrameBuffer& FB) const
 {
   const_cast<ASDCP::DCData::BytestreamParser*>(this)->m_Parser = new h__BytestreamParser;
   return m_Parser->OpenReadFrame(filename, FB);