From 90f65a88537a36b07666723be4841e349772ba13 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 27 Feb 2015 03:09:08 -0500
Subject: [PATCH] Cortex: delete old B_BEOS_VERSION ifdefs.

---
 src/apps/cortex/Persistence/ExportContext.cpp       |  2 --
 src/apps/cortex/Persistence/ExportContext.h         |  2 --
 .../cortex/Persistence/Wrappers/MediaFormatIO.cpp   | 13 -------------
 3 files changed, 17 deletions(-)

diff --git a/src/apps/cortex/Persistence/ExportContext.cpp b/src/apps/cortex/Persistence/ExportContext.cpp
index a6f667e0c3..684ea0e73f 100644
--- a/src/apps/cortex/Persistence/ExportContext.cpp
+++ b/src/apps/cortex/Persistence/ExportContext.cpp
@@ -179,7 +179,6 @@ void ExportContext::beginContent() {
 \
 	writeString(out);
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
 void ExportContext::writeAttr(
 	const char*									key,
 	int8												value) {_WRITE_ATTR_BODY(value)}
@@ -195,7 +194,6 @@ void ExportContext::writeAttr(
 void ExportContext::writeAttr(
 	const char*									key,
 	uint16											value) {_WRITE_ATTR_BODY(uint32(value))}
-#endif
 
 void ExportContext::writeAttr(
 	const char*									key,
diff --git a/src/apps/cortex/Persistence/ExportContext.h b/src/apps/cortex/Persistence/ExportContext.h
index 3e5ab8aa18..b07f965221 100644
--- a/src/apps/cortex/Persistence/ExportContext.h
+++ b/src/apps/cortex/Persistence/ExportContext.h
@@ -128,7 +128,6 @@ public:													// *** XML formatting helpers
 	// [e.moon 22dec99]
 	// non-template forms of writeAttr()
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
 	void writeAttr(
 		const char*									key,
 		int8												value);
@@ -144,7 +143,6 @@ public:													// *** XML formatting helpers
 	void writeAttr(
 		const char*									key,
 		uint16											value);
-#endif
 
 	void writeAttr(
 		const char*									key,
diff --git a/src/apps/cortex/Persistence/Wrappers/MediaFormatIO.cpp b/src/apps/cortex/Persistence/Wrappers/MediaFormatIO.cpp
index b0243893d5..379608f4a4 100644
--- a/src/apps/cortex/Persistence/Wrappers/MediaFormatIO.cpp
+++ b/src/apps/cortex/Persistence/Wrappers/MediaFormatIO.cpp
@@ -583,8 +583,6 @@ void export_raw_audio_attr(
 	}
 }
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
-
 void export_multi_audio_info_attr(
 	const media_multi_audio_info& f,
 	ExportContext& context) {
@@ -600,7 +598,6 @@ void export_multi_audio_info_attr(
 	if(f.matrix_mask != w.matrix_mask)
 		context.writeAttr(gKey_matrix_mask, f.matrix_mask);
 }
-#endif
 
 void export_video_display_info_attr(
 	const media_video_display_info& d,
@@ -842,9 +839,7 @@ void export_encoded_audio_content(
 	context.beginElement(MediaFormatIO::s_raw_audio_tag);
 	export_raw_audio_attr(f.output, context);
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
 	export_multi_audio_info_attr(f.multi_info, context);
-#endif
 
 	context.endElement();
 }
@@ -925,9 +920,7 @@ void MediaFormatIO::xmlExportAttributes(
 	switch(m_format.type) {
 		case B_MEDIA_RAW_AUDIO:
 			export_raw_audio_attr(m_format.u.raw_audio, context);
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
 			export_multi_audio_info_attr(m_format.u.raw_audio, context);
-#endif
 			break;
 
 		case B_MEDIA_RAW_VIDEO:
@@ -1016,8 +1009,6 @@ void import_raw_audio_attribute(
 	}
 }
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
-
 void import_multi_audio_info_attribute(
 	media_multi_audio_info& f,
 	const char* key,
@@ -1032,8 +1023,6 @@ void import_multi_audio_info_attribute(
 		f.matrix_mask = atoi(value);
 }
 
-#endif
-
 void import_raw_video_attribute(
 	media_raw_video_format& f,
 	const char* key,
@@ -1257,10 +1246,8 @@ void MediaFormatIO::xmlImportAttribute(
 			import_raw_audio_attribute(
 				m_format.u.raw_audio, key, value, context);
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
 			import_multi_audio_info_attribute(
 				m_format.u.raw_audio, key, value, context);
-#endif
 			break;
 
 		case B_MEDIA_RAW_VIDEO: