diff --git a/include/d/actor/d_a_movie_player.h b/include/d/actor/d_a_movie_player.h index 4e6a44bd54..17d6a7ac2b 100644 --- a/include/d/actor/d_a_movie_player.h +++ b/include/d/actor/d_a_movie_player.h @@ -83,9 +83,9 @@ typedef struct THPHeader { /* 0x2C */ BE(u32) finalFrameDataOffsets; } THPHeader; -u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag); -s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info); -void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr); +static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag); +static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info); +static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr); #define THP_AUDIO_BUFFER_COUNT 3 #define THP_READ_BUFFER_COUNT 10 diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index d117dd3fa0..14eb8dfa02 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -2638,7 +2638,7 @@ static const std::vector& FixJpeg(const std::span data) { return FixedJpegData; } -extern daMP_THPPlayer daMP_ActivePlayer; +static daMP_THPPlayer daMP_ActivePlayer; static s32 THPVideoDecode(void* file, size_t fileSize, void* tileY, void* tileU, void* tileV, void*) { assert(JpegDecompressHandle); @@ -2715,7 +2715,9 @@ static BOOL THPInit() { } #endif +#if !TARGET_PC // Defined earlier in file. static daMP_THPPlayer daMP_ActivePlayer; +#endif #if TARGET_PC static BOOL ReadThreadCancelled;