Skip to content

Commit ce228f1

Browse files
MysticialMysticial
committed
Fix naming conflict.
1 parent 2cdb296 commit ce228f1

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎Common/Cpp/StreamConverters.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ StreamConverter::StreamConverter(
2727
, m_buffer(object_size_out * buffer_capacity)
2828
{}
2929
StreamConverter::~StreamConverter(){}
30-
void StreamConverter::add_listener(StreamListener& listener){
30+
void StreamConverter::add_listener(ObjectStreamListener& listener){
3131
if (listener.object_size != m_object_size_out){
3232
throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching object size.");
3333
}
3434
m_listeners.insert(&listener);
3535
}
36-
void StreamConverter::remove_listener(StreamListener& listener){
36+
void StreamConverter::remove_listener(ObjectStreamListener& listener){
3737
m_listeners.erase(&listener);
3838
}
3939
void StreamConverter::push_objects(const void* data, size_t objects){
@@ -42,7 +42,7 @@ void StreamConverter::push_objects(const void* data, size_t objects){
4242
convert(m_buffer.data(), data, block);
4343
data = (char*)data + block * m_object_size_in;
4444
objects -= block;
45-
for (StreamListener* listener : m_listeners){
45+
for (ObjectStreamListener* listener : m_listeners){
4646
listener->on_objects(m_buffer.data(), block);
4747
}
4848
}
@@ -64,13 +64,13 @@ MisalignedStreamConverter::MisalignedStreamConverter(
6464
, m_buffer(object_size_out * buffer_capacity)
6565
{}
6666
MisalignedStreamConverter::~MisalignedStreamConverter(){}
67-
void MisalignedStreamConverter::add_listener(StreamListener& listener){
67+
void MisalignedStreamConverter::add_listener(ObjectStreamListener& listener){
6868
if (listener.object_size != m_object_size_out){
6969
throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching object size.");
7070
}
7171
m_listeners.insert(&listener);
7272
}
73-
void MisalignedStreamConverter::remove_listener(StreamListener& listener){
73+
void MisalignedStreamConverter::remove_listener(ObjectStreamListener& listener){
7474
m_listeners.erase(&listener);
7575
}
7676
void MisalignedStreamConverter::push_bytes(const void* data, size_t bytes){
@@ -108,7 +108,7 @@ void MisalignedStreamConverter::push_bytes(const void* data, size_t bytes){
108108
bytes -= block * m_object_size_in;
109109
stored += block;
110110
objects -= block;
111-
for (StreamListener* listener : m_listeners){
111+
for (ObjectStreamListener* listener : m_listeners){
112112
listener->on_objects(m_buffer.data(), stored);
113113
}
114114
stored = 0;

‎Common/Cpp/StreamConverters.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
namespace PokemonAutomation{
1414

1515

16-
class StreamListener{
16+
class ObjectStreamListener{
1717
public:
18-
StreamListener(size_t p_object_size)
18+
ObjectStreamListener(size_t p_object_size)
1919
: object_size(p_object_size)
2020
{}
21-
virtual ~StreamListener() = default;
21+
virtual ~ObjectStreamListener() = default;
2222
virtual void on_objects(const void* data, size_t objects) = 0;
2323

2424
const size_t object_size;
@@ -28,8 +28,8 @@ class StreamListener{
2828

2929
class StreamConverter{
3030
public:
31-
void add_listener(StreamListener& listener);
32-
void remove_listener(StreamListener& listener);
31+
void add_listener(ObjectStreamListener& listener);
32+
void remove_listener(ObjectStreamListener& listener);
3333

3434
public:
3535
StreamConverter(
@@ -51,7 +51,7 @@ class StreamConverter{
5151
size_t m_buffer_capacity;
5252
AlignedVector<char> m_buffer;
5353

54-
std::set<StreamListener*> m_listeners;
54+
std::set<ObjectStreamListener*> m_listeners;
5555
};
5656

5757

@@ -60,8 +60,8 @@ class StreamConverter{
6060
// alignment, convert it to a stream of objects B.
6161
class MisalignedStreamConverter{
6262
public:
63-
void add_listener(StreamListener& listener);
64-
void remove_listener(StreamListener& listener);
63+
void add_listener(ObjectStreamListener& listener);
64+
void remove_listener(ObjectStreamListener& listener);
6565

6666
public:
6767
MisalignedStreamConverter(
@@ -86,7 +86,7 @@ class MisalignedStreamConverter{
8686
size_t m_buffer_capacity;
8787
AlignedVector<char> m_buffer;
8888

89-
std::set<StreamListener*> m_listeners;
89+
std::set<ObjectStreamListener*> m_listeners;
9090
};
9191

9292

‎SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ AudioStreamToFloat::AudioStreamToFloat(
6666
sizeof(float) * samples_per_frame,
6767
AUDIO_BUFFER_SIZE
6868
)
69-
, StreamListener(sizeof(float) * samples_per_frame)
69+
, ObjectStreamListener(sizeof(float) * samples_per_frame)
7070
, m_format(input_format)
7171
, m_samples_per_frame(samples_per_frame)
7272
, m_volume_multiplier(volume_multiplier)
@@ -136,14 +136,14 @@ void AudioStreamToFloat::convert(void* out, const void* in, size_t count){
136136

137137

138138

139-
void AudioFloatToStream::add_listener(StreamListener& listener){
139+
void AudioFloatToStream::add_listener(ObjectStreamListener& listener){
140140
auto scope_check = m_sanitizer.check_scope();
141141
if (listener.object_size != m_frame_size){
142142
throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching frame size.");
143143
}
144144
m_listeners.add(listener);
145145
}
146-
void AudioFloatToStream::remove_listener(StreamListener& listener){
146+
void AudioFloatToStream::remove_listener(ObjectStreamListener& listener){
147147
auto scope_check = m_sanitizer.check_scope();
148148
m_listeners.remove(listener);
149149
}
@@ -172,7 +172,7 @@ void AudioFloatToStream::on_samples(const float* data, size_t frames){
172172
}
173173
if (m_format == AudioSampleFormat::FLOAT32){
174174
m_listeners.run_method(
175-
&StreamListener::on_objects,
175+
&ObjectStreamListener::on_objects,
176176
data, frames
177177
);
178178
return;
@@ -197,7 +197,7 @@ void AudioFloatToStream::on_samples(const float* data, size_t frames){
197197
return;
198198
}
199199
m_listeners.run_method(
200-
&StreamListener::on_objects,
200+
&ObjectStreamListener::on_objects,
201201
m_buffer.data(), block
202202
);
203203
data = (const float*)((const char*)data + block * m_frame_size);

‎SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct AudioFloatStreamListener{
2929

3030

3131
// Convert a stream of raw audio and output to aligned frames of float samples.
32-
class AudioStreamToFloat : private MisalignedStreamConverter, private StreamListener{
32+
class AudioStreamToFloat : private MisalignedStreamConverter, private ObjectStreamListener{
3333
public:
3434
void add_listener(AudioFloatStreamListener& listener);
3535
void remove_listener(AudioFloatStreamListener& listener);
@@ -66,8 +66,8 @@ class AudioStreamToFloat : private MisalignedStreamConverter, private StreamList
6666
// Convert a stream of float samples to raw audio.
6767
class AudioFloatToStream : public AudioFloatStreamListener{
6868
public:
69-
void add_listener(StreamListener& listener);
70-
void remove_listener(StreamListener& listener);
69+
void add_listener(ObjectStreamListener& listener);
70+
void remove_listener(ObjectStreamListener& listener);
7171

7272
public:
7373
AudioFloatToStream(AudioSampleFormat output_format, size_t samples_per_frame);
@@ -81,7 +81,7 @@ class AudioFloatToStream : public AudioFloatStreamListener{
8181
size_t m_frame_size;
8282
size_t m_buffer_size;
8383
AlignedVector<char> m_buffer;
84-
ListenerSet<StreamListener> m_listeners;
84+
ListenerSet<ObjectStreamListener> m_listeners;
8585

8686
LifetimeSanitizer m_sanitizer;
8787
};

‎SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ float convertAudioVolumeFromSlider(double volume){
3939

4040

4141

42-
class AudioOutputDevice : public AudioFloatToStream, private StreamListener{
42+
class AudioOutputDevice : public AudioFloatToStream, private ObjectStreamListener{
4343
public:
4444
AudioOutputDevice(
4545
Logger& logger,
@@ -48,7 +48,7 @@ class AudioOutputDevice : public AudioFloatToStream, private StreamListener{
4848
double volume
4949
)
5050
: AudioFloatToStream(sample_format, samples_per_frame)
51-
, StreamListener(samples_per_frame * sample_size(sample_format))
51+
, ObjectStreamListener(samples_per_frame * sample_size(sample_format))
5252
, m_logger(logger)
5353
, m_sink(device, format)
5454
{

0 commit comments

Comments
 (0)