File tree Expand file tree Collapse file tree 5 files changed +17
-14
lines changed
Expand file tree Collapse file tree 5 files changed +17
-14
lines changed Original file line number Diff line number Diff line change 1- #ifndef SOUND_H
2- #define SOUND_H
1+ #ifndef _AUDIO_BUFFER_H
2+ #define _AUDIO_BUFFER_H
33
44#include < iostream>
55#include < string>
@@ -32,4 +32,4 @@ class AudioBuffer
3232 bool m_isStreamed = false ;
3333};
3434
35- #endif // SOUND_H
35+ #endif // _AUDIO_BUFFER_H
Original file line number Diff line number Diff line change 1- #ifndef AUDIO_SOURCE_H
2- #define AUDIO_SOURCE_H
1+ #ifndef _AUDIO_SOURCE_H
2+ #define _AUDIO_SOURCE_H
33
44#include " AL/al.h"
55#include " AL/alure.h"
66#include " audio_buffer.h"
7- #include " audio_system.h"
7+ // #include "audio_system.h"
88
99#define STREAM_BUFFER_SIZE 65535 // size of chunk in bytes
1010#define BUFFERS_NUM 16 // count of chunks
@@ -15,7 +15,7 @@ class AudioSource
1515{
1616public:
1717 AudioSource (AudioBuffer* buffer = nullptr );
18- ~AudioSource ();
18+ virtual ~AudioSource ();
1919
2020 void setBuffer (AudioBuffer* buffer);
2121 void unsetBuffer ();
@@ -60,4 +60,4 @@ class AudioSource
6060};
6161
6262
63- #endif // AUDIO_SOURCE_H
63+ #endif // _AUDIO_SOURCE_H
Original file line number Diff line number Diff line change 1- #ifndef AUDIO_SYSTEM_H
2- #define AUDIO_SYSTEM_H
1+ #ifndef _AUDIO_SYSTEM_H
2+ #define _AUDIO_SYSTEM_H
33
44#include < vector>
5+ #include " audio_buffer.h"
6+ #include " audio_source.h"
57
6- class AudioBuffer ; // from "audio_buffer.h"
7- class AudioSource ; // from "audio_source.h"
8+ // class AudioBuffer; // from "audio_buffer.h"
9+ // class AudioSource; // from "audio_source.h"
810
911class AudioSystem
1012{
@@ -41,4 +43,4 @@ class AudioSystem
4143 static float m_listenerVel[3 ];
4244};
4345
44- #endif // AUDIO_SYSTEM_H
46+ #endif // _AUDIO_SYSTEM_H
Original file line number Diff line number Diff line change 11#include " audio_source.h"
2+ #include " audio_system.h"
23
34
45static void eos_callback (void * userdata, ALuint source)
Original file line number Diff line number Diff line change 11#include < cstring>
22#include " audio_system.h"
33#include " file_system.h"
4- #include " audio_source.h"
4+ // #include "audio_source.h"
55#include " AL/alure.h"
66
77float AudioSystem::m_listenerPos[3 ] = {};
You can’t perform that action at this time.
0 commit comments