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/aoblipplayer.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/aoblipplayer.h')
| -rw-r--r-- | include/aoblipplayer.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 44ca48b..4520120 100644 --- a/include/aoblipplayer.h +++ b/include/aoblipplayer.h @@ -9,13 +9,11 @@ #include "aoapplication.h" +#include <QDebug> #include <QWidget> #include <string.h> -#include <QDebug> - -class AOBlipPlayer -{ +class AOBlipPlayer { public: AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); @@ -32,11 +30,11 @@ private: void set_volume_internal(qreal p_volume); - #if defined(BASSAUDIO) +#if defined(BASSAUDIO) HSTREAM m_stream_list[5]; - #elif defined(QTAUDIO) +#elif defined(QTAUDIO) QSoundEffect m_blips; - #endif +#endif }; #endif // AOBLIPPLAYER_H |