From c6eb9a8908bb4613e60cac6163f5776702e4162b Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
Date: Sun, 7 Jul 2024 04:28:57 +0300
Subject: [PATCH] MVE: rename lnx_sound to sdl_sound

Now this is cross-platform playback.
---
 libmve/CMakeLists.txt                     | 8 +-------
 libmve/{lnx_sound.cpp => movie_sound.cpp} | 2 +-
 libmve/{lnx_sound.h => movie_sound.h}     | 6 +++---
 libmve/mveplay.cpp                        | 7 +------
 4 files changed, 6 insertions(+), 17 deletions(-)
 rename libmve/{lnx_sound.cpp => movie_sound.cpp} (98%)
 rename libmve/{lnx_sound.h => movie_sound.h} (93%)

diff --git a/libmve/CMakeLists.txt b/libmve/CMakeLists.txt
index fb8bfec3..ed356f84 100644
--- a/libmve/CMakeLists.txt
+++ b/libmve/CMakeLists.txt
@@ -1,13 +1,7 @@
 set(CPPS
-#  mveasm.cpp
-#  mvelibl.cpp
-#  platform.cpp
-#  lnxdsound.cpp
-
-  # d2x implementation
   decoder8.cpp
   decoder16.cpp
-  lnx_sound.cpp
+  movie_sound.cpp
   mve_audio.cpp
   mvelib.cpp
   mveplay.cpp
diff --git a/libmve/lnx_sound.cpp b/libmve/movie_sound.cpp
similarity index 98%
rename from libmve/lnx_sound.cpp
rename to libmve/movie_sound.cpp
index 104e021b..acf02944 100644
--- a/libmve/lnx_sound.cpp
+++ b/libmve/movie_sound.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <functional>
-#include "lnx_sound.h"
+#include "movie_sound.h"
 
 namespace D3 {
 
diff --git a/libmve/lnx_sound.h b/libmve/movie_sound.h
similarity index 93%
rename from libmve/lnx_sound.h
rename to libmve/movie_sound.h
index d59aee33..35572c0b 100644
--- a/libmve/lnx_sound.h
+++ b/libmve/movie_sound.h
@@ -16,8 +16,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LIBMVE_LNX_SOUND_H_
-#define LIBMVE_LNX_SOUND_H_
+#ifndef LIBMVE_MOVIE_SOUND_H_
+#define LIBMVE_MOVIE_SOUND_H_
 
 #include <SDL_audio.h>
 
@@ -49,4 +49,4 @@ public:
 
 }
 
-#endif // LIBMVE_LNX_SOUND_H_
+#endif // LIBMVE_MOVIE_SOUND_H_
diff --git a/libmve/mveplay.cpp b/libmve/mveplay.cpp
index 23307068..4aefdaf4 100644
--- a/libmve/mveplay.cpp
+++ b/libmve/mveplay.cpp
@@ -30,7 +30,7 @@
 #include "mve_audio.h"
 
 #ifdef AUDIO
-#include "lnx_sound.h"
+#include "movie_sound.h"
 #endif
 
 #define MVE_OPCODE_ENDOFSTREAM 0x00           // mcmd_end
@@ -156,7 +156,6 @@ static void do_timer_wait() {
 
   ts = timer_expire - tv;
 
-  //mprintf(0,"SLEEP for %llu us, buffer size is %d\n", ts, snd_ds->GetBuffer()->size());
   timer_sleepmicroseconds(ts);
 
 end:
@@ -279,10 +278,6 @@ static int create_videobuf_handler(unsigned char major, unsigned char minor, uns
 
   memset(g_vBackBuf1, 0, g_width * g_height * 4);
 
-#ifdef DEBUG
-  fprintf(stderr, "DEBUG: w,h=%d,%d count=%d, tc=%d\n", w, h, count, truecolor);
-#endif
-
   g_truecolor = truecolor;
 
   return 1;