Skip to content

Commit eaaefa7

Browse files
committed
small fixes
1 parent 7e77597 commit eaaefa7

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

include/audio_buffer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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

include/audio_source.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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
{
1616
public:
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

include/audio_system.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
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

911
class 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

src/audio_source.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "audio_source.h"
2+
#include "audio_system.h"
23

34

45
static void eos_callback(void* userdata, ALuint source)

src/audio_system.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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

77
float AudioSystem::m_listenerPos[3] = {};

0 commit comments

Comments
 (0)