projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #25 from remia/fix/non-pod-variadic-warning
[asdcplib.git]
/
src
/
h__Reader.cpp
diff --git
a/src/h__Reader.cpp
b/src/h__Reader.cpp
index a427fb5760558e804be06686a0c1e0c36a3b4878..77f532e7fe20c1edd6d90a29d37b9ec9f1900c55 100755
(executable)
--- a/
src/h__Reader.cpp
+++ b/
src/h__Reader.cpp
@@
-1,5
+1,5
@@
/*
/*
-Copyright (c) 2004-201
3
, John Hurst
+Copyright (c) 2004-201
5
, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-38,7
+38,7
@@
using namespace ASDCP::MXF;
static Kumu::Mutex sg_DefaultMDInitLock;
static bool sg_DefaultMDTypesInit = false;
static Kumu::Mutex sg_DefaultMDInitLock;
static bool sg_DefaultMDTypesInit = false;
-static const ASDCP::Dictionary *sg_dict;
+static const ASDCP::Dictionary *sg_dict
= 0
;
//
void
//
void
@@
-84,18
+84,18
@@
ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename)
m_Info.LabelSetType = LS_MXF_UNKNOWN;
m_Info.LabelSetType = LS_MXF_UNKNOWN;
- if ( m_HeaderPart.OperationalPattern.
ExactMatch
(MXFInterop_OPAtom_Entry().ul) )
+ if ( m_HeaderPart.OperationalPattern.
MatchExact
(MXFInterop_OPAtom_Entry().ul) )
{
m_Info.LabelSetType = LS_MXF_INTEROP;
}
{
m_Info.LabelSetType = LS_MXF_INTEROP;
}
- else if ( m_HeaderPart.OperationalPattern.
ExactMatch
(SMPTE_390_OPAtom_Entry().ul) )
+ else if ( m_HeaderPart.OperationalPattern.
MatchExact
(SMPTE_390_OPAtom_Entry().ul) )
{
m_Info.LabelSetType = LS_MXF_SMPTE;
}
else
{
char strbuf[IdentBufferLen];
{
m_Info.LabelSetType = LS_MXF_SMPTE;
}
else
{
char strbuf[IdentBufferLen];
- const MDDEntry* Entry = m_Dict->FindUL(m_HeaderPart.OperationalPattern.Value());
+ const MDDEntry* Entry = m_Dict->FindUL
Exact
(m_HeaderPart.OperationalPattern.Value());
if ( Entry == 0 )
{
if ( Entry == 0 )
{
@@
-108,7
+108,7
@@
ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename)
}
}
}
}
- if ( m_RIP.PairArray.front().ByteOffset != 0 )
+ if (
!m_RIP.PairArray.empty() &&
m_RIP.PairArray.front().ByteOffset != 0 )
{
DefaultLogSink().Error("First Partition in RIP is not at offset 0.\n");
result = RESULT_FORMAT;
{
DefaultLogSink().Error("First Partition in RIP is not at offset 0.\n");
result = RESULT_FORMAT;
@@
-126,7
+126,7
@@
ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename)
{
// if this is a three partition file, go to the body
// partition and read the partition pack
{
// if this is a three partition file, go to the body
// partition and read the partition pack
-
Array<RIP::Pair>::
iterator r_i = m_RIP.PairArray.begin();
+
RIP::const_pair_
iterator r_i = m_RIP.PairArray.begin();
r_i++;
m_File.Seek((*r_i).ByteOffset);
result = m_BodyPart.InitFromFile(m_File);
r_i++;
m_File.Seek((*r_i).ByteOffset);
result = m_BodyPart.InitFromFile(m_File);
@@
-312,7
+312,7
@@
ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict,
if ( ! UL(ess_p).MatchIgnoreStream(EssenceUL) ) // ignore the stream number
{
char strbuf[IntBufferLen];
if ( ! UL(ess_p).MatchIgnoreStream(EssenceUL) ) // ignore the stream number
{
char strbuf[IntBufferLen];
- const MDDEntry* Entry = Dict.FindUL(Key.Value());
+ const MDDEntry* Entry = Dict.FindUL
AnyVersion
(Key.Value());
if ( Entry == 0 )
{
if ( Entry == 0 )
{
@@
-431,7
+431,7
@@
ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict,
else
{
char strbuf[IntBufferLen];
else
{
char strbuf[IntBufferLen];
- const MDDEntry* Entry = Dict.FindUL(Key.Value());
+ const MDDEntry* Entry = Dict.FindUL
AnyVersion
(Key.Value());
if ( Entry == 0 )
{
if ( Entry == 0 )
{