Fixed 'speed (by pitch)' error which would set this effect's value to default when switching to other track.

Author: Flone-dnb

ide/BloodyPlayer.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.9.2, 2019-08-18T14:40:32. -->
+<!-- Written by QtCreator 4.9.2, 2019-08-19T15:14:23. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -317,7 +317,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Home/Programming and computers/C/c++/Qt_projects/BloodyPlayer_release</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Home/Programming and computers/C/c++/Qt_projects/BloodyPlayer_debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

src/Model/AudioService/audioservice.cpp

@@ -21,7 +21,7 @@ AudioService::AudioService(MainWindow* pMainWindow)
 {
     this->pMainWindow   = pMainWindow;
     pSystem              = nullptr;
-    pRndGen              = new std::mt19937_64(time(nullptr));
+    pRndGen              = new std::mt19937_64( static_cast<unsigned long long>(time(nullptr)) );
     iCurrentlyDrawingTrackIndex = new size_t(0);
 
     bMonitorTracks      = false;
@@ -273,7 +273,7 @@ void AudioService::addTracks(std::vector<wchar_t*> paths)
     }
 
 
-    pMainWindow->showWaitWindow("Please wait.\nAdding tracks.");
+    pMainWindow->showWaitWindow("Please wait.\nAdding your music.");
 
     // Get amount of CPU threads
     // In every CPU thread we will add tracks
@@ -319,6 +319,8 @@ void AudioService::addTracks(std::vector<wchar_t*> paths)
     }
     else
     {
+        // Just add them in one thread
+
         for (size_t i = 0; i < paths.size(); i++)
         {
             addTrack(paths[i]);
@@ -327,18 +329,21 @@ void AudioService::addTracks(std::vector<wchar_t*> paths)
         delete allCount;
         pMainWindow->hideWaitWindow();
 
+        // Wait a little for all track widgets to show
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
         if (tracks.size() > 0) pMainWindow->setFocusOnTrack(tracks.size() - 1);
 
         mtxTracksVec.unlock();
         return;
     }
 
+    // Check loop if all threads are done
     bool bDone;
     do
     {
         bDone = true;
 
+        // Wait a little for all track widgets to show
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
         for (size_t i = 0; i < threadsDoneFlags.size(); i++)
@@ -362,6 +367,7 @@ void AudioService::addTracks(std::vector<wchar_t*> paths)
 
     pMainWindow->hideWaitWindow();
 
+    // Wait a little for all track widgets to show
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
     if (tracks.size() > 0) pMainWindow->setFocusOnTrack(tracks.size() - 1);
 
@@ -393,7 +399,7 @@ void AudioService::playTrack(size_t iTrackIndex, bool bDontLockMutex)
         }
 
 
-        // Play track
+        // Stop currently playing track
         if (bIsSomeTrackPlaying)
         {
             if (iTrackIndex != iCurrentlyPlayingTrackIndex)
@@ -408,6 +414,7 @@ void AudioService::playTrack(size_t iTrackIndex, bool bDontLockMutex)
             pMainWindow->removePlayingOnTrack(iCurrentlyPlayingTrackIndex);
         }
 
+        // Play track
         if ( tracks[iTrackIndex]->playTrack(fCurrentVolume) )
         {
             bIsSomeTrackPlaying = true;

src/Model/Track/track.cpp

@@ -251,22 +251,14 @@ bool Track::playTrack(float fVolume)
             return false;
         }
 
-        if (fSpeedByFreq == 1.0f)
+        if ( (fSpeedByFreq == 1.0f) && (fSpeedByTime == 1.0f) )
         {
             pChannel->setFrequency( fDefaultFrequency );
         }
         else
         {
-            pChannel->setFrequency( fDefaultFrequency * fSpeedByFreq );
-        }
-
-        if (fSpeedByTime == 1.0f)
-        {
-            pChannel->setFrequency( fDefaultFrequency );
-        }
-        else
-        {
-            pChannel->setFrequency( fDefaultFrequency * fSpeedByTime );
+            if (fSpeedByFreq != 1.0f) pChannel->setFrequency( fDefaultFrequency * fSpeedByFreq );
+            else                      pChannel->setFrequency( fDefaultFrequency * fSpeedByTime );
         }
 
         result = pChannel->setPaused(false);
@@ -361,22 +353,14 @@ bool Track::playTrack(float fVolume)
             }
         }
 
-        if (fSpeedByFreq == 1.0f)
+        if ( (fSpeedByFreq == 1.0f) && (fSpeedByTime == 1.0f) )
         {
             pChannel->setFrequency( fDefaultFrequency );
         }
         else
         {
-            pChannel->setFrequency( fDefaultFrequency * fSpeedByFreq );
-        }
-
-        if (fSpeedByTime == 1.0f)
-        {
-            pChannel->setFrequency( fDefaultFrequency );
-        }
-        else
-        {
-            pChannel->setFrequency( fDefaultFrequency * fSpeedByTime );
+            if (fSpeedByFreq != 1.0f) pChannel->setFrequency( fDefaultFrequency * fSpeedByFreq );
+            else                      pChannel->setFrequency( fDefaultFrequency * fSpeedByTime );
         }
 
         result = pChannel->setPaused(false);
@@ -575,6 +559,7 @@ void Track::setMaxPosInGraph(unsigned int iMax)
 
 void Track::setSpeedByFreq(float fSpeed)
 {
+    // Save the value even if pChannel is not created
     fSpeedByFreq = fSpeed;
 
     if (pChannel != nullptr)
@@ -592,6 +577,7 @@ void Track::setSpeedByFreq(float fSpeed)
 
 void Track::setSpeedByTime(float fSpeed)
 {
+    // Save the value even if pChannel is not created
     fSpeedByTime = fSpeed;
 
     if (pChannel != nullptr)