aboutsummaryrefslogtreecommitdiff
path: root/src/aoblipplayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/aoblipplayer.cpp')
-rw-r--r--src/aoblipplayer.cpp33
1 files changed, 11 insertions, 22 deletions
diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp
index 4dfb895c..0355414d 100644
--- a/src/aoblipplayer.cpp
+++ b/src/aoblipplayer.cpp
@@ -1,6 +1,6 @@
#include "aoblipplayer.h"
-#if defined(BASSAUDIO) //Using bass.dll for the blips
+#if defined(BASSAUDIO) // Using bass.dll for the blips
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@@ -11,11 +11,11 @@ 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)
- {
+ for (int n_stream = 0; n_stream < 5; ++n_stream) {
BASS_StreamFree(m_stream_list[n_stream]);
- m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
+ m_stream_list[n_stream] = BASS_StreamCreateFile(
+ FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
}
set_volume(m_volume);
@@ -40,12 +40,11 @@ void AOBlipPlayer::set_volume(int p_value)
float volume = p_value / 100.0f;
- for (int n_stream = 0 ; n_stream < 5 ; ++n_stream)
- {
+ for (int n_stream = 0; n_stream < 5; ++n_stream) {
BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume);
}
}
-#elif defined(QTAUDIO) //Using Qt's QSoundEffect class
+#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@@ -56,8 +55,7 @@ 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)
- {
+ for (int n_stream = 0; n_stream < 5; ++n_stream) {
m_blips.setSource(QUrl::fromLocalFile(f_path));
}
@@ -79,25 +77,16 @@ void AOBlipPlayer::set_volume(int p_value)
m_volume = p_value;
m_blips.setVolume(m_volume);
}
-#else //No audio
+#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_blips(QString p_sfx) {}
-void AOBlipPlayer::set_volume(int p_value)
-{
+void AOBlipPlayer::blip_tick() {}
-}
+void AOBlipPlayer::set_volume(int p_value) {}
#endif