summaryrefslogtreecommitdiff
path: root/src/AS_02_TimedText.cpp
diff options
context:
space:
mode:
authorjhurst <jhurst@cinecert.com>2015-10-07 16:41:23 +0000
committerjhurst <>2015-10-07 16:41:23 +0000
commitaf6a1e4ef13dcf5811ccd9eb6b63d21bdc88dc70 (patch)
tree021ae744f611d9bfd2f8832c665351132205ab0b /src/AS_02_TimedText.cpp
parent77200515d9acee07988f26dadfa37ffbd169cdfb (diff)
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
Diffstat (limited to 'src/AS_02_TimedText.cpp')
-rw-r--r--src/AS_02_TimedText.cpp14
1 files changed, 9 insertions, 5 deletions
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));