Skip to content

Creative voc decoder #10

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

Closed
wants to merge 19 commits into from
Closed

Creative voc decoder #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6ed9f76
fixed FindGDIPLUS.cmake to match MSYS2/Mingw-w64 libgdiplus path
pkrcel Sep 19, 2014
e03eb8b
Added support for Creative Voice audio file format through libsndfile.
pkrcel Jan 2, 2015
c7abfd7
Beauify source of voc.c and add some comments for maintenance.
pkrcel Jan 2, 2015
24ae283
Merge remote-tracking branch 'upstream/5.1' into creative-voc-decoder
pkrcel Jan 2, 2015
8266ff8
Changed libsndfile link implementation to sndfile.c and added an
pkrcel Jan 4, 2015
71b696e
fixed some stupid syntax bugs and validated voc loader against samples
pkrcel Jan 5, 2015
4414853
Removed sndfile support from branch.
pkrcel Jan 8, 2015
7026634
Cleaned up voc.c of all ISO C90-related warnings and tightened some code
pkrcel Jan 8, 2015
f36120d
Removed last traces of sndfile support from branch. Thanks Beoran.
pkrcel Jan 9, 2015
430ef18
Removed last bit of sndfile? (I should learn better)
pkrcel Jan 9, 2015
a4ba823
Removed a couple additional warnings about array bounds.
pkrcel Jan 11, 2015
2999d31
Removed yet another bit of SNDFILE implementation in acodec.h
pkrcel Jan 15, 2015
9a2df62
Hoping to have put a more consistent and Allegro-friendly code-style in
pkrcel Jan 15, 2015
c828ee3
Added Allegro ASCII art into header.
pkrcel Jan 15, 2015
20d09f1
Forgot to update revisions, not really useful nowadays with git & Co but
pkrcel Jan 15, 2015
1a2fc8d
Added "Welcome To Allegro" VOC file in the examples data section.
pkrcel Jan 15, 2015
44287d1
Forgot to commit the added line in examples/Cmakelists.txt for example
pkrcel Jan 16, 2015
6b8f005
Inserted return check on all al_read through an evil macro.
pkrcel Jan 16, 2015
069b68b
Corrected some minor style issues.
pkrcel Jan 17, 2015
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
1 change: 1 addition & 0 deletions addons/acodec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set(ACODEC_SOURCES
acodec.c
wav.c
helper.c
voc.c # built-in enhanced port of A4 loader
)
set(ACODEC_LIBRARIES)

Expand Down
4 changes: 4 additions & 0 deletions addons/acodec/acodec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ bool al_init_acodec_addon(void)
ret &= al_register_sample_saver_f(".wav", _al_save_wav_f);
ret &= al_register_audio_stream_loader_f(".wav", _al_load_wav_audio_stream_f);

/* buil-in VOC loader */
ret &= al_register_sample_loader(".voc", _al_load_voc);
ret &= al_register_sample_loader_f(".voc", _al_load_voc_f);

#ifdef ALLEGRO_CFG_ACODEC_FLAC
ret &= al_register_sample_loader(".flac", _al_load_flac);
ret &= al_register_audio_stream_loader(".flac", _al_load_flac_audio_stream);
Expand Down
11 changes: 11 additions & 0 deletions addons/acodec/acodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ ALLEGRO_AUDIO_STREAM *_al_load_wav_audio_stream_f(ALLEGRO_FILE* f,
bool _al_save_wav(const char *filename, ALLEGRO_SAMPLE *spl);
bool _al_save_wav_f(ALLEGRO_FILE *pf, ALLEGRO_SAMPLE *spl);

/*
* Built-in Port of A4 Creative Voice file (.voc) Loader.
* should not implement streams since it's unlikely this container
* will ever be used as such.
*/
ALLEGRO_SAMPLE *_al_load_voc(const char *filename);
ALLEGRO_SAMPLE *_al_load_voc_f(ALLEGRO_FILE *fp);


#ifdef ALLEGRO_CFG_ACODEC_FLAC
ALLEGRO_SAMPLE *_al_load_flac(const char *filename);
ALLEGRO_SAMPLE *_al_load_flac_f(ALLEGRO_FILE *f);
Expand Down Expand Up @@ -49,4 +58,6 @@ ALLEGRO_AUDIO_STREAM *_al_load_ogg_vorbis_audio_stream_f(ALLEGRO_FILE* file,
size_t buffer_count, unsigned int samples);
#endif



#endif
1 change: 1 addition & 0 deletions addons/acodec/allegro5/internal/aintern_acodec_cfg.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#cmakedefine ALLEGRO_CFG_ACODEC_VORBIS
#cmakedefine ALLEGRO_CFG_ACODEC_TREMOR


/* Define if the library should be loaded dynamically. */
#cmakedefine ALLEGRO_CFG_ACODEC_FLAC_DLL "@ALLEGRO_CFG_ACODEC_FLAC_DLL@"
#cmakedefine ALLEGRO_CFG_ACODEC_DUMB_DLL "@ALLEGRO_CFG_ACODEC_DUMB_DLL@"
Expand Down
Loading