smpeg2: add missing SDLCALL to Play_MPEGaudioSDL, Decode_MPEGaudio, P…

…lay_MPEGvideo, and SystemThread.
libsdl-org · Oct 16, 2017 · 0218142 · 0218142
1 parent dd1b6ee
commit 0218142
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/external/smpeg2-2.0.0/MPEGaudio.h b/external/smpeg2-2.0.0/MPEGaudio.h
@@ -32,9 +32,9 @@
 #include "MPEGring.h"
 #endif
 
-void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+void SDLCALL Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
 #ifdef THREADED_AUDIO
-    int Decode_MPEGaudio(void *udata);
+int SDLCALL Decode_MPEGaudio(void *udata);
 #endif
 
 class MPEGstream;
@@ -369,18 +369,18 @@ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
   double timestamp[N_TIMESTAMPS];
 
   /* Functions which access MPEGaudio internals */
-  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+  friend void SDLCALL Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
   friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
 #ifdef THREADED_AUDIO
-  friend int Decode_MPEGaudio(void *udata);
+  friend int SDLCALL Decode_MPEGaudio(void *udata);
 #endif
 };
 
 /* Need to duplicate the prototypes, this is not a typo :) */
-void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+void SDLCALL Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
 int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
 #ifdef THREADED_AUDIO
-int Decode_MPEGaudio(void *udata);
+int SDLCALL Decode_MPEGaudio(void *udata);
 #endif
 
 #endif /* _MPEGAUDIO_H_ */
diff --git a/external/smpeg2-2.0.0/MPEGsystem.cpp b/external/smpeg2-2.0.0/MPEGsystem.cpp
@@ -1337,7 +1337,7 @@ bool MPEGsystem::SystemLoop(MPEGsystem *system)
   return(true);
 }
 
-int MPEGsystem::SystemThread(void * udata)
+int SDLCALL MPEGsystem::SystemThread(void * udata)
 {
   MPEGsystem * system = (MPEGsystem *) udata;
 

diff --git a/external/smpeg2-2.0.0/MPEGsystem.h b/external/smpeg2-2.0.0/MPEGsystem.h
@@ -82,7 +82,7 @@ class MPEGsystem : public MPEGerror
     virtual void Read();
 
     /* The system thread which fills the FIFO */
-    static int SystemThread(void * udata);
+    static int SDLCALL SystemThread(void * udata);
 
     SDL_RWops *source;
 

diff --git a/external/smpeg2-2.0.0/MPEGvideo.h b/external/smpeg2-2.0.0/MPEGvideo.h
@@ -42,7 +42,7 @@ typedef double TimeStamp;
 class MPEGvideo : public MPEGerror, public MPEGvideoaction {
 
     /* Thread to play the video asynchronously */
-    friend int Play_MPEGvideo(void *udata);
+    friend int SDLCALL Play_MPEGvideo(void *udata);
 
     /* Various mpeg_play functions that need our data */
     friend VidStream* mpegVidRsrc( TimeStamp time_stamp, VidStream* vid_stream, int first );

diff --git a/external/smpeg2-2.0.0/audio/mpegtoraw.cpp b/external/smpeg2-2.0.0/audio/mpegtoraw.cpp
@@ -353,7 +353,7 @@ bool MPEGaudio::run( int frames, double *timestamp)
 }
 
 #ifdef THREADED_AUDIO
-int Decode_MPEGaudio(void *udata)
+int SDLCALL Decode_MPEGaudio(void *udata)
 {
     MPEGaudio *audio = (MPEGaudio *)udata;
     double timestamp;
@@ -513,7 +513,7 @@ int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len)
 #endif
     return(mixed);
 }
-void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len)
+void SDLCALL Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len)
 {
     MPEGaudio *audio = (MPEGaudio *)udata;
     Play_MPEGaudio(audio, stream, len);

diff --git a/external/smpeg2-2.0.0/video/MPEGvideo.cpp b/external/smpeg2-2.0.0/video/MPEGvideo.cpp
@@ -210,7 +210,7 @@ MPEGvideo:: ~MPEGvideo()
 }
 
 /* Simple thread play function */
-int Play_MPEGvideo( void *udata )
+int SDLCALL Play_MPEGvideo( void *udata )
 {
     MPEGvideo *mpeg = (MPEGvideo *)udata;