Editor: Make gain change don't cause song restart

When changing the gaining factor in the music extra settings, the change of gaining factor now won't cause song restart since the necessary API is implemented on the MixerX side.

Editor/audio/music_player.cpp

@@ -190,6 +190,11 @@ void LvlMusPlay::setTempo(double tempo)
     PGE_MusPlayer::setTempo(tempo);
 }
 
+void LvlMusPlay::setGain(double gain)
+{
+    PGE_MusPlayer::setGain(gain);
+}
+
 // TODO: Refactor this
 void LvlMusPlay::updateMusic(MainWindow *mw)
 {

Editor/audio/music_player.h

@@ -49,6 +49,7 @@ class LvlMusPlay
     static void setMusic(MainWindow *mw, MusicType mt, unsigned long id, QString cmus);
     static void setNoMusic();
     static void setTempo(double tempo);
+    static void setGain(double gain);
     static void updateMusic(MainWindow *mw);
     static void updatePlayerState(MainWindow *mw, bool playing = true, bool force = false);
     static void stopMusic(MainWindow *mw);

Editor/audio/sdl_music_player.cpp

@@ -168,6 +168,12 @@ void PGE_MusPlayer::setTempo(double tempo)
         Mix_SetMusicTempo(play_mus, tempo);
 }
 
+void PGE_MusPlayer::setGain(double gain)
+{
+    if(play_mus)
+        Mix_SetMusicGain(play_mus, gain);
+}
+
 
 // //////////////////////// Sound Player //////////////////////////////////////
 

Editor/audio/sdl_music_player.h

@@ -49,6 +49,7 @@ class PGE_MusPlayer : public QObject
     static void play();
 
     static void setTempo(double tempo);
+    static void setGain(double gain);
 
 public slots:
     void setVolume(int volume);

Editor/common_features/json_settings_widget.cpp

@@ -814,6 +814,11 @@ QString JsonSettingsWidget::browseForFileValue(QWidget* target, LineEditType typ
             LvlMusPlay::setTempo(tempo);
         });
 
+        QObject::connect(&muz, &MusicFileList::musicGainChanged, [](double gain)->void
+        {
+            LvlMusPlay::setGain(gain);
+        });
+
         QObject::connect(&muz, &MusicFileList::playSoundFile, [this, &audioPath](const QString &file)->void
         {
             PGE_SfxPlayer::playFile(file);

Editor/editing/_dialogs/itemselectdialog.cpp

@@ -943,6 +943,12 @@ void ItemSelectDialog::on_Sel_DiaButtonBox_accepted()
             LvlMusPlay::setTempo(tempo);
         });
 
+        QObject::connect(&musicList, &MusicFileList::musicGainChanged, [](double gain)->void
+        {
+            LvlMusPlay::setGain(gain);
+        });
+
+
         QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &testMusicFile](bool st)->void
         {
             MainWinConnect::pMainWin->getPlayMusicAction()->setChecked(st);

Editor/main_window/dock/lvl_sctc_props.cpp

@@ -686,6 +686,12 @@ void LvlSectionProps::on_LVLPropsMusicCustomBrowse_clicked()
         LvlMusPlay::setTempo(tempo);
     });
 
+    QObject::connect(&musicList, &MusicFileList::musicGainChanged, [](double gain)->void
+    {
+        LvlMusPlay::setGain(gain);
+    });
+
+
     QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &musicPath](bool st)->void
     {
         mw()->getPlayMusicAction()->setChecked(st);
@@ -775,6 +781,11 @@ void LvlSectionProps::on_musicSetup_clicked()
         LvlMusPlay::setTempo(tempo);
     });
 
+    QObject::connect(&set, &CustomMusicSetup::updateSongGain, [](double gain)->void
+    {
+        LvlMusPlay::setGain(gain);
+    });
+
     QObject::connect(&set, &CustomMusicSetup::musicButtonClicked, [this, &musicPath](bool st)->void
     {
         mw()->getPlayMusicAction()->setChecked(st);

Editor/main_window/dock/wld_item_toolbox.cpp

@@ -393,6 +393,11 @@ void WorldItemBox::MusicList_itemClicked(const QModelIndex &item)
                 LvlMusPlay::setTempo(tempo);
             });
 
+            QObject::connect(&musicList, &MusicFileList::musicGainChanged, [](double gain)->void
+            {
+                LvlMusPlay::setGain(gain);
+            });
+
             QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &customMusicFile](bool st)->void
             {
                 mw()->getPlayMusicAction()->setChecked(st);

Editor/main_window/dock/wld_musicbox_itemset.cpp

@@ -169,6 +169,11 @@ void WorldMusicBoxItemBox::MusicList_itemClicked(const QModelIndex &item)
                 LvlMusPlay::setTempo(tempo);
             });
 
+            QObject::connect(&musicList, &MusicFileList::musicGainChanged, [](double gain)->void
+            {
+                LvlMusPlay::setGain(gain);
+            });
+
             QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &customMusicFile](bool st)->void
             {
                 mw()->getPlayMusicAction()->setChecked(st);

_common/qt-modules/custom_music_setup/custom_music_setup.cpp

@@ -1052,10 +1052,10 @@ void CustomMusicSetup::on_midiSynth_currentIndexChanged(int)
 void CustomMusicSetup::on_midiGain_valueChanged(int)
 {}
 
-void CustomMusicSetup::on_midiGainAbs_valueChanged(double)
+void CustomMusicSetup::on_midiGainAbs_valueChanged(double arg1)
 {
     buildSettings();
-    emit updateSongPlay();
+    emit updateSongGain(arg1);
 }
 
 void CustomMusicSetup::on_midiGainReset_clicked()
@@ -1076,7 +1076,7 @@ void CustomMusicSetup::on_midiGainReset_clicked()
     if(!signalsBlocked())
         buildSettings();
 
-    emit updateSongPlay();
+    emit updateSongGain(ui->midiGainAbs->value());
 }
 
 void CustomMusicSetup::on_midiTempo_valueChanged(int)
@@ -1239,10 +1239,10 @@ void CustomMusicSetup::on_gmeGoToFirst_clicked()
 void CustomMusicSetup::on_gmeGain_valueChanged(int)
 {}
 
-void CustomMusicSetup::on_gmeGainAbs_valueChanged(double)
+void CustomMusicSetup::on_gmeGainAbs_valueChanged(double arg1)
 {
     buildSettings();
-    emit updateSongPlay();
+    emit updateSongGain(arg1);
 }
 
 void CustomMusicSetup::on_gmeGainReset_clicked()
@@ -1251,7 +1251,7 @@ void CustomMusicSetup::on_gmeGainReset_clicked()
     ui->gmeGainAbs->setValue(1.0);
     if(!signalsBlocked())
         buildSettings();
-    emit updateSongPlay();
+    emit updateSongGain(ui->gmeGainAbs->value());
 }
 
 void CustomMusicSetup::on_gmeTempo_valueChanged(int)
@@ -1281,10 +1281,10 @@ void CustomMusicSetup::on_gmeDisableSpcEcho_clicked(bool)
 void CustomMusicSetup::on_pxtoneGain_valueChanged(int)
 {}
 
-void CustomMusicSetup::on_pxtoneGainAbs_valueChanged(double)
+void CustomMusicSetup::on_pxtoneGainAbs_valueChanged(double arg1)
 {
     buildSettings();
-    emit updateSongPlay();
+    emit updateSongGain(arg1);
 }
 
 void CustomMusicSetup::on_pxtoneGainReset_clicked()
@@ -1293,7 +1293,7 @@ void CustomMusicSetup::on_pxtoneGainReset_clicked()
     ui->pxtoneGainAbs->setValue(1.0);
     if(!signalsBlocked())
         buildSettings();
-    emit updateSongPlay();
+    emit updateSongGain(ui->pxtoneGainAbs->value());
 }
 
 void CustomMusicSetup::on_pxtoneTempo_valueChanged(int)

_common/qt-modules/custom_music_setup/custom_music_setup.h

@@ -99,6 +99,7 @@ class CustomMusicSetup : public QDialog
     void musicSetupChanged(const QString &music);
     void updateSongPlay();
     void updateSongTempo(double tempo);
+    void updateSongGain(double tempo);
     void musicButtonClicked(bool checked);
 
 protected:

_common/qt-modules/file_list_browser/musicfilelist.cpp

@@ -176,6 +176,11 @@ MusicFileList::MusicFileList(QString searchDirectory, QString curFile, QWidget *
                 emit musicTempoChanged(tempo);
             });
 
+            QObject::connect(&set, &CustomMusicSetup::updateSongGain, this, [this](double gain)->void
+            {
+                emit musicGainChanged(gain);
+            });
+
             QObject::connect(&set, &CustomMusicSetup::musicButtonClicked, this, [this, &musicPath](bool st)->void
             {
                 m_previewButton->setChecked(st);

_common/qt-modules/file_list_browser/musicfilelist.h

@@ -42,6 +42,7 @@ class MusicFileList : public FileListBrowser
     void updateSongPlay();
     void musicButtonClicked(bool checked);
     void musicTempoChanged(double tempo);
+    void musicGainChanged(double gain);
 
     void playSoundFile(const QString &sfx);