diff --git a/src/qt_gui/background_music_player.cpp b/src/qt_gui/background_music_player.cpp index 4f2c5c69a..4ba3e4c89 100644 --- a/src/qt_gui/background_music_player.cpp +++ b/src/qt_gui/background_music_player.cpp @@ -9,17 +9,12 @@ BackgroundMusicPlayer::BackgroundMusicPlayer(QObject* parent) : QObject(parent) m_mediaPlayer->setAudioOutput(m_audioOutput); } -BackgroundMusicPlayer::~BackgroundMusicPlayer() { - delete m_mediaPlayer; - delete m_audioOutput; -} - void BackgroundMusicPlayer::playMusic(const QString& snd0path) { if (snd0path.isEmpty()) { stopMusic(); return; } - QUrl newMusic = QUrl::fromLocalFile(snd0path); + const auto newMusic = QUrl::fromLocalFile(snd0path); if (m_mediaPlayer->playbackState() == QMediaPlayer::PlayingState && m_currentMusic == newMusic) { // already playing the correct music diff --git a/src/qt_gui/background_music_player.h b/src/qt_gui/background_music_player.h index 0c1fd3cf2..52f44f431 100644 --- a/src/qt_gui/background_music_player.h +++ b/src/qt_gui/background_music_player.h @@ -21,7 +21,6 @@ public: private: BackgroundMusicPlayer(QObject* parent = nullptr); - ~BackgroundMusicPlayer(); QMediaPlayer* m_mediaPlayer; QAudioOutput* m_audioOutput; diff --git a/src/qt_gui/game_grid_frame.cpp b/src/qt_gui/game_grid_frame.cpp index eb64f9a35..96ec0e937 100644 --- a/src/qt_gui/game_grid_frame.cpp +++ b/src/qt_gui/game_grid_frame.cpp @@ -44,7 +44,7 @@ void GameGridFrame::PlayBackgroundMusic(QTableWidgetItem* item) { BackgroundMusicPlayer::getInstance().stopMusic(); 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); } diff --git a/src/qt_gui/game_list_frame.cpp b/src/qt_gui/game_list_frame.cpp index a15fed3e8..bb3fd2e6a 100644 --- a/src/qt_gui/game_list_frame.cpp +++ b/src/qt_gui/game_list_frame.cpp @@ -73,7 +73,7 @@ void GameListFrame::PlayBackgroundMusic(QTableWidgetItem* item) { BackgroundMusicPlayer::getInstance().stopMusic(); 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); } diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index 2234a4f48..6a1e0b429 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -513,12 +513,11 @@ void MainWindow::PlayBackgroundMusic() { BackgroundMusicPlayer::getInstance().stopMusic(); return; } - QString snd0path = ""; int itemID = isTableList ? m_game_list_frame->currentItem()->row() : m_game_grid_frame->crtRow * m_game_grid_frame->columnCnt + 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); }