Skip to content

Fix issue with stb_vorbis #2

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
Tuhkis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issue with stb_vorbis #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4832c
Fix issues with stb_vorbis
Tuhkis Jun 28, 2023
4df1514
Fix mistake
Tuhkis Jun 28, 2023
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
26 changes: 13 additions & 13 deletions src/cmixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const char* cm_get_error(void) {
}


static const char* error(const char *msg) {
static const char* cm_error(const char *msg) {
cmixer.lasterror = msg;
return msg;
}
Expand Down Expand Up @@ -263,7 +263,7 @@ void cm_process(cm_Int16 *dst, int len) {
cm_Source* cm_new_source(const cm_SourceInfo *info) {
cm_Source *src = calloc(1, sizeof(*src));
if (!src) {
error("allocation failed");
cm_error("allocation failed");
return NULL;
}
src->handler = info->handler;
Expand Down Expand Up @@ -314,7 +314,7 @@ static cm_Source* new_source_from_mem(void *data, int size, int ownsdata) {
}
#endif

error("unknown format or invalid data");
cm_error("unknown format or invalid data");
return NULL;
}

Expand Down Expand Up @@ -359,7 +359,7 @@ cm_Source* cm_new_source_from_file(const char *filename) {
/* Load file into memory */
data = load_file(filename, &size);
if (!data) {
error("could not load file");
cm_error("could not load file");
return NULL;
}

Expand Down Expand Up @@ -517,12 +517,12 @@ static const char* read_wav(Wav *w, void *data, int len) {

/* Check header */
if (memcmp(p, "RIFF", 4) || memcmp(p + 8, "WAVE", 4)) {
return error("bad wav header");
return cm_error("bad wav header");
}
/* Find fmt subchunk */
p = find_subchunk(data, len, "fmt", &sz);
if (!p) {
return error("no fmt subchunk");
return cm_error("no fmt subchunk");
}

/* Load fmt info */
Expand All @@ -531,16 +531,16 @@ static const char* read_wav(Wav *w, void *data, int len) {
samplerate = *((cm_UInt32*) (p + 4));
bitdepth = *((cm_UInt16*) (p + 14));
if (format != 1) {
return error("unsupported format");
return cm_error("unsupported format");
}
if (channels == 0 || samplerate == 0 || bitdepth == 0) {
return error("bad format");
return cm_error("bad format");
}

/* Find data subchunk */
p = find_subchunk(data, len, "data", &sz);
if (!p) {
return error("no data subchunk");
return cm_error("no data subchunk");
}

/* Init struct */
Expand Down Expand Up @@ -625,12 +625,12 @@ static const char* wav_init(cm_SourceInfo *info, void *data, int len, int ownsda
}

if (wav.channels > 2 || (wav.bitdepth != 16 && wav.bitdepth != 8)) {
return error("unsupported wav format");
return cm_error("unsupported wav format");
}

stream = calloc(1, sizeof(*stream));
if (!stream) {
return error("allocation failed");
return cm_error("allocation failed");
}
stream->wav = wav;

Expand Down Expand Up @@ -708,13 +708,13 @@ static const char* ogg_init(cm_SourceInfo *info, void *data, int len, int ownsda

ogg = stb_vorbis_open_memory(data, len, &err, NULL);
if (!ogg) {
return error("invalid ogg data");
return cm_error("invalid ogg data");
}

stream = calloc(1, sizeof(*stream));
if (!stream) {
stb_vorbis_close(ogg);
return error("allocation failed");
return cm_error("allocation failed");
}

stream->ogg = ogg;
Expand Down