WavPack: Apply updates from official Mixer

WohlSoft · Aug 20, 2024 · a6f35b4 · a6f35b4
1 parent 1696249
commit a6f35b4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/codecs/music_wavpack.c b/src/codecs/music_wavpack.c
@@ -70,7 +70,6 @@ typedef struct {
     uint32_t libversion;
     uint32_t (*WavpackGetLibraryVersion)(void);
     char *(*WavpackGetErrorMessage)(WavpackContext*);
-    WavpackContext *(*WavpackOpenFileInput)(const char *infilename, char *error, int flags, int norm_offset);
     WavpackContext *(*WavpackOpenFileInputEx)(WavpackStreamReader *reader, void *wv_id, void *wvc_id, char *error, int flags, int norm_offset);
     WavpackContext *(*WavpackCloseFile)(WavpackContext*);
     int (*WavpackGetMode)(WavpackContext*);
@@ -116,7 +115,6 @@ static int WAVPACK_Load(void)
 #endif
         FUNCTION_LOADER(WavpackGetLibraryVersion, uint32_t (*)(void));
         FUNCTION_LOADER(WavpackGetErrorMessage, char *(*)(WavpackContext*));
-        FUNCTION_LOADER(WavpackOpenFileInput, WavpackContext *(*)(const char*, char*, int, int));
         FUNCTION_LOADER(WavpackOpenFileInputEx, WavpackContext *(*)(WavpackStreamReader*, void*, void*, char*, int, int));
         FUNCTION_LOADER(WavpackCloseFile, WavpackContext *(*)(WavpackContext*));
         FUNCTION_LOADER(WavpackGetMode, int (*)(WavpackContext*));
@@ -322,7 +320,7 @@ static void *WAVPACK_CreateFromFile(const char *file)
     size_t len;
     char *file2;
 
-    src1 = _Mix_RWFromFile(file, "rb");
+    src1 = SDL_RWFromFile(file, "rb");
     if (!src1) {
         Mix_SetError("Couldn't open '%s'", file);
         return NULL;
@@ -335,7 +333,7 @@ static void *WAVPACK_CreateFromFile(const char *file)
         SDL_memcpy(file2, file, len);
         file2[len] =  'c';
         file2[len + 1] = '\0';
-        src2 = _Mix_RWFromFile(file2, "rb");
+        src2 = SDL_RWFromFile(file2, "rb");
 #if WAVPACK_DBG
         if (src2) {
             SDL_Log("Loaded WavPack correction file %s", file2);