From af6a1e4ef13dcf5811ccd9eb6b63d21bdc88dc70 Mon Sep 17 00:00:00 2001 From: jhurst Date: Wed, 7 Oct 2015 16:41:23 +0000 Subject: o Moved personal dev environment from older gcc to newer clang. Many small changes were made to satisfy the new compiler: - Altered many printf format codes to use the correct type for the given integer type - Parenthesized some expressions to clarify previously ambiguous expectations of precedence - Created macro KM_MACOSX for use in OS-specific code selection - Removed last uses of the old C-language abs(), now using Kumu::xabs() - Removed last uses of the old C-language atoi() o Added platform-independent call Kumu::GetExecutablePath() (test with win32) o Fixed a bug that was causing Array properties to be written without the (count, length) header (from PAL) o Fixed Win32 build (from Crowe) o Added imlementation of SMPTE ST 2092-1 pink noise generator o Added pinkwave CLI utility o Added font support to the IMF timed-text wrapper --- src/AS_02_TimedText.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/AS_02_TimedText.cpp') diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp index 47d3566..bd85737 100644 --- a/src/AS_02_TimedText.cpp +++ b/src/AS_02_TimedText.cpp @@ -114,13 +114,17 @@ AS_02::TimedText::MXFReader::h__Reader::MD_to_TimedText_TDesc(TimedTextDescripto if ( DescObject->MIMEMediaType.find("application/x-font-opentype") != std::string::npos || DescObject->MIMEMediaType.find("application/x-opentype") != std::string::npos || DescObject->MIMEMediaType.find("font/opentype") != std::string::npos ) - TmpResource.Type = ASDCP::TimedText::MT_OPENTYPE; - + { + TmpResource.Type = ASDCP::TimedText::MT_OPENTYPE; + } else if ( DescObject->MIMEMediaType.find("image/png") != std::string::npos ) - TmpResource.Type = ASDCP::TimedText::MT_PNG; - + { + TmpResource.Type = ASDCP::TimedText::MT_PNG; + } else - TmpResource.Type = ASDCP::TimedText::MT_BIN; + { + TmpResource.Type = ASDCP::TimedText::MT_BIN; + } TDesc.ResourceList.push_back(TmpResource); m_ResourceMap.insert(ResourceMap_t::value_type(DescObject->AncillaryResourceID, *sdi)); -- cgit v1.2.3