diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-08-21 12:42:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:42:45 -0500 |
| commit | 2c6a690d47ca0c48bef84b3d28d58064365a9934 (patch) | |
| tree | cdc2a42b51e4bbe3c008adab296ac306d6dbdfd7 /include/aosfxplayer.h | |
| parent | ec1c95bdb33dd063880c4cb6c3c9c3cf5d0ed454 (diff) | |
| parent | af1e76022568af1f146e2b49e96af85eb06521b9 (diff) | |
Merge pull request #246 from AttorneyOnline/2.8
Merges 2.8.5, which is a patch release for 2.8 with no substantially new features.
This commit is release-ready.
Diffstat (limited to 'include/aosfxplayer.h')
| -rw-r--r-- | include/aosfxplayer.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h index 99188719..0a5fffa8 100644 --- a/include/aosfxplayer.h +++ b/include/aosfxplayer.h @@ -1,12 +1,8 @@ #ifndef AOSFXPLAYER_H #define AOSFXPLAYER_H -#if defined(BASSAUDIO) #include "bass.h" #include "bassopus.h" -#elif defined(QTAUDIO) -#include <QSoundEffect> -#endif #include "aoapplication.h" @@ -37,11 +33,7 @@ private: const int m_channelmax = 5; -#if defined(BASSAUDIO) HSTREAM m_stream_list[5]; -#elif defined(QTAUDIO) - QSoundEffect m_stream_list[5]; -#endif }; #endif // AOSFXPLAYER_H |