aboutsummaryrefslogtreecommitdiff
path: root/src/aosfxplayer.cpp
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-05-22 17:13:17 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-05-22 17:13:37 -0500
commit8928aa2718378bc42d20d5bbe6c17be68d65d6f3 (patch)
treebf90d3e73519d58cc89e2135b613e308ac0a0ed8 /src/aosfxplayer.cpp
parent156a760ebab6839c53f9c613881f0937e814414a (diff)
Perform clang-format
If you don't want to see this commit on blames, use the hidden whitespace option on GitHub, or use `-w` in git-blame.
Diffstat (limited to 'src/aosfxplayer.cpp')
-rw-r--r--src/aosfxplayer.cpp47
1 files changed, 17 insertions, 30 deletions
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 710d7a8a..543da5ca 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -1,7 +1,7 @@
#include "aosfxplayer.h"
#include "file_functions.h"
-#if defined(BASSAUDIO) //Using bass.dll for sfx
+#if defined(BASSAUDIO) // Using bass.dll for sfx
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@@ -11,7 +11,7 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
{
BASS_ChannelStop(m_stream);
-
+
QString misc_path = "";
QString char_path = "";
QString sound_path = ao_app->get_sounds_path(p_sfx);
@@ -24,13 +24,15 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
QString f_path;
if (file_exists(char_path))
- f_path = char_path;
+ f_path = char_path;
else if (file_exists(misc_path))
f_path = misc_path;
else
f_path = sound_path;
- m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
+ m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0,
+ BASS_STREAM_AUTOFREE | BASS_UNICODE |
+ BASS_ASYNCFILE);
set_volume(m_volume);
@@ -39,10 +41,7 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
BASS_ChannelPlay(m_stream, false);
}
-void AOSfxPlayer::stop()
-{
- BASS_ChannelStop(m_stream);
-}
+void AOSfxPlayer::stop() { BASS_ChannelStop(m_stream); }
void AOSfxPlayer::set_volume(int p_value)
{
@@ -50,7 +49,7 @@ void AOSfxPlayer::set_volume(int p_value)
float volume = p_value / 100.0f;
BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
}
-#elif defined(QTAUDIO) //Using Qt's QSoundEffect class
+#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@@ -73,26 +72,23 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
QString f_path;
if (file_exists(char_path))
- f_path = char_path;
+ f_path = char_path;
else if (file_exists(misc_path))
f_path = misc_path;
else
f_path = sound_path;
- if (file_exists(f_path)) //if its missing, it will glitch out
+ if (file_exists(f_path)) // if its missing, it will glitch out
{
- m_sfx.setSource(QUrl::fromLocalFile(f_path));
+ m_sfx.setSource(QUrl::fromLocalFile(f_path));
- set_volume(m_volume);
+ set_volume(m_volume);
- m_sfx.play();
+ m_sfx.play();
}
}
-void AOSfxPlayer::stop()
-{
- m_sfx.stop();
-}
+void AOSfxPlayer::stop() { m_sfx.stop(); }
void AOSfxPlayer::set_volume(int p_value)
{
@@ -106,18 +102,9 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
ao_app = p_ao_app;
}
-void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
-{
+void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) {}
-}
-
-void AOSfxPlayer::stop()
-{
-
-}
+void AOSfxPlayer::stop() {}
-void AOSfxPlayer::set_volume(int p_value)
-{
-
-}
+void AOSfxPlayer::set_volume(int p_value) {}
#endif