update to 0.5.0

Author: tomysshadow

ExportFile Resources/ExportFile Sample Movie.dir

@@ -1,4 +1,4 @@
-# ExportFile Xtra 0.4.9
+# ExportFile Xtra 0.5.0
 ## By Anthony Kleine
 
 ExportFile Xtra exports the content of Director cast members out to files. It can export all built-in cast member types, as well as Xtra Media.

ExportFile Test/ExportFile Test Movie.dir

@@ -4,7 +4,7 @@ std::string& Asset::trimEllipsis(std::string &displayName) {
 	// when displaying the type for the Cast window
 	// Director will strip ellipsis off the end of the Display Name
 	// (but ONLY if there are three periods or more)
-	const std::string::size_type ELLIPSIS_SIZE = 3;
+	static const std::string::size_type ELLIPSIS_SIZE = 3;
 
 	std::string::size_type ellipsisIndex = displayName.find_last_not_of(".") + 1;
 
@@ -129,10 +129,10 @@ MoaError Asset::Assets::Info::findIconValue(IconValues::VARIANT &iconValuesVaria
 
 RESOURCE_ID Asset::Assets::Info::getBaseResourceID(unsigned long productVersionMajor) {
 	// 8, 9, 10, 11, 12
-	const unsigned long MIN_PRODUCT_VERSION_MAJOR = 8;
-	const unsigned long MAX_PRODUCT_VERSION_MAJOR = 12;
+	static const unsigned long MIN_PRODUCT_VERSION_MAJOR = 8;
+	static const unsigned long MAX_PRODUCT_VERSION_MAJOR = 12;
 
-	const RESOURCE_ID ASSET_INFO_MAP_ICON_RESOURCES_COUNT = 6;
+	static const RESOURCE_ID ASSET_INFO_MAP_ICON_RESOURCES_COUNT = 6;
 
 	productVersionMajor = min(MAX_PRODUCT_VERSION_MAJOR, max(MIN_PRODUCT_VERSION_MAJOR, productVersionMajor));
 	return (RESOURCE_ID)((productVersionMajor - MIN_PRODUCT_VERSION_MAJOR) * ASSET_INFO_MAP_ICON_RESOURCES_COUNT);

README.md

@@ -87,7 +87,7 @@ MoaError Formats::Format::createTempFile(PIMoaFile tempFileInterfacePointer) {
 	// "ExFi" gives some clue where the temporary file came from if a crash occurs
 	// use extension of .tmp for a further clue to the file's purpose
 	// unless other specific extension required
-	const std::string PREFIX = "~ExFi";
+	static const std::string PREFIX = "~ExFi";
 	const std::string PERIOD_TEMP_FILE_EXTENSION = "." + TEMP_FILE_EXTENSION;
 
 	std::string filename = PREFIX + PERIOD_TEMP_FILE_EXTENSION;
@@ -112,7 +112,7 @@ MoaError Formats::Format::createTempFile(PIMoaFile tempFileInterfacePointer) {
 	// we also can't put this in the system temporary directory
 	// because later we'll call SwapFile on this, which requires
 	// that it be on the same volume as the file we're swapping with
-	const size_t ABC_SIZE = 4;
+	static const size_t ABC_SIZE = 4;
 	char abc[ABC_SIZE] = "";
 
 	size_t index = 2;
@@ -194,7 +194,7 @@ MoaError Formats::Format::setTempFileAttributeHidden(bool hidden, PIMoaFile temp
 	};
 
 	MoaSystemFileSpec sysSpec = "";
-	const MoaLong SYS_SPEC_SIZE = sizeof(sysSpec);
+	static const MoaLong SYS_SPEC_SIZE = sizeof(sysSpec);
 
 	RETURN_ERR(tempFileInterfacePointer->GetSysSpec(sysSpec, SYS_SPEC_SIZE));
 
@@ -508,7 +508,7 @@ MoaError Formats::WinPALETTEFormat::getPaletteGlobalHandleLock(std::unique_ptr<G
 	RETURN_NULL(paletteGlobalHandleLockPointer);
 
 	// RIFF is word-aligned
-	const DWORD WORD_SIZE = sizeof(WORD);
+	static const DWORD WORD_SIZE = sizeof(WORD);
 
 	MMIOINFO mmioinfo = {};
 	mmioinfo.pchBuffer = paletteGlobalHandleLockPointer->get();
@@ -564,7 +564,7 @@ MoaError Formats::WinPALETTEFormat::writeFile(bool agent, PIMoaFile writeFileInt
 	}
 
 	MoaSystemFileSpec sysSpec = "";
-	const MoaLong SYS_SPEC_SIZE = sizeof(sysSpec);
+	static const MoaLong SYS_SPEC_SIZE = sizeof(sysSpec);
 
 	RETURN_ERR(this->writeFileInterfacePointer->GetSysSpec(sysSpec, SYS_SPEC_SIZE));
 
@@ -984,7 +984,7 @@ MoaError Formats::XtraMediaSWFFormat::seekStream(Stream &stream, MoaUlong &size)
 	// of the Flash Asset's StreamInMedia method
 	// first, read a ChunkID
 	CHUNK_ID chunkID = 0;
-	const MoaStreamCount CHUNK_ID_SIZE = sizeof(chunkID);
+	static const MoaStreamCount CHUNK_ID_SIZE = sizeof(chunkID);
 
 	RETURN_ERR(stream.readSafe(&chunkID, CHUNK_ID_SIZE));
 
@@ -997,8 +997,8 @@ MoaError Formats::XtraMediaSWFFormat::seekStream(Stream &stream, MoaUlong &size)
 	chunkID &= 0x00FFFFFF;
 
 	// check if the ChunkID is SWF or SWC
-	const CHUNK_ID SWF_CHUNK_ID = 0x00535746;
-	const CHUNK_ID SWC_CHUNK_ID = 0x00535743;
+	static const CHUNK_ID SWF_CHUNK_ID = 0x00535746;
+	static const CHUNK_ID SWC_CHUNK_ID = 0x00535743;
 
 	if (chunkID == SWF_CHUNK_ID || chunkID == SWC_CHUNK_ID) {
 		// if it is, the entire stream is the SWF
@@ -1009,12 +1009,12 @@ MoaError Formats::XtraMediaSWFFormat::seekStream(Stream &stream, MoaUlong &size)
 	// this value is 1 if the SWF is embedded, FLLK if it's linked
 	// it is unused when reading the asset stream
 	uint32_t unused = 0;
-	const MoaStreamCount UNUSED_SIZE = sizeof(unused);
+	static const MoaStreamCount UNUSED_SIZE = sizeof(unused);
 
 	RETURN_ERR(stream.readSafe(&unused, UNUSED_SIZE));
 
 	// the SWF size
-	const MoaStreamCount SIZE_SIZE = sizeof(size);
+	static const MoaStreamCount SIZE_SIZE = sizeof(size);
 
 	RETURN_ERR(stream.readSafe(&size, SIZE_SIZE));
 
@@ -1046,7 +1046,7 @@ MoaError Formats::XtraMediaW3DFormat::seekStream(Stream &stream, MoaUlong &size)
 	// of the Shockwave 3D Asset's StreamInMedia method
 	// first, read a ChunkID
 	CHUNK_ID chunkID = 0;
-	const MoaStreamCount CHUNK_ID_SIZE = sizeof(chunkID);
+	static const MoaStreamCount CHUNK_ID_SIZE = sizeof(chunkID);
 
 	RETURN_ERR(stream.readSafe(&chunkID, CHUNK_ID_SIZE));
 
@@ -1062,22 +1062,22 @@ MoaError Formats::XtraMediaW3DFormat::seekStream(Stream &stream, MoaUlong &size)
 	// if the W3D size is less than 16 bytes, it is invalid
 	// the 3DMD ChunkID is likely just a placeholder
 	// so that the stream is not empty
-	const CHUNK_ID THREEDEM_CHUNK_ID = 0x3344454D;
-	const uint32_t MIN_W3D_SIZE = 16;
+	static const CHUNK_ID THREEDEM_CHUNK_ID = 0x3344454D;
+	static const uint32_t MIN_W3D_SIZE = 16;
 
 	if (chunkID == THREEDEM_CHUNK_ID) {
 		// the next two values are unused when reading the asset stream
 		// I suspect they are only used for integration with 3DS Max
 		// the size and constant value 0x20000000 look suspiciously similar to
 		// the ID tags used in the 3DS model format
 		uint32_t unused = 0;
-		const MoaStreamCount UNUSED_SIZE = sizeof(unused);
+		static const MoaStreamCount UNUSED_SIZE = sizeof(unused);
 
 		RETURN_ERR(stream.readSafe(&unused, UNUSED_SIZE));
 		RETURN_ERR(stream.readSafe(&unused, UNUSED_SIZE));
 
 		// the W3D size
-		const MoaStreamCount SIZE_SIZE = sizeof(size);
+		static const MoaStreamCount SIZE_SIZE = sizeof(size);
 
 		RETURN_ERR(stream.readSafe(&size, SIZE_SIZE));
 
@@ -1267,7 +1267,7 @@ MoaError Formats::XtraMediaMixerAsyncFormat::writeFile(bool agent, PIMoaFile wri
 	RETURN_NULL(writeStreamInterfacePointer);
 
 	// CallFunction demands that the first argument be left empty
-	const MoaLong ARGS_SIZE = 2;
+	static const MoaLong ARGS_SIZE = 2;
 	MoaMmValue args[ARGS_SIZE] = { kVoidMoaMmValueInitializer, kVoidMoaMmValueInitializer };
 
 	MoaChar pathnameSpec[MOA_MAX_PATHNAME] = "";
@@ -1322,7 +1322,7 @@ MoaError Formats::XtraMediaMixerAsyncFormat::cancelFile() {
 
 	// don't call Stop if we didn't call Save first
 	if (saveStatus == kMoaStatus_False) {
-		const MoaLong ARGS_SIZE = 1;
+		static const MoaLong ARGS_SIZE = 1;
 		MoaMmValue args[ARGS_SIZE] = { kVoidMoaMmValueInitializer };
 
 		RETURN_ERR(drCastMemInterfacePointer->CallFunction(symbols.Stop, ARGS_SIZE, args, NULL));

source/Asset.cpp

@@ -246,8 +246,8 @@ MoaError Media::MixerMedia::Lingo::getSymbols() {
 }
 
 MoaError Media::MixerMedia::Lingo::getDefaultValues() {
-	const MoaLong DEFAULT_RESULT_VALUE = IS_ERROR(kMoaErr_InternalError);
-	const MoaLong DEFAULT_ERR_CODE_VALUE = HRESULT_CODE(kMoaErr_InternalError);
+	static const MoaLong DEFAULT_RESULT_VALUE = IS_ERROR(kMoaErr_InternalError);
+	static const MoaLong DEFAULT_ERR_CODE_VALUE = HRESULT_CODE(kMoaErr_InternalError);
 
 	RETURN_ERR(mmValueInterfacePointer->IntegerToValue(DEFAULT_RESULT_VALUE, &defaultResultValue));
 	RETURN_ERR(mmValueInterfacePointer->IntegerToValue(DEFAULT_ERR_CODE_VALUE, &defaultErrCodeValue));
@@ -351,7 +351,7 @@ void Media::MixerMedia::Lingo::callHandler(MoaMmValue &memberValue, MoaError mix
 	MoaError err2 = mmValueInterfacePointer->IntegerToValue(errCode, &errCodeValue);
 
 	// default values so this will theoretically NEVER fail
-	const MoaLong ARGS_SIZE = 3;
+	static const MoaLong ARGS_SIZE = 3;
 	MoaMmValue args[ARGS_SIZE] = { memberValue, err == kMoaErr_NoErr ? resultValue : defaultResultValue, err2 == kMoaErr_NoErr ? errCodeValue : defaultErrCodeValue };
 
 	// don't care if this fails, handler may not be defined
@@ -392,7 +392,7 @@ MoaError Media::WinBMPMedia::allocateSourceBitmap(PIMoaReceptorPixels receptorPi
 	sourceBitmapFileHeaderOptional.emplace();
 	BITMAPFILEHEADER &sourceBitmapFileHeader = sourceBitmapFileHeaderOptional.value();
 
-	const MoaStreamCount SOURCE_BITMAP_FILE_HEADER_SIZE = sizeof(sourceBitmapFileHeader);
+	static const MoaStreamCount SOURCE_BITMAP_FILE_HEADER_SIZE = sizeof(sourceBitmapFileHeader);
 
 	RETURN_ERR(readStreamSafe(&sourceBitmapFileHeader, SOURCE_BITMAP_FILE_HEADER_SIZE, readStreamInterfacePointer));
 
@@ -413,7 +413,7 @@ MoaError Media::WinBMPMedia::allocateSourceBitmap(PIMoaReceptorPixels receptorPi
 		// we need this ugly get call because this is technically a char pointer
 		BITMAPINFOHEADER &sourceBitmapInfoHeader = ((PBITMAPINFO)sourceBitmapInfoPointer.get())->bmiHeader;
 
-		const MoaStreamCount SOURCE_BITMAP_INFO_HEADER_SIZE = sizeof(sourceBitmapInfoHeader);
+		static const MoaStreamCount SOURCE_BITMAP_INFO_HEADER_SIZE = sizeof(sourceBitmapInfoHeader);
 
 		RETURN_ERR(readStreamSafe(&sourceBitmapInfoHeader, SOURCE_BITMAP_INFO_HEADER_SIZE, readStreamInterfacePointer));
 
@@ -552,7 +552,7 @@ bool Media::WinBMPMedia::getImageSize(MoaLong colorSpace, ULONG absWidth, ULONG
 	#if defined READ_RPCS_INDEXED_RGB || defined READ_RPCS_RGB16
 	typedef std::map<MoaLong, WORD> BIT_COUNT_MAP;
 
-	const BIT_COUNT_MAP _BIT_COUNT_MAP = {
+	static const BIT_COUNT_MAP _BIT_COUNT_MAP = {
 		{ RPCS_INDEXED_RGB, 8 },
 		{ RPCS_RGB16, 16 },
 		{ RPCS_RGB, 24 },
@@ -584,7 +584,7 @@ bool Media::WinBMPMedia::getSamplesPerPixel(MoaLong colorSpace, MoaShort &sample
 	#if defined READ_RPCS_INDEXED_RGB || defined READ_RPCS_RGB16
 	typedef std::map<MoaLong, MoaShort> SAMPLES_PER_PIXEL_MAP;
 
-	const SAMPLES_PER_PIXEL_MAP _SAMPLES_PER_PIXEL_MAP = {
+	static const SAMPLES_PER_PIXEL_MAP _SAMPLES_PER_PIXEL_MAP = {
 		{ RPCS_INDEXED_RGB, 1 },
 		{ RPCS_RGB16, 3 },
 		{ RPCS_RGB, 3 },
@@ -621,14 +621,14 @@ bool Media::WinBMPMedia::getColorTableIndexedRGB(BITMAPINFO &bitmapInfo, MoaPixe
 		return false;
 	}
 
-	const MoaLong ENTRY_SIZE = sizeof(TMoaCTableEntry);
+	static const MoaLong ENTRY_SIZE = sizeof(TMoaCTableEntry);
 
 	if (!ENTRY_SIZE) {
 		return false;
 	}
 
-	const MoaLong ENTRIES_SIZE = sizeof(pixelFormat.cs.colorTable.Entry);
-	const MoaLong NUM_ENTRIES_ALLOC = ENTRIES_SIZE / ENTRY_SIZE;
+	static const MoaLong ENTRIES_SIZE = sizeof(pixelFormat.cs.colorTable.Entry);
+	static const MoaLong NUM_ENTRIES_ALLOC = ENTRIES_SIZE / ENTRY_SIZE;
 
 	pixelFormat.cs.colorTable.Header.iNumEntries = colorsUsed;
 	pixelFormat.cs.colorTable.Header.iNumEntriesAlloc = NUM_ENTRIES_ALLOC;
@@ -713,15 +713,15 @@ bool Media::WinBMPMedia::getBitmapInfoColorsSize(const BITMAPINFOHEADER &bitmapI
 			return false;
 		}
 
-		const DWORD RGBQUAD_SIZE = sizeof(RGBQUAD);
+		static const DWORD RGBQUAD_SIZE = sizeof(RGBQUAD);
 
 		colorsSize = colorsUsed * RGBQUAD_SIZE;
 		return true;
 	}
 
 	if (bitmapInfoHeader.biCompression == BI_BITFIELDS) {
-		const DWORD DWORD_SIZE = sizeof(DWORD);
-		const DWORD COLOR_MASKS_SIZE = DWORD_SIZE * 3;
+		static const DWORD DWORD_SIZE = sizeof(DWORD);
+		static const DWORD COLOR_MASKS_SIZE = DWORD_SIZE * 3;
 
 		colorsSize = COLOR_MASKS_SIZE;
 	}
@@ -785,7 +785,7 @@ MoaError Media::WinBMPMedia::getPixelFormat(PIMoaReceptorPixels receptorPixelsIn
 	}
 
 	// no thumbnail size, only the canonical size available
-	const MoaLong DIMENSION_COUNT = 1;
+	static const MoaLong DIMENSION_COUNT = 1;
 
 	ULONG absSourceWidth = abs(sourceBitmapInfoHeader.biWidth);
 	pixelFormat.dim.pixels.x = absSourceWidth;
@@ -795,7 +795,7 @@ MoaError Media::WinBMPMedia::getPixelFormat(PIMoaReceptorPixels receptorPixelsIn
 
 	// both should ideally be provided
 	// (PNG Writer just gives up if there's no TOP_DOWN option)
-	const MoaLong DIRECTIONS_SIZE = 2;
+	static const MoaLong DIRECTIONS_SIZE = 2;
 	MoaLong DIRECTIONS[DIRECTIONS_SIZE] = { BOTTOM_UP, TOP_DOWN };
 
 	RETURN_ERR(
@@ -923,7 +923,7 @@ MoaError Media::WinBMPMedia::getPixelFormat(PIMoaReceptorPixels receptorPixelsIn
 	pixelFormat.cs.flags = pixelFormat.cs.colorSpace == RPCS_RGBA ? RPCSFLAGS_TRANSPARENT : RPCSFLAGS_NONE;
 
 	// can't be an integer divide: must be able to round down OR up to nearest number
-	const double METERS_TO_INCHES = 0.0254;
+	static const double METERS_TO_INCHES = 0.0254;
 
 	pixelFormat.dim.resolution.x = (MoaCoord)round(METERS_TO_INCHES * bitmapInfoHeader.biXPelsPerMeter);
 	pixelFormat.dim.resolution.y = (MoaCoord)round(METERS_TO_INCHES * bitmapInfoHeader.biYPelsPerMeter);
@@ -1112,7 +1112,7 @@ MoaError Media::WinBMPMedia::getMappedView(PIMoaReceptorPixels receptorPixelsInt
 		// it creates its own internal file mapping
 		// so because it is a mapped view, we can use VirtualQuery to get the size
 		MEMORY_BASIC_INFORMATION memoryBasicInformation = {};
-		const SIZE_T MEMORY_BASIC_INFORMATION_SIZE = sizeof(memoryBasicInformation);
+		static const SIZE_T MEMORY_BASIC_INFORMATION_SIZE = sizeof(memoryBasicInformation);
 
 		RETURN_ERR(
 			osErr(

source/Formats.cpp

@@ -165,7 +165,7 @@ unsigned int __declspec(noinline) threadNoInline(void* argList) {
 	#endif
 
 	// this doesn't really need to be precise, just needs to be some kinda small amount of time
-	const std::chrono::milliseconds MILLISECONDS(25);
+	static const std::chrono::milliseconds MILLISECONDS(25);
 
 	unsigned int result = 0;
 	MoaError err = kMoaErr_NoErr;
@@ -215,16 +215,16 @@ void Mixer::Window::create() {
 		}
 	}
 
-	const TCHAR className[] = TEXT("Mixer");
+	static const TCHAR CLASS_NAME[] = TEXT("Mixer");
 
 	if (!registeredClass) {
 		WNDCLASSEX windowClassEx = {};
-		const UINT WINDOW_CLASS_EX_SIZE = sizeof(windowClassEx);
+		static const UINT WINDOW_CLASS_EX_SIZE = sizeof(windowClassEx);
 
 		windowClassEx.cbSize = WINDOW_CLASS_EX_SIZE;
 		windowClassEx.lpfnWndProc = proc;
 		windowClassEx.hInstance = moduleHandle;
-		windowClassEx.lpszClassName = className;
+		windowClassEx.lpszClassName = CLASS_NAME;
 
 		registeredClass = RegisterClassEx(&windowClassEx);
 
@@ -235,7 +235,7 @@ void Mixer::Window::create() {
 
 	handle = CreateWindowEx(
 		NULL,
-		className,
+		CLASS_NAME,
 		TEXT("Mixer"),
 		WS_CHILD,
 		CW_USEDEFAULT,

source/Media.cpp

@@ -21,7 +21,7 @@ namespace std {
 /*
 struct MoaIDComparer {
     bool operator()(const MoaID &moaID, const MoaID &moaID2) const {
-        const size_t MOA_ID_SIZE = sizeof(MoaID);
+        static const size_t MOA_ID_SIZE = sizeof(MoaID);
         return memcmp(&moaID, &moaID2, MOA_ID_SIZE) == -1;
     }
 };

source/Mixer.cpp

@@ -11,7 +11,7 @@ bool Path::filterPatternExtensions(std::string filterPattern, EXTENSION_MAPPED_V
 	// clear because we want to pass out a new mapped vector instead of appending
 	extensions.clear();
 
-	const std::regex FILTER_PATTERN_EXTENSIONS("^\\*\\.([^\\.;]+);*");
+	static const std::regex FILTER_PATTERN_EXTENSIONS("^\\*\\.([^\\.;]+);*");
 
 	std::smatch matches = {};
 
@@ -402,7 +402,7 @@ std::string Path::Info::toBasename(const std::string &filename) {
 }
 
 std::string Path::Info::toExtension(const std::string &filename) {
-	const std::string::size_type PERIOD_SIZE = sizeof(PERIOD);
+	static const std::string::size_type PERIOD_SIZE = sizeof(PERIOD);
 
 	std::string::size_type periodIndex = filename.rfind(PERIOD);
 
@@ -608,7 +608,7 @@ MoaError Path::Info::incrementFilename() {
 	unsigned long number = 2;
 
 	{
-		const std::regex INCREMENT_FILENAME("^([^\\(]*)\\((\\d{0,3})\\)(.*)$");
+		static const std::regex INCREMENT_FILENAME("^([^\\(]*)\\((\\d{0,3})\\)(.*)$");
 
 		std::smatch matches = {};
 
@@ -620,8 +620,8 @@ MoaError Path::Info::incrementFilename() {
 		// if no (brackets) found, stick them on the end of the basename, after a space
 		if (std::regex_search(filenameOptional.value(), matches, INCREMENT_FILENAME)
 		&& matches.length() > 3) {
-			const unsigned long MIN_NUMBER = 1;
-			const unsigned long MAX_NUMBER = 999;
+			static const unsigned long MIN_NUMBER = 1;
+			static const unsigned long MAX_NUMBER = 999;
 
 			basename = matches[1];
 

source/MoaIDHash.h

@@ -4,7 +4,7 @@ MoaError Registry::Entry::getValueLong(ConstPMoaChar keyStringPointer, MoaLong &
 	RETURN_NULL(keyStringPointer);
 	RETURN_NULL(registryEntryDictInterfacePointer);
 
-	const MoaLong VALUE_SIZE = sizeof(value);
+	static const MoaLong VALUE_SIZE = sizeof(value);
 
 	MoaLong defaultValue = value;
 
@@ -22,6 +22,6 @@ MoaError Registry::Entry::setValueLong(ConstPMoaChar keyStringPointer, MoaLong v
 	RETURN_NULL(keyStringPointer);
 	RETURN_NULL(registryEntryDictInterfacePointer);
 
-	const MoaLong VALUE_SIZE = sizeof(value);
+	static const MoaLong VALUE_SIZE = sizeof(value);
 	return registryEntryDictInterfacePointer->Put(kMoaDictType_Long, &value, VALUE_SIZE, keyStringPointer);
 }