diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
| commit | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch) | |
| tree | 8e8892d24684f005b0e18624677957791e1738b7 /include/aosfxplayer.h | |
| parent | 1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff) | |
| parent | 992c0b14e155059a7e22ad72c0309b620c850a46 (diff) | |
Merge branch '2.7-rc'
Includes full code reformat.
# Conflicts:
# src/aomusicplayer.cpp
# src/path_functions.cpp
Diffstat (limited to 'include/aosfxplayer.h')
| -rw-r--r-- | include/aosfxplayer.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 5b4d2ec..af3aef6 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -9,13 +9,12 @@ #include "aoapplication.h" -#include <QWidget> -#include <string.h> #include <QDebug> #include <QTimer> +#include <QWidget> +#include <string.h> -class AOSfxPlayer : public QObject -{ +class AOSfxPlayer : public QObject { Q_OBJECT public: AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); @@ -33,11 +32,11 @@ private: void set_volume_internal(qreal p_volume); - #if defined(BASSAUDIO) +#if defined(BASSAUDIO) HSTREAM m_stream; - #elif defined(QTAUDIO) - QSoundEffect m_sfx; - #endif +#elif defined(QTAUDIO) + QSoundEffect m_sfx; +#endif }; #endif // AOSFXPLAYER_H |