Skip to content

Avoid clash of class names with another library #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h4yn0nnym0u5e wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid clash of class names with another library #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions audiobuffer.h → audiocodecbuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@

*/

#ifndef audiobuffer_h_
#define audiobuffer_h_
#ifndef audiocodecbuffer_h_
#define audiocodecbuffer_h_

#include <stdlib.h>
#include <stdint.h>
#include <Audio.h>

class AudioBuffer
class AudioCodecBuffer
{
public:
AudioBuffer() { init(); }
~AudioBuffer(){ if (data) free(data); init(); }
AudioCodecBuffer() { init(); }
~AudioCodecBuffer(){ if (data) free(data); init(); }
void allocMem(size_t size){
__disable_irq();
data = (int16_t*) malloc(size * AUDIO_BLOCK_SAMPLES * sizeof(int16_t));
Expand Down
2 changes: 1 addition & 1 deletion play_sd_flac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int AudioPlaySdFlac::play(void)
goto PlayErr;
}

audiobuffer = new AudioBuffer();
audiobuffer = new AudioCodecBuffer();

FLAC__StreamDecoderInitStatus ret;
ret = FLAC__stream_decoder_init_stream(hFLACDecoder,
Expand Down
4 changes: 2 additions & 2 deletions play_sd_flac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "AudioStream.h"
#include "spi_interrupt.h"
#include "FLAC/all.h"
#include "audiobuffer.h"
#include "audiocodecbuffer.h"

#define FLAC_USE_SWI

Expand All @@ -62,7 +62,7 @@ class AudioPlaySdFlac : public AudioCodec

protected:

AudioBuffer *audiobuffer;
AudioCodecBuffer *audiobuffer;
uint16_t minbuffers = 0;
static FLAC__StreamDecoder *hFLACDecoder ;

Expand Down