diff options
author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
tree | 8561603160cce0b41ba31250539a22d37a2951de /src/sound/oalsound/channel.h | |
parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'src/sound/oalsound/channel.h')
-rw-r--r-- | src/sound/oalsound/channel.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sound/oalsound/channel.h b/src/sound/oalsound/channel.h index 2930f26..1d988c9 100644 --- a/src/sound/oalsound/channel.h +++ b/src/sound/oalsound/channel.h @@ -50,11 +50,10 @@ public: ~Channel(); bool Play(); + bool Pause(); bool Stop(); - bool SetPan(Math::Vector); - void SetPosition(Math::Vector); - Math::Vector GetPosition(); + bool SetPosition(const Math::Vector &); bool SetFrequency(float); float GetFrequency(); @@ -98,11 +97,15 @@ public: void Mute(bool); bool IsMuted(); + void Reset(); + int GetId(); + private: Buffer *m_buffer; ALuint m_source; int m_priority; + int m_id; float m_startAmplitude; float m_startFrequency; float m_changeFrequency; |