aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/aomusicplayer.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp
index 5d9df792..2b75baa5 100644
--- a/src/aomusicplayer.cpp
+++ b/src/aomusicplayer.cpp
@@ -16,7 +16,6 @@ AOMusicPlayer::~AOMusicPlayer()
QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
int effect_flags)
{
- QFuture<QString> invoking_future = music_watcher.future();
channel = channel % m_channelmax;
if (channel < 0) // wtf?
return "[ERROR] Invalid Channel";
@@ -45,13 +44,6 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
int error_code = BASS_ErrorGetCode();
- if (invoking_future.isCanceled()) {
- // Target future has changed. This stream has become irrelevant.
- // So even if the stream manages to finish after the latest one, we don't run
- // into order issues.
- return QString();
- }
-
if (ao_app->get_audio_output_device() != "default")
BASS_ChannelSetDevice(m_stream_list[channel], BASS_GetDevice());