aboutsummaryrefslogtreecommitdiff
path: root/src/aosfxplayer.cpp
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-04-17 21:57:16 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-04-17 21:57:16 -0500
commit13942345c6a3e7e1625c6c26cc2f2f368a3bff23 (patch)
tree73ce940217b57fd47afb6a95e828e6309ed5e683 /src/aosfxplayer.cpp
parentfaac191f0b9e99b82614ed3959ec5c67f56a1fc3 (diff)
Run clang-format on entire project
Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style. Lines reflow at 80 characters. One-line method bodies are on the same line as the signature. Space always after `//`. No indentation on preprocessor macros. Includes are sorted lexicographically. 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.cpp76
1 files changed, 29 insertions, 47 deletions
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index d2140e3e..4684acdb 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -1,8 +1,8 @@
#include "aosfxplayer.h"
#include "file_functions.h"
-#if defined(BASSAUDIO) //Using bass.dll for sfx
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
+#if defined(BASSAUDIO) // Using bass.dll for sfx
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{
m_parent = parent;
ao_app = p_ao_app;
@@ -11,7 +11,7 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
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,38 +24,35 @@ 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;
BASS_ChannelStop(m_stream);
- 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_internal(m_volume);
if (ao_app->get_audio_output_device() != "default")
BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
BASS_ChannelPlay(m_stream, false);
- if(looping_sfx && ao_app->get_looping_sfx())
- {
+ if (looping_sfx && ao_app->get_looping_sfx()) {
BASS_ChannelFlags(m_stream, BASS_SAMPLE_LOOP, BASS_SAMPLE_LOOP);
}
- else
- {
+ else {
BASS_ChannelFlags(m_stream, 0, BASS_SAMPLE_LOOP);
}
}
void AOSfxPlayer::setLooping(bool is_looping)
{
- this->looping_sfx = is_looping;
+ this->looping_sfx = is_looping;
}
-void AOSfxPlayer::stop()
-{
- BASS_ChannelStop(m_stream);
-}
+void AOSfxPlayer::stop() { BASS_ChannelStop(m_stream); }
void AOSfxPlayer::set_volume(qreal p_value)
{
@@ -65,11 +62,11 @@ void AOSfxPlayer::set_volume(qreal p_value)
void AOSfxPlayer::set_volume_internal(qreal p_value)
{
- float volume = p_value;
- BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
+ float volume = p_value;
+ BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
}
-#elif defined(QTAUDIO) //Using Qt's QSoundEffect class
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
+#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{
m_parent = parent;
ao_app = p_ao_app;
@@ -91,35 +88,32 @@ 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_internal(m_volume);
+ set_volume_internal(m_volume);
- m_sfx.play();
+ m_sfx.play();
}
}
void AOSfxPlayer::setLooping(bool is_looping)
{
- this->looping_sfx = is_looping;
+ this->looping_sfx = is_looping;
}
-void AOSfxPlayer::stop()
-{
- m_sfx.stop();
-}
+void AOSfxPlayer::stop() { m_sfx.stop(); }
void AOSfxPlayer::set_volume(qreal p_value)
{
- m_volume = p_value/100;
+ m_volume = p_value / 100;
set_volume_internal(m_volume);
}
@@ -128,34 +122,22 @@ void AOSfxPlayer::set_volume_internal(qreal p_value)
m_sfx.setVolume(m_volume);
}
#else
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app): QObject()
+AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) : QObject()
{
m_parent = parent;
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::setLooping(bool is_looping)
{
- this->looping_sfx = is_looping;
+ this->looping_sfx = is_looping;
}
-void AOSfxPlayer::stop()
-{
+void AOSfxPlayer::stop() {}
-}
-
-void AOSfxPlayer::set_volume(qreal p_value)
-{
+void AOSfxPlayer::set_volume(qreal p_value) {}
-}
-
-void AOSfxPlayer::set_volume_internal(qreal p_value)
-{
-
-}
+void AOSfxPlayer::set_volume_internal(qreal p_value) {}
#endif