ApfelTeeSaft/gameBase
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/gameBase.git synced 2026-08-26 19:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented delay between tracks

Browse Source 
not playing if the same playlist is passed
This commit is contained in:
devZoGok
2025-06-22 10:23:39 +03:00
parent 05f3de11d3
commit a74be10c24
2 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soundManager.cpp
+41 -17
View File
@@ -20,41 +20,65 @@ namespace gameBase{
}
void SoundManager::update(){
if(currentPlaylist[currentTrackId].soundObj->getStatus() == sf::SoundSource::Status::Stopped){
bool lastTrack = (currentTrackId == currentPlaylist.size() - 1);
if(!currentPlaylistTracks.empty()){
sf::SoundSource::Status status = currentPlaylistTracks[currentTrackId].soundObj->getStatus();
if(lastTrack && loop)
currentTrackId = 0;
else if(lastTrack && !loop)
clearPlaylist();
else if(!lastTrack)
currentTrackId++;
if(status == sf::SoundSource::Status::Stopped){
if(getTime() - lastPlayTime < trackDelay) return;
if(!currentPlaylist.empty()){
currentPlaylist[currentTrackId].soundObj->play();
currentPlaylist[currentTrackId].soundObj->setLooping(false);
bool lastTrack = (currentTrackId == currentPlaylistTracks.size() - 1);
if(lastTrack && loop)
currentTrackId = 0;
else if(lastTrack && !loop)
clearPlaylist();
else if(!lastTrack)
currentTrackId++;
if(!currentPlaylistTracks.empty()){
currentPlaylistTracks[currentTrackId].soundObj->play();
currentPlaylistTracks[currentTrackId].soundObj->setVolume(volume);
currentPlaylistTracks[currentTrackId].soundObj->setLooping(false);
}
}
else if(status == sf::SoundSource::Status::Playing)
lastPlayTime = getTime();
}
}
void SoundManager::clearPlaylist(){
for(Track &track : currentPlaylist)
for(Track &track : currentPlaylistTracks)
delete track.soundObj;
currentPlaylist.clear();
currentPlaylistTracks.clear();
}
void SoundManager::play(vector<string> playlist, int volume, bool loop, bool shuffle){
void SoundManager::play(vector<string> playlist, int volume, int trackDelay, bool loop, bool shuffle){
bool samePlaylist = (playlist.size() == originalPlaylist.size());
if(samePlaylist)
for(int i = 0; i < originalPlaylist.size(); i++)
if(originalPlaylist[i] != playlist[i]){
samePlaylist = false;
break;
}
if(samePlaylist) return;
this->loop = loop;
this->shuffle = shuffle;
this->volume = volume;
this->trackDelay = trackDelay;
clearPlaylist();
for(string path : playlist)
currentPlaylist.push_back(Track(path));
currentPlaylistTracks.push_back(Track(path));
originalPlaylist = playlist;
currentTrackId = 0;
currentPlaylist[currentTrackId].soundObj->play();
currentPlaylist[currentTrackId].soundObj->setLooping(false);
currentPlaylistTracks[currentTrackId].soundObj->play();
currentPlaylistTracks[currentTrackId].soundObj->setVolume(volume);
currentPlaylistTracks[currentTrackId].soundObj->setLooping(false);
}
}
soundManager.h
+7 -3
View File
@@ -4,6 +4,8 @@
#include <string>
#include <vector>
#include "util.h"
namespace sf{
class Music;
}
@@ -13,7 +15,7 @@ namespace gameBase{
public:
static SoundManager* getSingleton();
void update();
void play(std::vector<std::string>, int, bool, bool);
void play(std::vector<std::string>, int, int, bool, bool);
private:
struct Track{
std::string path = "";
@@ -24,9 +26,11 @@ namespace gameBase{
SoundManager(){}
void clearPlaylist();
int currentTrackId = 0;
int currentTrackId = 0, volume, trackDelay;
bool loop, shuffle;
std::vector<Track> currentPlaylist;
s64 lastPlayTime = 0;
std::vector<Track> currentPlaylistTracks;
std::vector<std::string> originalPlaylist;
};
}