aboutsummaryrefslogtreecommitdiff
path: root/src/aoblipplayer.cpp
diff options
context:
space:
mode:
authorscatterflower <2956568+scatterflower@users.noreply.github.com>2020-08-19 16:40:37 -0500
committerGitHub <noreply@github.com>2020-08-19 16:40:37 -0500
commit9eb0f53db1ae87058458eae267f2a72e3a0a8091 (patch)
treedbf5ccd4d3a70a49cebfb84798e7b2b77583835f /src/aoblipplayer.cpp
parentcef0ebc6eb2ac549a5475bee332be35ab7f565fc (diff)
Reset BASS when switching devices; drop Qt Multimedia support (#262)
* Allow changing audio device on the fly while in a server * Use default audio device if device in config doesn't exist * Automatically change audio device to default when current one is invalid * Destroy Qt Multimedia support It was decided that there was not enough attention being given to Qt Multimedia support to justify its continued maintenance simply as a libre alternative to BASS. While substantial changes to audio were being made in 2.8, the Qt Multimedia support code fell behind in disrepair. It's clear that there is no vested interest in implementing audio features twice for the sake of licensing. When it's time to switch to another audio library, it will be done unilaterally. * CI: Use BASS for Linux build Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Diffstat (limited to 'src/aoblipplayer.cpp')
-rw-r--r--src/aoblipplayer.cpp57
1 files changed, 7 insertions, 50 deletions
diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp
index 57b2d278..5b4d625c 100644
--- a/src/aoblipplayer.cpp
+++ b/src/aoblipplayer.cpp
@@ -1,6 +1,5 @@
#include "aoblipplayer.h"
-#if defined(BASSAUDIO) // Using bass.dll for the blips
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@@ -37,8 +36,14 @@ void AOBlipPlayer::blip_tick()
m_cycle = 0;
HSTREAM f_stream = m_stream_list[f_cycle];
- if (ao_app->get_audio_output_device() != "default")
+
+ BASS_ChannelSetDevice(f_stream, BASS_GetDevice());
+ int f_bass_error = BASS_ErrorGetCode();
+ if (f_bass_error == BASS_ERROR_DEVICE) {
+ ao_app->doBASSreset();
BASS_ChannelSetDevice(f_stream, BASS_GetDevice());
+ }
+
BASS_ChannelPlay(f_stream, false);
}
@@ -56,51 +61,3 @@ void AOBlipPlayer::set_volume_internal(qreal p_value)
BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume);
}
}
-#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
-AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
-
-void AOBlipPlayer::set_blips(QString p_sfx)
-{
- QString f_path = ao_app->get_sounds_path(p_sfx);
-
- for (int n_stream = 0; n_stream < 5; ++n_stream) {
- m_blips.setSource(QUrl::fromLocalFile(f_path));
- }
-
- set_volume(m_volume);
-}
-
-void AOBlipPlayer::blip_tick()
-{
- int f_cycle = m_cycle++;
-
- if (m_cycle == 5)
- m_cycle = 0;
-
- m_blips.play();
-}
-
-void AOBlipPlayer::set_volume(int p_value)
-{
- m_volume = p_value;
- m_blips.setVolume(m_volume);
-}
-#else // No audio
-AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
-
-void AOBlipPlayer::set_blips(QString p_sfx) {}
-
-void AOBlipPlayer::blip_tick() {}
-
-void AOBlipPlayer::set_volume(int p_value) {}
-
-void AOBlipPlayer::set_volume_internal(qreal p_value) {}
-#endif