builds on Darwin

diff --git a/src/MXF.cpp b/src/MXF.cpp
index bacf06962bfd1c6cccecec434d95cebf5fe367e5..45570bb07bdb0efbc01e30b03a188acc15dd724e 100755 (executable)
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -1,7 +1,33 @@
-//
-//
-//
-
+/*
+Copyright (c) 2005-2006, John Hurst
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+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    MXF.cpp
+    \version $Id$
+    \brief   MXF objects
+*/
 
 #define ASDCP_DECLARE_MDD
 #include "MDD.h"
@@ -576,7 +602,6 @@ ASDCP::MXF::OPAtomHeader::InitFromFile(const ASDCP::FileReader& Reader)
 
   if ( ASDCP_SUCCESS(result) )
     {
-      ui64_t here = Reader.Tell();
       ui32_t buf_len = HeaderByteCount;
       result = m_Buffer.Capacity(buf_len);
     }

diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index 1503102814deb917250d9e798c3cc0070f7d756a..38c497f5d99eea7ae878b0ee81079a969248ac20 100755 (executable)
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -37,12 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace ASDCP;
 using namespace ASDCP::MXF;
 
-
-// GetMDObjectByPath() path to file's Identification metadata object
-static const char* INFO_OBJECT_PATH = "Preface.Identifications.Identification.Identification";
-static const char* ASSET_ID_OBJECT_PATH = "Preface.ContentStorage.ContentStorage.Packages.Package.SourcePackage.PackageUID";
-
-
+//
 ASDCP::h__Reader::h__Reader() : m_EssenceStart(0)
 {
 }