Skip to content
This repository was archived by the owner on May 11, 2022. It is now read-only.

Commit df1dddb

Browse files
committed
Fixed the bug which caused a non-fatal error when removing tracks while current track is paused.
1 parent 673dd5f commit df1dddb

File tree

6 files changed

+5
-4739
lines changed

6 files changed

+5
-4739
lines changed

ext/FMOD/inc/fmod.cs

Lines changed: 0 additions & 3782 deletions
This file was deleted.

ext/FMOD/inc/fmod_dsp.cs

Lines changed: 0 additions & 846 deletions
This file was deleted.

ext/FMOD/inc/fmod_errors.cs

Lines changed: 0 additions & 106 deletions
This file was deleted.

ide/BloodyPlayer.pro.user

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 4.9.2, 2019-08-08T10:38:53. -->
3+
<!-- Written by QtCreator 4.9.2, 2019-08-10T11:26:54. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -67,7 +67,7 @@
6767
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.13.0 MSVC2017 64bit</value>
6868
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.13.0 MSVC2017 64bit</value>
6969
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5130.win64_msvc2017_64_kit</value>
70-
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
70+
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
7171
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
7272
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
7373
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -317,7 +317,7 @@
317317
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
318318
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
319319
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
320-
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Home/Programming and computers/C/c++/Qt_projects/BloodyPlayer_debug</value>
320+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Home/Programming and computers/C/c++/Qt_projects/BloodyPlayer_release</value>
321321
</valuemap>
322322
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
323323
</valuemap>

src/Model/AudioService/audioservice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ void AudioService::removeTrack(size_t iTrackIndex)
565565
iCurrentlyPlayingTrackIndex = 0;
566566
std::this_thread::sleep_for(std::chrono::milliseconds(MONITOR_TRACK_INTERVAL_MS));
567567
}
568-
else if (bIsSomeTrackPlaying)
568+
else if (bIsSomeTrackPlaying || bCurrentTrackPaused)
569569
{
570570
if (iTrackIndex == iCurrentlyPlayingTrackIndex)
571571
{

src/View/MainWindow/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void MainWindow::on_actionOpen_triggered()
258258

259259
void MainWindow::on_actionAbout_triggered()
260260
{
261-
QMessageBox::information(nullptr, "Bloody Player", "Bloody Player v1.11");
261+
QMessageBox::information(nullptr, "Bloody Player", "Bloody Player v1.11.1");
262262
}
263263

264264
void MainWindow::on_pushButton_Play_clicked()

0 commit comments

Comments
 (0)