OSDN Git Service

[OSD][Qt] Move get_vm_device_name() to correct source code file.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 29 Sep 2022 13:54:11 +0000 (22:54 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 29 Sep 2022 13:54:11 +0000 (22:54 +0900)
source/src/qt/osd_base.cpp
source/src/qt/osd_sound.cpp

index 5a2d823..77bf797 100644 (file)
@@ -35,6 +35,7 @@
 
 #include <ctime>
 #include <limits>
+#include <memory>
 
 #include "../config.h"
 #include "../fileio.h"
@@ -46,6 +47,8 @@
 //#include "csp_logger.h"
 #include "osd_base.h"
 #include "gui/dock_disks.h"
+#include "gui/menu_flags.h"
+
 #include "../vm/vm_template.h"
 
 #include "./osd_sound_mod_qtmultimedia.h"
@@ -135,6 +138,16 @@ EmuThreadClass *OSD_BASE::get_parent_handler()
        return parent_thread;
 }
 
+const _TCHAR *OSD_BASE::get_vm_device_name()
+{
+       if(using_flags != NULL) {
+               QString s = using_flags->get_device_name();
+               static QByteArray __n = s.toUtf8();
+               return (const _TCHAR*)(__n.constData());
+       }
+       return (const _TCHAR*)"";
+}
+
 void OSD_BASE::set_parent_thread(EmuThreadClass *parent)
 {
        parent_thread = parent;
index 453d70d..8b88cac 100644 (file)
@@ -190,15 +190,6 @@ void OSD_BASE::audio_callback(void *udata, Uint8 *stream, int len)
        } while(len > 0);
 }
 
-const _TCHAR *OSD_BASE::get_vm_device_name()
-{
-       if(using_flags != NULL) {
-               QString s = using_flags->get_device_name();
-               static QByteArray __n = s.toUtf8();
-               return (const _TCHAR*)(__n.constData());
-       }
-       return (const _TCHAR*)"";
-}
 
 
 int OSD_BASE::get_sound_device_num()