From d440dbd72e7b3395c589a72e391eb33b6d2109f4 Mon Sep 17 00:00:00 2001 From: jhurst Date: Tue, 20 Dec 2005 02:06:05 +0000 Subject: [PATCH] builds on Darwin --- src/MXF.cpp | 35 ++++++++++++++++++++++++++++++----- src/h__Reader.cpp | 7 +------ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/MXF.cpp b/src/MXF.cpp index bacf069..45570bb 100755 --- 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 1503102..38c497f 100755 --- 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) { } -- 2.30.2