MidiPlay: Fixed warnings and some Windows builds

4 files changed, 45 insertions, 43 deletions

diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp
index ce88c5f..30e21ba 100644
--- a/utils/midiplay/adlmidiplay.cpp
+++ b/utils/midiplay/adlmidiplay.cpp
@@ -103,7 +103,7 @@ void mch_delay(int32_t msec)
 #ifndef HARDWARE_OPL3
 
 #ifndef OUTPUT_WAVE_ONLY
-#include "audio.h"
+#   include "audio.h"
 #endif
 
 #include "wave_writer.h"
@@ -204,7 +204,7 @@ static void debugPrint(void * /*userdata*/, const char *fmt, ...)
     char buffer[4096];
     std::va_list args;
     va_start(args, fmt);
-    int rc = std::vsnprintf(buffer, sizeof(buffer), fmt, args);
+    int rc = vsnprintf(buffer, sizeof(buffer), fmt, args);
     va_end(args);
     if(rc > 0)
     {
@@ -312,8 +312,8 @@ int main(int argc, char **argv)
         return 0;
     }
 
-    long sampleRate = 44100;
-    #ifndef HARDWARE_OPL3
+    unsigned int sampleRate = 44100;
+#ifndef HARDWARE_OPL3
     //const unsigned MaxSamplesAtTime = 512; // 512=dbopl limitation
     // How long is SDL buffer, in seconds?
     // The smaller the value, the more often SDL_AudioCallBack()
@@ -324,17 +324,19 @@ int main(int argc, char **argv)
     const double OurHeadRoomLength = 0.1;
     // The lag between visual content and audio content equals
     // the sum of these two buffers.
-    #ifndef OUTPUT_WAVE_ONLY
+
+#   ifndef OUTPUT_WAVE_ONLY
     AudioOutputSpec spec;
     AudioOutputSpec obtained;
 
-    spec.freq     = (int)sampleRate;
+    spec.freq     = sampleRate;
     spec.format   = ADLMIDI_SampleType_S16;
     spec.is_msb   = 0;
     spec.channels = 2;
     spec.samples  = uint16_t((double)spec.freq * AudioBufferLength);
-    #endif //OUTPUT_WAVE_ONLY
-    #endif //HARDWARE_OPL3
+#   endif //OUTPUT_WAVE_ONLY
+
+#endif //HARDWARE_OPL3
 
     ADL_MIDIPlayer *myDevice;
 
@@ -659,11 +661,11 @@ int main(int argc, char **argv)
 
     std::fprintf(stdout, " - Number of chips %d\n", adl_getNumChipsObtained(myDevice));
     std::fprintf(stdout, " - Number of four-ops %d\n", adl_getNumFourOpsChnObtained(myDevice));
-    std::fprintf(stdout, " - Track count: %lu\n", (unsigned long)adl_trackCount(myDevice));
+    std::fprintf(stdout, " - Track count: %lu\n", static_cast<unsigned long>(adl_trackCount(myDevice)));
 
-    if(soloTrack != ~(size_t)0)
+    if(soloTrack != ~static_cast<size_t>(0))
     {
-        std::fprintf(stdout, " - Solo track: %lu\n", (unsigned long)soloTrack);
+        std::fprintf(stdout, " - Solo track: %lu\n", static_cast<unsigned long>(soloTrack));
         adl_setTrackOptions(myDevice, soloTrack, ADLMIDI_TrackOption_Solo);
     }
 
@@ -677,7 +679,7 @@ int main(int argc, char **argv)
         {
             size_t track = onlyTracks[i];
             adl_setTrackOptions(myDevice, track, ADLMIDI_TrackOption_On);
-            std::fprintf(stdout, " %lu", (unsigned long)track);
+            std::fprintf(stdout, " %lu", static_cast<unsigned long>(track));
         }
         std::fprintf(stdout, "\n");
     }
@@ -865,17 +867,17 @@ int main(int argc, char **argv)
         std::fprintf(stdout, "\n==========================================\n");
         flushout(stdout);
 
-        if(wave_open(sampleRate, wave_out.c_str()) == 0)
+        if(wave_open(static_cast<long>(sampleRate), wave_out.c_str()) == 0)
         {
             wave_enable_stereo();
             short buff[4096];
             int complete_prev = -1;
             while(!stop)
             {
-                size_t got = (size_t)adl_play(myDevice, 4096, buff);
+                size_t got = static_cast<size_t>(adl_play(myDevice, 4096, buff));
                 if(got <= 0)
                     break;
-                wave_write(buff, (long)got);
+                wave_write(buff, static_cast<long>(got));
 
                 int complete = static_cast<int>(std::floor(100.0 * adl_positionTell(myDevice) / total));
                 flushout(stdout);
diff --git a/utils/midiplay/audio.h b/utils/midiplay/audio.h
index ee770ed..9e6c2b2 100644
--- a/utils/midiplay/audio.h
+++ b/utils/midiplay/audio.h
@@ -40,24 +40,24 @@ struct AudioOutputSpec
 
 extern int audio_init(struct AudioOutputSpec *in_spec, struct AudioOutputSpec *out_obtained, AudioOutputCallback callback);
 
-extern void audio_close();
+extern void audio_close(void);
 
-extern const char* audio_get_error();
+extern const char* audio_get_error(void);
 
-extern void audio_start();
+extern void audio_start(void);
 
-extern void audio_stop();
+extern void audio_stop(void);
 
-extern void audio_lock();
+extern void audio_lock(void);
 
-extern void audio_unlock();
+extern void audio_unlock(void);
 
 extern void audio_delay(unsigned int ms);
 
-extern void* audio_mutex_create();
-extern void  audio_mutex_destroy(void*m);
-extern void  audio_mutex_lock(void*m);
-extern void  audio_mutex_unlock(void*m);
+extern void* audio_mutex_create(void);
+extern void  audio_mutex_destroy(void *m);
+extern void  audio_mutex_lock(void *m);
+extern void  audio_mutex_unlock(void *m);
 
 #ifdef __cplusplus
 }
diff --git a/utils/midiplay/audio_sdl.c b/utils/midiplay/audio_sdl.c
index 456b32b..02a9ee6 100644
--- a/utils/midiplay/audio_sdl.c
+++ b/utils/midiplay/audio_sdl.c
@@ -90,32 +90,32 @@ int audio_init(struct AudioOutputSpec *in_spec, struct AudioOutputSpec *out_obta
     return ret;
 }
 
-void audio_close()
+void audio_close(void)
 {
     SDL_CloseAudio();
 }
 
-const char* audio_get_error()
+const char* audio_get_error(void)
 {
     return SDL_GetError();
 }
 
-void audio_start()
+void audio_start(void)
 {
     SDL_PauseAudio(0);
 }
 
-void audio_stop()
+void audio_stop(void)
 {
     SDL_PauseAudio(1);
 }
 
-void audio_lock()
+void audio_lock(void)
 {
     SDL_LockAudio();
 }
 
-void audio_unlock()
+void audio_unlock(void)
 {
     SDL_UnlockAudio();
 }
@@ -125,24 +125,24 @@ void audio_delay(unsigned int ms)
     SDL_Delay(ms);
 }
 
-void* audio_mutex_create()
+void* audio_mutex_create(void)
 {
     return SDL_CreateMutex();
 }
 
-void  audio_mutex_destroy(void*m)
+void  audio_mutex_destroy(void *m)
 {
     SDL_mutex *mut = (SDL_mutex *)m;
     SDL_DestroyMutex(mut);
 }
 
-void  audio_mutex_lock(void*m)
+void  audio_mutex_lock(void *m)
 {
     SDL_mutex *mut = (SDL_mutex *)m;
     SDL_mutexP(mut);
 }
 
-void  audio_mutex_unlock(void*m)
+void  audio_mutex_unlock(void *m)
 {
     SDL_mutex *mut = (SDL_mutex *)m;
     SDL_mutexV(mut);
diff --git a/utils/midiplay/audio_winmm.c b/utils/midiplay/audio_winmm.c
index 52142bb..e0aca93 100644
--- a/utils/midiplay/audio_winmm.c
+++ b/utils/midiplay/audio_winmm.c
@@ -46,7 +46,7 @@ static HANDLE       g_thread;
 
 static AudioOutputCallback g_audioCallback = NULL;
 
-DWORD WINAPI s_audioThread(PVOID pDataInput)
+static DWORD WINAPI s_audioThread(PVOID pDataInput)
 {
     DWORD ret = 0;
     UINT i;
@@ -150,7 +150,7 @@ int audio_init(struct AudioOutputSpec *in_spec, struct AudioOutputSpec *out_obta
     return 0;
 }
 
-void audio_close()
+void audio_close(void)
 {
     audio_stop();
     audio_mutex_lock(g_audioLock);
@@ -163,12 +163,12 @@ void audio_close()
     audio_mutex_destroy(g_audioLock);
 }
 
-const char *audio_get_error()
+const char *audio_get_error(void)
 {
     return g_lastErrorMessage;
 }
 
-void audio_start()
+void audio_start(void)
 {
     DWORD dwThreadId;
     size_t i = 0;
@@ -200,7 +200,7 @@ void audio_start()
     g_thread = CreateThread(NULL, 0, s_audioThread, 0, 0, &dwThreadId);
 }
 
-void audio_stop()
+void audio_stop(void)
 {
     audio_lock();
     g_started = 0;
@@ -214,12 +214,12 @@ void audio_stop()
     audio_unlock();
 }
 
-void audio_lock()
+void audio_lock(void)
 {
     audio_mutex_lock(g_audioLock);
 }
 
-void audio_unlock()
+void audio_unlock(void)
 {
     audio_mutex_unlock(g_audioLock);
 }
@@ -229,7 +229,7 @@ void audio_delay(unsigned int ms)
     Sleep(ms);
 }
 
-void* audio_mutex_create()
+void* audio_mutex_create(void)
 {
     CRITICAL_SECTION *mutex = (CRITICAL_SECTION *)malloc(sizeof(CRITICAL_SECTION));
     InitializeCriticalSection(mutex);