diff options
| author | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
|---|---|---|
| committer | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
| commit | e0c49ceb0720fabc777e178e1c8ce76ec7ef42e9 (patch) | |
| tree | e78e7ec82f105e98a7e3f1dab2a5c907e249f877 /include/aosfxplayer.h | |
| parent | e5c2898bac03c478b468afd765ecbf3ceaa19a46 (diff) | |
| parent | 4a2a167f7d552141a2e3450d350b57d2f7b342a0 (diff) | |
Merge branch 'bass-optional' into 'master'
Bass+discord optional
See merge request AttorneyOnline/AO2-Client!59
Diffstat (limited to 'include/aosfxplayer.h')
| -rw-r--r-- | include/aosfxplayer.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 30cbe9d..4b97685 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -1,7 +1,12 @@ #ifndef AOSFXPLAYER_H #define AOSFXPLAYER_H +#if defined(BASSAUDIO) #include "bass.h" +#elif defined(QTAUDIO) +#include <QSoundEffect> +#endif + #include "aoapplication.h" #include <QWidget> @@ -20,9 +25,12 @@ public: private: QWidget *m_parent; AOApplication *ao_app; - - int m_volume = 0; + #if defined(BASSAUDIO) HSTREAM m_stream; + #elif defined(QTAUDIO) + QSoundEffect m_sfx; + #endif + int m_volume = 0; }; #endif // AOSFXPLAYER_H |