SLUDGE: Added support for impulse tracker files using libmikmod! #4836
Conversation
hari01584
force-pushed
the
it2
branch
3 times, most recently
from
86e934c to
3d2789c
Compare
audio/mods/impulsetracker.cpp
Outdated
|
|
||
| MikMod_InitThreads(); | ||
|
|
||
| // No sound driver as we will be routing through scrumm mixer! |
There was a problem hiding this comment.
Yea, it like meant going through the inbuilt system to play, rather than using mikmod internal players, i think its better to just remove this comment
audio/mods/impulsetracker.cpp
Outdated
| MikMod_RegisterLoader(&load_it); | ||
|
|
||
|
|
||
| // TODO: Not currently in use |
There was a problem hiding this comment.
It is, however wrapped in MREADER instance, this is like for now we just remove this class parameter _stream and still the program will work
audio/mods/impulsetracker.cpp
Outdated
| _reader = createMikMemoryReader(_stream); | ||
| _mod = Player_LoadGeneric(_reader, 64, 0); | ||
| if (!_mod) { | ||
| warning("ImpulseTrackerMod::ImpulseTrackerMod(): Parsing mod error : %s", MikMod_strerror(MikMod_errno)); |
There was a problem hiding this comment.
Please remove space before colon error: %s
audio/mods/impulsetracker.cpp
Outdated
|
|
||
| } // End of namespace Audio | ||
|
|
||
| #endif // USE_MIKMOD No newline at end of file |
audio/mods/impulsetracker.h
Outdated
| * @param disposeAfterUse whether to delete the stream after use | ||
| * @return a new AudioStream, or NULL, if an error occurred | ||
| */ | ||
| RewindableAudioStream *makeImpulseStream( |
There was a problem hiding this comment.
Please rename to makeImpulseTrackerStream()
audio/mods/impulsetracker.h
Outdated
|
|
||
| class RewindableAudioStream; | ||
| /** | ||
| * Create a new AudioStream from the impulse tracker data in the given stream. |
audio/module.mk
Outdated
| mods/maxtrax.o \ | ||
| mods/mod_xm_s3m.o \ | ||
| mods/module.o \ | ||
| mods/impulsetracker.o \ |
There was a problem hiding this comment.
This must be sorted alphabetically
configure
Outdated
| EOF | ||
| if test -n "$_host"; then | ||
| # don't execute while cross compiling | ||
| cc_check $MIKMOD_CFLAGS $MIKMOD_LIBS -lmikmod && _mikmod=yes |
There was a problem hiding this comment.
Please use libmikmod-config to obtain proper compilation and linker flags. See freetype-config in this file for a good example.
engines/testbed/sound.cpp
Outdated
| } | ||
|
|
||
| } // End of namespace Testbed | ||
| } // End of namespace Testbed |
hari01584
force-pushed
the
it2
branch
2 times, most recently
from
293f530 to
d881b4d
Compare
|
sev already did a thorough review. I have one additional comment though: the split of the changes between the two commits is a mess, and the first commit likely does not compile. This will need to be fixed by moving some changes between the commits. |
|
That is indeed correct, I was thinking of squashing these two commits into one, will that be okay? |
I think it would be better to have the changes in |
|
Agreed, please check the latest changes, split into 3 commits each for engine/task! |
|
All the changes look OK now, except for this new commit log message. Please, fix it to "AUDIO: Add support for Impulse Tracker using libmikmod" |
|
Thanks! |
3 participants
Changes