Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 17:19:43 +02:00
Code Issues Releases Wiki Activity

Move Mac-only implementation details out of header file

Browse Source
This commit is contained in:
Paul Licameli 2019-03-30 11:03:10 -04:00
parent 870c08ac06
commit 1191e269a8
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/FileFormats.cpp
View File

@ -260,6 +260,16 @@ wxString sf_normalize_name(const char *name)
#define NUM_HEADERS 13 #define NUM_HEADERS 13
//
// Mac OS 4-char type
//
# ifdef __UNIX__
# include <CoreServices/CoreServices.h>
# else
# include <Types.h>
# endif
OSType MacNames[NUM_HEADERS] = { OSType MacNames[NUM_HEADERS] = {
'WAVE', // WAVE 'WAVE', // WAVE
'AIFF', // AIFF 'AIFF', // AIFF
@ -276,7 +286,7 @@ OSType MacNames[NUM_HEADERS] = {
'MAT5', // ?? Matlab 5 'MAT5', // ?? Matlab 5
}; };
OSType sf_header_mactype(int format) static OSType sf_header_mactype(int format)
{ {
if (format >= 0x10000) if (format >= 0x10000)
return MacNames[(format/0x10000)-1]; return MacNames[(format/0x10000)-1];

14
src/FileFormats.h
View File

@ -101,20 +101,6 @@ extern FileExtensions sf_get_all_extensions();
wxString sf_normalize_name(const char *name); wxString sf_normalize_name(const char *name);
//
// Mac OS 4-char type
//
#ifdef __WXMAC__
# ifdef __UNIX__
# include <CoreServices/CoreServices.h>
# else
# include <Types.h>
# endif
OSType sf_header_mactype(int format);
#endif
// This function wrapper uses a mutex to serialize calls to the SndFile library. // This function wrapper uses a mutex to serialize calls to the SndFile library.
#include "MemoryX.h" #include "MemoryX.h"
#include "ondemand/ODTaskThread.h" #include "ondemand/ODTaskThread.h"