summaryrefslogtreecommitdiffstats
path: root/apps/codecs/nsf.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-08-31 19:19:49 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-08-31 19:19:49 +0000
commit13cbade08a07296d92e7a7d3e20475de0032cba1 (patch)
tree731a1a4a99d86632a719ae49e3b3d2a12e764a3a /apps/codecs/nsf.c
parentd089e104034fdf5562bea125d2cacf4ee486782a (diff)
downloadrockbox-13cbade08a07296d92e7a7d3e20475de0032cba1.tar.gz
rockbox-13cbade08a07296d92e7a7d3e20475de0032cba1.tar.bz2
rockbox-13cbade08a07296d92e7a7d3e20475de0032cba1.zip
Update libgme to Blargg's Game_Music_Emu 0.6-pre.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30397 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/nsf.c')
-rw-r--r--apps/codecs/nsf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/nsf.c b/apps/codecs/nsf.c
index 533972e110..7214b5d2a2 100644
--- a/apps/codecs/nsf.c
+++ b/apps/codecs/nsf.c
@@ -74,8 +74,8 @@ enum codec_status codec_run(void)
return CODEC_ERROR;
}
- if ((err = Nsf_load(&nsf_emu, buf, ci->filesize))) {
- DEBUGF("NSF: Nsf_load failed (%s)\n", err);
+ if ((err = Nsf_load_mem(&nsf_emu, buf, ci->filesize))) {
+ DEBUGF("NSF: Nsf_load_mem failed (%s)\n", err);
return CODEC_ERROR;
}
@@ -116,7 +116,7 @@ next_track:
/* Generate audio buffer */
err = Nsf_play(&nsf_emu, CHUNK_SIZE, samples);
- if (err || nsf_emu.track_ended) {
+ if (err || Track_ended(&nsf_emu)) {
track++;
if (track >= nsf_emu.track_count) break;
goto next_track;