Move sound related functions to sound.cpp

theblacklotus · Feb 10, 2024 · a5f7d6d · a5f7d6d
1 parent dcf5d1b
commit a5f7d6d
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 74 deletions.
diff --git a/src/dummy.cpp b/src/dummy.cpp
@@ -20,15 +20,12 @@
 #include "uae/time.h"
 #include "fsdb.h"
 #include "uae.h"
-#include "gensound.h"
 #include "ncr_scsi.h"
 #include "ncr9x_scsi.h"
 #include "gfxboard.h"
-#include "audio.h"
 #include "avioutput.h"
 #include "xwin.h"
 #include "clipboard.h"
-#include "sounddep/sound.h"
 #include "keybuf.h"
 #include "savestate.h"
 #include "cdtv.h"
@@ -454,10 +451,6 @@ void activate_console() {
     UNIMPLEMENTED();
 }
 
-void ahi_close_sound() {
-    TRACE();
-}
-
 void alf3_add_scsi_unit(int, uaedev_config_info*, romconfig*) {
     UNIMPLEMENTED();
 }
@@ -493,11 +486,6 @@ bool ariadne2_init(autoconfig_info*) {
     return false;
 }
 
-bool audio_is_pull_event() {
-    // TRACE();
-    return false;
-}
-
 void AVIOutput_Restart(bool) {
     UNIMPLEMENTED();
 }
@@ -813,10 +801,6 @@ void filesys_addexternals() {
 }
 #endif
 
-void finish_sound_buffer() {
-    UNIMPLEMENTED();
-}
-
 void flush_log() {
     UNIMPLEMENTED();
 }
@@ -1097,11 +1081,6 @@ void initparallel() {
     // UNIMPLEMENTED();
 }
 
-int init_sound() {
-    TRACE();
-    return 0;
-}
-
 bool isguiactive() {
     return false;
 }
@@ -1331,10 +1310,6 @@ int parallel_direct_write_status(unsigned char, unsigned char) {
     return 0;
 }
 
-void pause_sound_buffer() {
-    UNIMPLEMENTED();
-}
-
 void pci_read_dma(pci_board_state*, unsigned int, unsigned char*, int) {
     UNIMPLEMENTED();
 }
@@ -1355,14 +1330,6 @@ void release_keys() {
     UNIMPLEMENTED();
 }
 
-void reset_sound() {
-    TRACE();
-}
-
-void restart_sound_buffer() {
-    TRACE();
-}
-
 void restore_cdtv_final() {
     UNIMPLEMENTED();
 }
@@ -1445,12 +1412,6 @@ void setup_brkhandler() {
     TRACE();
 }
 
-int setup_sound() {
-    TRACE();
-    // UNIMPLEMENTED();
-    return 0;
-}
-
 bool show_screen_maybe(int, bool) {
     UNIMPLEMENTED();
     return false;
@@ -1482,10 +1443,6 @@ int sndboard_release_buffer(unsigned char*, int) {
     return 0;
 }
 
-void sound_mute(int) {
-    UNIMPLEMENTED();
-}
-
 bool specialmonitor_autoconfig_init(autoconfig_info*) {
     UNIMPLEMENTED();
     return false;
@@ -1712,10 +1669,6 @@ void updatedisplayarea(int) {
     TRACE();
 }
 
-void update_sound(float) {
-    UNIMPLEMENTED();
-}
-
 bool vsync_switchmode(int, int) {
     UNIMPLEMENTED();
     return false;
@@ -1749,10 +1702,6 @@ int x86_rt1000_init(autoconfig_info*) {
     return 0;
 }
 
-void x86_update_sound(float) {
-    UNIMPLEMENTED();
-}
-
 void x86_xt_ide_bios(zfile*, romconfig*) {
     UNIMPLEMENTED();
 }
@@ -1766,11 +1715,6 @@ void zeus040_add_scsi_unit(int, uaedev_config_info*, romconfig*) {
     UNIMPLEMENTED();
 }
 
-int audio_pull_buffer() {
-    UNIMPLEMENTED();
-    return 0;
-}
-
 void bsdlib_reset() {
     UNIMPLEMENTED();
 }
@@ -1780,10 +1724,6 @@ int build_comp() {
     return 0;
 }
 
-void close_sound() {
-    UNIMPLEMENTED();
-}
-
 TCHAR console_getch() {
     UNIMPLEMENTED();
     return 0;
@@ -1928,10 +1868,6 @@ int my_rmdir(char const*) {
     return 0;
 }
 
-void pause_sound() {
-    UNIMPLEMENTED();
-}
-
 uae_u8* restore_cdtv_dmac(unsigned char*) {
     UNIMPLEMENTED();
     return nullptr;
@@ -1942,11 +1878,6 @@ uae_u8* restore_cdtv(unsigned char*) {
     return nullptr;
 }
 
-void resume_sound() {
-    TRACE();
-    // UNIMPLEMENTED();
-}
-
 uae_u8* save_cdtv_dmac(size_t*, uae_u8*) {
     UNIMPLEMENTED();
     return nullptr;
@@ -2051,11 +1982,6 @@ int uaeser_write(void*, unsigned char*, unsigned int) {
     return 0;
 }
 
-int audio_is_pull() {
-    // TRACE();
-    return 0;
-}
-
 bool cdtv_front_panel(int) {
     UNIMPLEMENTED();
     return false;

diff --git a/src/sounddep/sound.cpp b/src/sounddep/sound.cpp
@@ -28,3 +28,78 @@ void set_volume(int, int) {
 void master_sound_volume(int) {
     UNIMPLEMENTED();
 }
+
+void ahi_close_sound() {
+    TRACE();
+}
+
+void finish_sound_buffer() {
+    UNIMPLEMENTED();
+}
+
+int init_sound() {
+    TRACE();
+    return 0;
+}
+
+void pause_sound_buffer() {
+    UNIMPLEMENTED();
+}
+
+void reset_sound() {
+    TRACE();
+}
+
+void restart_sound_buffer() {
+    TRACE();
+}
+
+int setup_sound() {
+    TRACE();
+    // UNIMPLEMENTED();
+    return 0;
+}
+
+void sound_mute(int) {
+    UNIMPLEMENTED();
+}
+
+void update_sound(float) {
+    UNIMPLEMENTED();
+}
+
+void x86_update_sound(float) {
+    UNIMPLEMENTED();
+}
+
+void close_sound() {
+    UNIMPLEMENTED();
+}
+
+void pause_sound() {
+    UNIMPLEMENTED();
+}
+
+void resume_sound() {
+    TRACE();
+    // UNIMPLEMENTED();
+}
+
+bool audio_is_pull_event() {
+    // TRACE();
+    return false;
+}
+
+int audio_pull_buffer() {
+    UNIMPLEMENTED();
+    return 0;
+}
+
+int audio_is_pull() {
+    // TRACE();
+    return 0;
+}
+
+
+
+