Merge pull request #20 from cinecert/htj2c

[asdcplib.git] / src / asdcp-mem-test.cpp

diff --git a/src/asdcp-mem-test.cpp b/src/asdcp-mem-test.cpp
index b199abee85d3a0449b536ce15ffa6b7119295d1d..73392273fc8129a707b84f77e63836bc62292a90 100755 (executable)
--- a/src/asdcp-mem-test.cpp
+++ b/src/asdcp-mem-test.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004, John Hurst
+Copyright (c) 2004-2009, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -31,12 +31,14 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <AS_DCP_internal.h>
-#include <FortunaRNG.h>
+//#include <KM_platform.h>
+#include <KM_prng.h>
 
 #include <iostream>
 #include <assert.h>
 
 using namespace ASDCP;
+using namespace Kumu;
 
 const ui32_t buf_size = 1024;
 FortunaRNG RNG;
@@ -101,14 +103,9 @@ int c()
 //
 int d()
 {
-  mem_ptr<DataChunk> Chunk(new DataChunk(1024));
-
-
-#if 0
-
   //  MPEG2::Parser     mPFile;
   MPEG2::MXFReader  mRFile;
-  Result_t result = mRFile.OpenRead("../test/write_test_mpeg.mxf");
+  Result_t result = mRFile.OpenRead("../tests/write_test_mpeg.mxf");
   assert(ASDCP_SUCCESS(result));
 
   //  MPEG2::MXFWriter  mWFile;
@@ -120,7 +117,6 @@ int d()
   PCM::WAVParser    pPFile;
   PCM::MXFReader    pRFile;
   PCM::MXFWriter    pWFile;
-#endif
   return 0;
 }