소스 검색

Avoid AudioBuffer symbol collision on macOS

raudio AudioBuffer internal struct collides on macOS with CoreAudio same name struct. In this case struct has been renamed because is internal to raudio... but probably all system should be redesigned.
pull/755/head
Ray 5 년 전
부모
커밋
e46c23128e
1개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. +10
    -4
      src/raudio.c

+ 10
- 4
src/raudio.c 파일 보기

@ -218,8 +218,8 @@ typedef enum { AUDIO_BUFFER_USAGE_STATIC = 0, AUDIO_BUFFER_USAGE_STREAM } AudioB
// Audio buffer structure
// NOTE: Slightly different logic is used when feeding data to the playback device depending on whether or not data is streamed
typedef struct AudioBuffer AudioBuffer;
struct AudioBuffer {
typedef struct rAudioBuffer rAudioBuffer;
struct rAudioBuffer {
mal_dsp dsp; // Required for format conversion
float volume;
float pitch;
@ -230,11 +230,15 @@ struct AudioBuffer {
bool isSubBufferProcessed[2];
unsigned int frameCursorPos;
unsigned int bufferSizeInFrames;
AudioBuffer *next;
AudioBuffer *prev;
rAudioBuffer *next;
rAudioBuffer *prev;
unsigned char buffer[1];
};
// HACK: To avoid CoreAudio (macOS) symbol collision
// NOTE: This system should probably be redesigned
#define AudioBuffer rAudioBuffer
// mini_al global variables
static mal_context context;
static mal_device device;
@ -1961,3 +1965,5 @@ void TraceLog(int msgType, const char *text, ...)
if (msgType == LOG_ERROR) exit(1);
}
#endif
#undef AudioBuffer

불러오는 중...
취소
저장