mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 00:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang_format

Browse Source
This commit is contained in:
tGecko 2024-09-23 15:07:05 +02:00
parent 217d221a26
commit 39d806b50e
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt_gui/background_music_player.cpp
View File

@ -21,7 +21,7 @@ void BackgroundMusicPlayer::playMusic(const QString& snd0path) {
} }
QUrl newMusic = QUrl::fromLocalFile(snd0path); QUrl newMusic = QUrl::fromLocalFile(snd0path);
if (m_mediaPlayer->playbackState() == QMediaPlayer::PlayingState && if (m_mediaPlayer->playbackState() == QMediaPlayer::PlayingState &&
m_currentMusic == newMusic) { m_currentMusic == newMusic) {
// already playing the correct music // already playing the correct music
return; return;
} }

1
src/qt_gui/background_music_player.h
View File

@ -19,7 +19,6 @@ public:
void playMusic(const QString& snd0path); void playMusic(const QString& snd0path);
void stopMusic(); void stopMusic();
private: private:
BackgroundMusicPlayer(QObject* parent = nullptr); BackgroundMusicPlayer(QObject* parent = nullptr);
~BackgroundMusicPlayer(); ~BackgroundMusicPlayer();

4
src/qt_gui/main_window.cpp
View File

@ -508,7 +508,7 @@ void MainWindow::CreateConnects() {
&MainWindow::PlayBackgroundMusic); &MainWindow::PlayBackgroundMusic);
} }
void MainWindow::PlayBackgroundMusic () { void MainWindow::PlayBackgroundMusic() {
if (isGameRunning || !Config::getPlayBGM()) { if (isGameRunning || !Config::getPlayBGM()) {
BackgroundMusicPlayer::getInstance().stopMusic(); BackgroundMusicPlayer::getInstance().stopMusic();
return; return;
@ -517,7 +517,7 @@ void MainWindow::PlayBackgroundMusic () {
int itemID = isTableList ? m_game_list_frame->currentItem()->row() int itemID = isTableList ? m_game_list_frame->currentItem()->row()
: m_game_grid_frame->crtRow * m_game_grid_frame->columnCnt + : m_game_grid_frame->crtRow * m_game_grid_frame->columnCnt +
m_game_grid_frame->crtColumn; m_game_grid_frame->crtColumn;
snd0path = QString::fromStdString(m_game_info->m_games[itemID].snd0_path); snd0path = QString::fromStdString(m_game_info->m_games[itemID].snd0_path);
BackgroundMusicPlayer::getInstance().playMusic(snd0path); BackgroundMusicPlayer::getInstance().playMusic(snd0path);
} }

1
src/qt_gui/settings_dialog.cpp
View File

@ -136,7 +136,6 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
}); });
connect(ui->playBGMCheckBox, &QCheckBox::stateChanged, this, connect(ui->playBGMCheckBox, &QCheckBox::stateChanged, this,
[](int val) { Config::setPlayBGM(val); }); [](int val) { Config::setPlayBGM(val); });
} }
// GPU TAB // GPU TAB