i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cortex: delete old B_BEOS_VERSION ifdefs.

Browse Source
This commit is contained in:
Augustin Cavalier
2015-02-28 12:54:33 -05:00
parent 7dc141827a
commit 90f65a8853
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cortex/Persistence/ExportContext.cpp
-2
View File
@@ -179,7 +179,6 @@ void ExportContext::beginContent() {
\ \
writeString(out); writeString(out);
#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
void ExportContext::writeAttr( void ExportContext::writeAttr(
const char* key, const char* key,
int8 value) {_WRITE_ATTR_BODY(value)} int8 value) {_WRITE_ATTR_BODY(value)}
@@ -195,7 +194,6 @@ void ExportContext::writeAttr(
void ExportContext::writeAttr( void ExportContext::writeAttr(
const char* key, const char* key,
uint16 value) {_WRITE_ATTR_BODY(uint32(value))} uint16 value) {_WRITE_ATTR_BODY(uint32(value))}
#endif
void ExportContext::writeAttr( void ExportContext::writeAttr(
const char* key, const char* key,
src/apps/cortex/Persistence/ExportContext.h
-2
View File
@@ -128,7 +128,6 @@ public: // *** XML formatting helpers
// [e.moon 22dec99] // [e.moon 22dec99]
// non-template forms of writeAttr() // non-template forms of writeAttr()
#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
void writeAttr( void writeAttr(
const char* key, const char* key,
int8 value); int8 value);
@@ -144,7 +143,6 @@ public: // *** XML formatting helpers
void writeAttr( void writeAttr(
const char* key, const char* key,
uint16 value); uint16 value);
#endif
void writeAttr( void writeAttr(
const char* key, const char* key,
src/apps/cortex/Persistence/Wrappers/MediaFormatIO.cpp
-13
View File
@@ -583,8 +583,6 @@ void export_raw_audio_attr(
} }
} }
#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
void export_multi_audio_info_attr( void export_multi_audio_info_attr(
const media_multi_audio_info& f, const media_multi_audio_info& f,
ExportContext& context) { ExportContext& context) {
@@ -600,7 +598,6 @@ void export_multi_audio_info_attr(
if(f.matrix_mask != w.matrix_mask) if(f.matrix_mask != w.matrix_mask)
context.writeAttr(gKey_matrix_mask, f.matrix_mask); context.writeAttr(gKey_matrix_mask, f.matrix_mask);
} }
#endif
void export_video_display_info_attr( void export_video_display_info_attr(
const media_video_display_info& d, const media_video_display_info& d,
@@ -842,9 +839,7 @@ void export_encoded_audio_content(
context.beginElement(MediaFormatIO::s_raw_audio_tag); context.beginElement(MediaFormatIO::s_raw_audio_tag);
export_raw_audio_attr(f.output, context); 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); export_multi_audio_info_attr(f.multi_info, context);
#endif
context.endElement(); context.endElement();
} }
@@ -925,9 +920,7 @@ void MediaFormatIO::xmlExportAttributes(
switch(m_format.type) { switch(m_format.type) {
case B_MEDIA_RAW_AUDIO: case B_MEDIA_RAW_AUDIO:
export_raw_audio_attr(m_format.u.raw_audio, context); 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); export_multi_audio_info_attr(m_format.u.raw_audio, context);
#endif
break; break;
case B_MEDIA_RAW_VIDEO: 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( void import_multi_audio_info_attribute(
media_multi_audio_info& f, media_multi_audio_info& f,
const char* key, const char* key,
@@ -1032,8 +1023,6 @@ void import_multi_audio_info_attribute(
f.matrix_mask = atoi(value); f.matrix_mask = atoi(value);
} }
#endif
void import_raw_video_attribute( void import_raw_video_attribute(
media_raw_video_format& f, media_raw_video_format& f,
const char* key, const char* key,
@@ -1257,10 +1246,8 @@ void MediaFormatIO::xmlImportAttribute(
import_raw_audio_attribute( import_raw_audio_attribute(
m_format.u.raw_audio, key, value, context); m_format.u.raw_audio, key, value, context);
#if B_BEOS_VERSION > B_BEOS_VERSION_4_5
import_multi_audio_info_attribute( import_multi_audio_info_attribute(
m_format.u.raw_audio, key, value, context); m_format.u.raw_audio, key, value, context);
#endif
break; break;
case B_MEDIA_RAW_VIDEO: case B_MEDIA_RAW_VIDEO: