mirrors/shadPS4
0
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-02 22:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

address comments

Browse source
This commit is contained in:
tGecko 2024-09-23 19:02:27 +02:00
commit e2a5a0a71e
5 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/qt_gui/background_music_player.cpp
View file

@ -9,17 +9,12 @@ BackgroundMusicPlayer::BackgroundMusicPlayer(QObject* parent) : QObject(parent)
m_mediaPlayer->setAudioOutput(m_audioOutput); m_mediaPlayer->setAudioOutput(m_audioOutput);
} }
BackgroundMusicPlayer::~BackgroundMusicPlayer() {
delete m_mediaPlayer;
delete m_audioOutput;
}
void BackgroundMusicPlayer::playMusic(const QString& snd0path) { void BackgroundMusicPlayer::playMusic(const QString& snd0path) {
if (snd0path.isEmpty()) { if (snd0path.isEmpty()) {
stopMusic(); stopMusic();
return; return;
} }
QUrl newMusic = QUrl::fromLocalFile(snd0path); const auto 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

1
src/qt_gui/background_music_player.h
View file

@ -21,7 +21,6 @@ public:
private: private:
BackgroundMusicPlayer(QObject* parent = nullptr); BackgroundMusicPlayer(QObject* parent = nullptr);
~BackgroundMusicPlayer();
QMediaPlayer* m_mediaPlayer; QMediaPlayer* m_mediaPlayer;
QAudioOutput* m_audioOutput; QAudioOutput* m_audioOutput;

2
src/qt_gui/game_grid_frame.cpp
View file

@ -44,7 +44,7 @@ void GameGridFrame::PlayBackgroundMusic(QTableWidgetItem* item) {
BackgroundMusicPlayer::getInstance().stopMusic(); BackgroundMusicPlayer::getInstance().stopMusic();
return; return;
} }
QString snd0path = QString::fromStdString(m_game_info->m_games[item->row()].snd0_path); const auto snd0path = QString::fromStdString(m_game_info->m_games[item->row()].snd0_path);
BackgroundMusicPlayer::getInstance().playMusic(snd0path); BackgroundMusicPlayer::getInstance().playMusic(snd0path);
} }

2
src/qt_gui/game_list_frame.cpp
View file

@ -73,7 +73,7 @@ void GameListFrame::PlayBackgroundMusic(QTableWidgetItem* item) {
BackgroundMusicPlayer::getInstance().stopMusic(); BackgroundMusicPlayer::getInstance().stopMusic();
return; return;
} }
QString snd0path = QString::fromStdString(m_game_info->m_games[item->row()].snd0_path); const auto snd0path = QString::fromStdString(m_game_info->m_games[item->row()].snd0_path);
BackgroundMusicPlayer::getInstance().playMusic(snd0path); BackgroundMusicPlayer::getInstance().playMusic(snd0path);
} }

3
src/qt_gui/main_window.cpp
View file

@ -513,12 +513,11 @@ void MainWindow::PlayBackgroundMusic() {
BackgroundMusicPlayer::getInstance().stopMusic(); BackgroundMusicPlayer::getInstance().stopMusic();
return; return;
} }
QString snd0path = "";
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); const auto snd0path = QString::fromStdString(m_game_info->m_games[itemID].snd0_path);
BackgroundMusicPlayer::getInstance().playMusic(snd0path); BackgroundMusicPlayer::getInstance().playMusic(snd0path);
} }