Remove some unused variables.

10 files changed, 17 insertions, 34 deletions

diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp
index 01a978d..8698817 100644
--- a/src/AS_02_TimedText.cpp
+++ b/src/AS_02_TimedText.cpp
@@ -25,7 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 /*! \file    AS_DCP_TimedText.cpp
-    \version $Id: AS_02_TimedText.cpp,v 1.5 2015/10/09 23:41:11 jhurst Exp $       
+    \version $Id: AS_02_TimedText.cpp,v 1.5 2015/10/09 23:41:11 jhurst Exp $
     \brief   AS-DCP library, PCM essence reader and writer implementation
 */
 
@@ -67,7 +67,7 @@ class AS_02::TimedText::MXFReader::h__Reader : public AS_02::h__AS02Reader
   ASDCP_NO_COPY_CONSTRUCT(h__Reader);
 
 public:
-  TimedTextDescriptor m_TDesc;    
+  TimedTextDescriptor m_TDesc;
 
   h__Reader(const Dictionary& d) : AS_02::h__AS02Reader(d), m_EssenceDescriptor(0) {
     memset(&m_TDesc.AssetID, 0, UUIDlen);
@@ -144,7 +144,7 @@ ASDCP::Result_t
 AS_02::TimedText::MXFReader::h__Reader::OpenRead(const std::string& filename)
 {
   Result_t result = OpenMXFRead(filename.c_str());
-  
+
   if( ASDCP_SUCCESS(result) )
     {
       if ( m_EssenceDescriptor == 0 )
@@ -523,14 +523,14 @@ AS_02::TimedText::MXFWriter::h__Writer::SetSourceStream(ASDCP::TimedText::TimedT
 	  m_HeaderSize += ( resourceSubdescriptor->MIMEMediaType.ArchiveLength() * 2 /*ArchiveLength is broken*/ ) + 72;
 	}
     }
-  
+
   if ( KM_SUCCESS(result) )
     {
       result = WriteAS02Header(TIMED_TEXT_PACKAGE_LABEL, UL(m_Dict->ul(MDD_TimedTextWrappingClip)),
 			       "Data Track", UL(m_EssenceUL), UL(m_Dict->ul(MDD_TimedTextEssence)),
 			       TDesc.EditRate, derive_timecode_rate_from_edit_rate(TDesc.EditRate));
     }
- 
+
   if ( KM_SUCCESS(result) )
     {
       this->m_IndexWriter.SetPrimerLookup(&this->m_HeaderPart.m_Primer);
@@ -559,17 +559,15 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteTimedTextResource(const std::string
 
       ui32_t str_size = XMLDoc.size();
       ASDCP::TimedText::FrameBuffer FrameBuf(str_size);
-      
+
       memcpy(FrameBuf.Data(), XMLDoc.c_str(), str_size);
       FrameBuf.Size(str_size);
 
       IndexTableSegment::IndexEntry Entry;
       Entry.StreamOffset = m_StreamOffset;
-      
+
       if ( KM_SUCCESS(result) )
 	{
-	  ui64_t this_stream_offset = m_StreamOffset; // m_StreamOffset will be changed by the call to Write_EKLV_Packet
-
 	  result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
 				     m_StreamOffset, FrameBuf, m_EssenceUL, Ctx, HMAC);
 	}
@@ -609,8 +607,6 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time
 
   if ( KM_SUCCESS(result) )
     {
-      ui64_t this_stream_offset = m_StreamOffset; // m_StreamOffset will be changed by the call to Write_EKLV_Packet
-      
       result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
 				 m_StreamOffset, FrameBuf, GenericStream_DataElement.Value(), Ctx, HMAC);
     }
@@ -696,7 +692,7 @@ AS_02::TimedText::MXFWriter::OpenWrite(const std::string& filename, const Writer
 
   m_Writer = new h__Writer(DefaultSMPTEDict());
   m_Writer->m_Info = Info;
-  
+
   Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
 
   if ( ASDCP_SUCCESS(result) )
diff --git a/src/AS_02_internal.h b/src/AS_02_internal.h
index bcee7a7..fa8efde 100644
--- a/src/AS_02_internal.h
+++ b/src/AS_02_internal.h
@@ -25,9 +25,9 @@ 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    AS_02_internal.h
-  \version $Id: AS_02_internal.h ***       
+  \version $Id: AS_02_internal.h ***
   \brief   AS-02 library, non-public common elements
 */
 
@@ -92,7 +92,7 @@ namespace AS_02
       public:
 	const ASDCP::Dictionary*&  m_Dict;
 	ASDCP::IPrimerLookup*      m_Lookup;
-      
+
 	AS02IndexWriterVBR(const ASDCP::Dictionary*&);
 	virtual ~AS02IndexWriterVBR();
 
@@ -124,7 +124,7 @@ namespace AS_02
 	ASDCP::IPrimerLookup* m_Lookup;
 	ui32_t m_Duration;
 	ui32_t m_SampleSize;
-      
+
 	AS02IndexWriterCBR(const ASDCP::Dictionary*&);
 	virtual ~AS02IndexWriterCBR();
 
@@ -159,7 +159,7 @@ namespace AS_02
       ~h__AS02Writer() {}
 
 
-      
+
       // all the above for a single source clip
       Result_t WriteAS02Header(const std::string& PackageLabel, const ASDCP::UL& WrappingUL,
 			       const std::string& TrackName, const ASDCP::UL& EssenceUL,
@@ -244,14 +244,13 @@ namespace AS_02
 
 	if ( KM_SUCCESS(result) )
 	  result = this->m_File.Seek(0);
-	
+
 	if ( KM_SUCCESS(result) )
 	  result = m_HeaderPart.WriteToFile(this->m_File, this->m_HeaderSize);
-  
+
 	if ( KM_SUCCESS(result) )
 	  {
 	    ASDCP::MXF::RIP::const_pair_iterator i = this->m_RIP.PairArray.begin();
-	    ui64_t header_byte_count = this->m_HeaderPart.HeaderByteCount;
 	    ui64_t previous_partition = 0;
 
 	    for ( i = this->m_RIP.PairArray.begin(); KM_SUCCESS(result) && i != this->m_RIP.PairArray.end(); ++i )
@@ -261,7 +260,7 @@ namespace AS_02
 
 		if ( KM_SUCCESS(result) )
 		  result = plain_part.InitFromFile(this->m_File);
-		
+
 		if ( KM_SUCCESS(result)
 		     && ( plain_part.IndexSID > 0 || plain_part.BodySID > 0 ) )
 		  {
@@ -278,7 +277,7 @@ namespace AS_02
 		  }
 	      }
 	  }
-	
+
 	this->m_File.Close();
 	return result;
       }
diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index cf45cb4..6ca8f9c 100755
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -223,7 +223,6 @@ namespace ASDCP
 	  if ( ASDCP_SUCCESS(result) )
 	    {
 	      result = m_RIP.InitFromFile(m_File);
-	      ui32_t test_s = m_RIP.PairArray.size();
 
 	      if ( ASDCP_FAILURE(result) )
 		{
diff --git a/src/asdcp-info.cpp b/src/asdcp-info.cpp
index b72fa1a..fe45f32 100755
--- a/src/asdcp-info.cpp
+++ b/src/asdcp-info.cpp
@@ -354,7 +354,6 @@ public:
   //
   void get_PictureEssenceCoding(FILE* = 0)
   {
-    const Dictionary& Dict = DefaultCompositeDict();
     MXF::RGBAEssenceDescriptor *descriptor = 0;
 
     Result_t result = m_Reader.OP1aHeader().GetMDObjectByType(DefaultCompositeDict().ul(MDD_RGBAEssenceDescriptor),
@@ -513,7 +512,6 @@ public:
   //
   void dump_WaveAudioDescriptor(FILE* stream = 0)
   {
-    const Dictionary& Dict = DefaultCompositeDict();
     MXF::WaveAudioDescriptor *descriptor = 0;
 
     Result_t result = m_Reader.OP1aHeader().GetMDObjectByType(DefaultCompositeDict().ul(MDD_WaveAudioDescriptor),
@@ -678,7 +676,6 @@ int
 main(int argc, const char** argv)
 {
   Result_t result = RESULT_OK;
-  char     str_buf[64];
   CommandOptions Options(argc, argv);
 
   if ( Options.version_flag )
diff --git a/src/asdcp-unwrap.cpp b/src/asdcp-unwrap.cpp
index 2f57fa3..0d202bb 100755
--- a/src/asdcp-unwrap.cpp
+++ b/src/asdcp-unwrap.cpp
@@ -938,7 +938,6 @@ int
 main(int argc, const char** argv)
 {
   Result_t result = RESULT_OK;
-  char     str_buf[64];
   CommandOptions Options(argc, argv);
 
   if ( Options.version_flag )
diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp
index 0e6a976..7440cca 100755
--- a/src/asdcp-wrap.cpp
+++ b/src/asdcp-wrap.cpp
@@ -1625,7 +1625,6 @@ int
 main(int argc, const char** argv)
 {
   Result_t result = RESULT_OK;
-  char     str_buf[64];
   g_dict = &ASDCP::DefaultSMPTEDict();
 
   CommandOptions Options(argc, argv);
diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp
index 5a0f731..7d7c3d4 100644
--- a/src/h__02_Reader.cpp
+++ b/src/h__02_Reader.cpp
@@ -403,7 +403,6 @@ AS_02::h__AS02Reader::OpenMXFRead(const char* filename)
     {
       //
       UL OP1a_ul(m_Dict->ul(MDD_OP1a));
-      InterchangeObject* Object;
       m_Info.LabelSetType = LS_MXF_SMPTE;
 
       if ( m_HeaderPart.OperationalPattern != OP1a_ul )
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index 04f3123..4df7c1a 100755
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -80,8 +80,6 @@ ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename)
   if( KM_SUCCESS(result) )
     {
       //
-      InterchangeObject* Object;
-
       m_Info.LabelSetType = LS_MXF_UNKNOWN;
 
       if ( m_HeaderPart.OperationalPattern.ExactMatch(MXFInterop_OPAtom_Entry().ul) )
diff --git a/src/klvwalk.cpp b/src/klvwalk.cpp
index ef30bc4..d215219 100755
--- a/src/klvwalk.cpp
+++ b/src/klvwalk.cpp
@@ -209,7 +209,6 @@ main(int argc, const char** argv)
 	  if ( ASDCP_SUCCESS(result) )
 	    {
 	      result = RIP.InitFromFile(Reader);
-	      ui32_t test_s = RIP.PairArray.size();
 
 	      if ( ASDCP_FAILURE(result) )
 		{
@@ -286,7 +285,6 @@ main(int argc, const char** argv)
 	  if ( ASDCP_SUCCESS(result) )
 	    {
 	      result = RIP.InitFromFile(Reader);
-	      ui32_t test_s = RIP.PairArray.size();
 
 	      if ( ASDCP_FAILURE(result) )
 		{
diff --git a/src/pinkwave.cpp b/src/pinkwave.cpp
index 327a262..646322e 100644
--- a/src/pinkwave.cpp
+++ b/src/pinkwave.cpp
@@ -203,7 +203,6 @@ make_pink_wav_file(CommandOptions& Options)
     {
       ui32_t write_count = 0;
       ui32_t duration = 0;
-      byte_t scaled_pink[sizeof(ui32_t)];
 
       while ( ASDCP_SUCCESS(result) && (duration++ < Options.duration) )
 	{