diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AS_02_PCM.cpp | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_internal.h | 12 | ||||
| -rwxr-xr-x | src/MXFTypes.cpp | 2 | ||||
| -rwxr-xr-x | src/asdcp-test.cpp | 2 | ||||
| -rw-r--r-- | src/pinkwave.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp index b21d644..f2b461b 100644 --- a/src/AS_02_PCM.cpp +++ b/src/AS_02_PCM.cpp @@ -165,7 +165,7 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu assert(m_ClipEssenceBegin); ui64_t offset = FrameNum * m_BytesPerFrame; - ui64_t position = m_ClipEssenceBegin + offset; + Kumu::fpos_t position = m_ClipEssenceBegin + offset; Result_t result = RESULT_OK; if ( m_File.Tell() != position ) diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index e59af6f..6189323 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -331,7 +331,7 @@ namespace ASDCP // get absolute frame position and go read the frame's key and length Result_t result = RESULT_OK; - if ( TmpEntry.StreamOffset != m_LastPosition ) + if ( (Kumu::fpos_t) TmpEntry.StreamOffset != m_LastPosition ) { m_LastPosition = TmpEntry.StreamOffset; result = m_File.Seek(TmpEntry.StreamOffset); @@ -370,7 +370,7 @@ namespace ASDCP streamOffset = body_offset + TmpEntry.StreamOffset; temporalOffset = TmpEntry.TemporalOffset; keyFrameOffset = TmpEntry.KeyFrameOffset; - + return RESULT_OK; } @@ -380,7 +380,7 @@ namespace ASDCP m_File.Close(); } }; - + //------------------------------------------------------------------------------------------ // @@ -621,7 +621,7 @@ namespace ASDCP MPTrack.Clip->Duration.set_has_value(); m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration.get())); - + // // File (Source) Package // @@ -727,7 +727,7 @@ namespace ASDCP m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration)); - + // // File (Source) Package // @@ -814,7 +814,7 @@ namespace ASDCP } }; - + }/// namespace MXF //------------------------------------------------------------------------------------------ diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp index d4bbf44..c25386e 100755 --- a/src/MXFTypes.cpp +++ b/src/MXFTypes.cpp @@ -709,7 +709,7 @@ ASDCP::MXF::RGBALayout::EncodeString(char* buf, ui32_t buf_len) const std::string tmp_str; char tmp_buf[64]; - for ( int i = 0; i < RGBAValueLength && m_value[i] != 0; i += 2 ) + for ( size_t i = 0; i < RGBAValueLength && m_value[i] != 0; i += 2 ) { snprintf(tmp_buf, 64, "%c(%d)", get_char_for_code(m_value[i]), m_value[i+1]); diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp index 1b491b0..03181f6 100755 --- a/src/asdcp-test.cpp +++ b/src/asdcp-test.cpp @@ -1944,7 +1944,7 @@ main(int argc, const char** argv) { result = show_file_info(Options); - for ( int i = 1; ASDCP_SUCCESS(result) && i < Options.file_count; ++i ) + for ( ui32_t i = 1; ASDCP_SUCCESS(result) && i < Options.file_count; ++i ) { Options.filenames[0] = Options.filenames[i]; // oh-so hackish result = show_file_info(Options); diff --git a/src/pinkwave.cpp b/src/pinkwave.cpp index 85e59ba..a03bf58 100644 --- a/src/pinkwave.cpp +++ b/src/pinkwave.cpp @@ -209,7 +209,7 @@ make_pink_wav_file(CommandOptions& Options) // fill the frame buffer with a frame of pink noise byte_t *p = FrameBuffer.Data(); - for ( int i = 0; i < samples_per_frame; ++i ) + for ( ui32_t i = 0; i < samples_per_frame; ++i ) { float pink_sample = pink_filter.GetNextSample(lcg.GetNextSample()); ScalePackSample(pink_sample, p, ADesc.BlockAlign); |