[OSD][SOUND][Qt] Move sound-drivers into separate directories.

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index fcc1269..3aaba24 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,15 +1,13 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 8.7.0)
+SET(THIS_LIB_VERSION 8.7.1)
 
 set(s_qt_osd_headers
        osd_base.h
        osd_socket.h
        
-    sound_buffer_qt.h
-       
-       osd_sound_mod_template.h
-       osd_sound_mod_qtmultimedia.h
-       
+       sound-drivers/sound_buffer_qt.h
+       sound-drivers/osd_sound_mod_template.h
+       sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.h
 )
 
 MAKE_WRAP_CPP(s_qt_osd_headers_MOC ${s_qt_osd_headers})
@@ -26,11 +24,10 @@ SET(s_qt_osd_srcs
        qudpsocket2.cpp
        qtcpsocket2.cpp
        
-       osd_sound_mod_template.cpp
-       
-       osd_sound_mod_qtmultimedia.cpp
-       
-       sound_buffer_qt.cpp
+       sound-drivers/common/sound_buffer_qt.cpp
+       sound-drivers/common/osd_sound_mod_template.cpp
+       sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.cpp
+
        
        ${s_qt_osd_headers_MOC}
 )

diff --git a/source/src/qt/osd_sound.cpp b/source/src/qt/osd_sound.cpp
index e3cee56..a7e939e 100644 (file)
--- a/source/src/qt/osd_sound.cpp
+++ b/source/src/qt/osd_sound.cpp
@@ -45,8 +45,8 @@
 
 #include <cstdint>
 
-#include "./sound_buffer_qt.h"
-#include "./osd_sound_mod_template.h"
+#include "./sound-drivers/sound_buffer_qt.h"
+#include "./sound-drivers/osd_sound_mod_template.h"
 
 #include "../gui/emu_thread_tmpl.h"
 
@@ -439,7 +439,7 @@ void OSD_BASE::release_sound()
 #endif
 
 /* Note: Below are new sound driver. */
-#include "./osd_sound_mod_qtmultimedia.h"
+#include "./sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.h"
 void OSD_BASE::update_sound(int* extra_frames)
 {
        *extra_frames = 0;

diff --git a/source/src/qt/osd_sound_mod_template.cpp b/source/src/qt/sound-drivers/common/osd_sound_mod_template.cpp
similarity index 98%
rename from source/src/qt/osd_sound_mod_template.cpp
rename to source/src/qt/sound-drivers/common/osd_sound_mod_template.cpp
index 070e31b..3c38dfe 100644 (file)
--- a/source/src/qt/osd_sound_mod_template.cpp
+++ b/source/src/qt/sound-drivers/common/osd_sound_mod_template.cpp
@@ -1,14 +1,15 @@
 #include <QMetaMethod>
 #include <QAction>
 
-#include "./gui/csp_logger.h"
-#include "./osd_base.h"
-#include "./sound_buffer_qt.h"
-#include "./osd_sound_mod_template.h"
-#include "./gui/menu_flags.h"
-
-#include "./osd_sound_mod_consts.h"
-#include "./osd_sound_mod_utils.h"
+#include "../../gui/csp_logger.h"
+#include "../../osd_base.h"
+#include "../../gui/menu_flags.h"
+
+#include "../sound_buffer_qt.h"
+#include "../osd_sound_mod_template.h"
+
+#include "../osd_sound_mod_consts.h"
+#include "../osd_sound_mod_utils.h"
 
 namespace SOUND_MODULE {
 /* SOUND_MODULE */

diff --git a/source/src/qt/sound_buffer_qt.cpp b/source/src/qt/sound-drivers/common/sound_buffer_qt.cpp
similarity index 99%
rename from source/src/qt/sound_buffer_qt.cpp
rename to source/src/qt/sound-drivers/common/sound_buffer_qt.cpp
index 615cd49..a9cce49 100644 (file)
--- a/source/src/qt/sound_buffer_qt.cpp
+++ b/source/src/qt/sound-drivers/common/sound_buffer_qt.cpp
@@ -1,5 +1,5 @@
 
-#include "./sound_buffer_qt.h"
+#include "../sound_buffer_qt.h"
 
 SOUND_BUFFER_QT::SOUND_BUFFER_QT(uint64_t depth, QObject *parent) : QIODevice(parent)
 {

diff --git a/source/src/qt/osd_sound_mod_consts.h b/source/src/qt/sound-drivers/osd_sound_mod_consts.h
similarity index 100%
rename from source/src/qt/osd_sound_mod_consts.h
rename to source/src/qt/sound-drivers/osd_sound_mod_consts.h

diff --git a/source/src/qt/osd_sound_mod_template.h b/source/src/qt/sound-drivers/osd_sound_mod_template.h
similarity index 99%
rename from source/src/qt/osd_sound_mod_template.h
rename to source/src/qt/sound-drivers/osd_sound_mod_template.h
index 0aa4620..4782452 100644 (file)
--- a/source/src/qt/osd_sound_mod_template.h
+++ b/source/src/qt/sound-drivers/osd_sound_mod_template.h
@@ -14,9 +14,9 @@
 #include <memory>
 #include <string>
 
-#include "../common.h"
-#include "./config.h"
-#include "./osd_types.h"
+#include "../../common.h"
+#include "../../config.h"
+#include "../osd_types.h"
 
 
 #if !defined(__debug_log_func)

diff --git a/source/src/qt/osd_sound_mod_utils.h b/source/src/qt/sound-drivers/osd_sound_mod_utils.h
similarity index 100%
rename from source/src/qt/osd_sound_mod_utils.h
rename to source/src/qt/sound-drivers/osd_sound_mod_utils.h

diff --git a/source/src/qt/osd_sound_mod_qtmultimedia.cpp b/source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.cpp
similarity index 99%
rename from source/src/qt/osd_sound_mod_qtmultimedia.cpp
rename to source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.cpp
index 6e0c38e..5b1f257 100644 (file)
--- a/source/src/qt/osd_sound_mod_qtmultimedia.cpp
+++ b/source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.cpp
@@ -1,7 +1,9 @@
-#include "./config.h"
-#include "./gui/menu_flags.h"
-#include "./osd_base.h"
-#include "./sound_buffer_qt.h"
+#include "../../../config.h"
+#include "../../gui/menu_flags.h"
+#include "../../osd_base.h"
+
+#include "../sound_buffer_qt.h"
+
 #include "./osd_sound_mod_qtmultimedia.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)

diff --git a/source/src/qt/osd_sound_mod_qtmultimedia.h b/source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.h
similarity index 98%
rename from source/src/qt/osd_sound_mod_qtmultimedia.h
rename to source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.h
index 2f58e67..8e38aea 100644 (file)
--- a/source/src/qt/osd_sound_mod_qtmultimedia.h
+++ b/source/src/qt/sound-drivers/qt_multimedia/osd_sound_mod_qtmultimedia.h
@@ -24,7 +24,7 @@
 #include <QAudioOutput>
 #endif 
 
-#include "./osd_sound_mod_template.h"
+#include "../osd_sound_mod_template.h"
 
 QT_BEGIN_NAMESPACE
 

diff --git a/source/src/qt/osd_sound_mod_sdl2.cpp b/source/src/qt/sound-drivers/sdl2/osd_sound_mod_sdl2.cpp
similarity index 100%
rename from source/src/qt/osd_sound_mod_sdl2.cpp
rename to source/src/qt/sound-drivers/sdl2/osd_sound_mod_sdl2.cpp

diff --git a/source/src/qt/sound_buffer_qt.h b/source/src/qt/sound-drivers/sound_buffer_qt.h
similarity index 97%
rename from source/src/qt/sound_buffer_qt.h
rename to source/src/qt/sound-drivers/sound_buffer_qt.h
index d696b0a..7d4e4b3 100644 (file)
--- a/source/src/qt/sound_buffer_qt.h
+++ b/source/src/qt/sound-drivers/sound_buffer_qt.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <QIODevice>
-#include "../fifo_templates.h"
+#include "../../fifo_templates.h"
 
 QT_BEGIN_NAMESPACE