OSDN Git Service

[Qt][OSD][SOUND] Rename slot for changing backend state.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 19 Jul 2022 15:18:33 +0000 (00:18 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Tue, 19 Jul 2022 15:18:33 +0000 (00:18 +0900)
source/src/qt/osd_base.h
source/src/qt/osd_sound.cpp

index 9984c68..fc67c95 100644 (file)
@@ -735,7 +735,7 @@ public slots:
        virtual void do_set_host_sound_output_device(QString device_name);
        virtual void do_update_master_volume(int level);
 
-       void handleStateChanged(QAudio::State newState);
+       void handleAudioOutputStateChanged(QAudio::State newState);
 
 signals:
        int sig_update_screen(void *, bool);
index 4142d37..d0ac981 100644 (file)
@@ -529,7 +529,7 @@ void OSD_BASE::initialize_sound(int rate, int samples, int* presented_rate, int*
                                double _ll = (double)(p_config->general_sound_level + INT16_MAX) / 65535.0;
                                m_audioOutputSink->setVolume(_ll);
                        }
-                       connect(m_audioOutputSink, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State)));
+                       connect(m_audioOutputSink, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleAudioOutputStateChanged(QAudio::State)));
                        //m_audioOutputSink->setBufferSize(1024);
                        //m_audioOutputSink->setBufferSize(sound_samples * 2 * sizeof(int16_t) * 2);
                        m_audioOutput->reset();
@@ -1134,12 +1134,12 @@ void OSD_BASE::stop_sound()
                //sound_exit = false;
        }
 }
-void OSD_BASE::handleStateChanged(QAudio::State newState)
+void OSD_BASE::handleAudioOutputStateChanged(QAudio::State newState)
 {
 }
 #else
 
-void OSD_BASE::handleStateChanged(QAudio::State newState)
+void OSD_BASE::handleAudioOutputStateChanged(QAudio::State newState)
 {
        switch(newState) {
        case QAudio::ActiveState: