From 54349ba1f2290ae7560a8a8a164bf6bd670635e0 Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Fri, 4 Oct 2013 13:33:14 -0700 Subject: [PATCH] Added fade length to C API --- Frameworks/GME/gme/gme.cpp | 16 ++++++++-------- Frameworks/GME/gme/gme.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Frameworks/GME/gme/gme.cpp b/Frameworks/GME/gme/gme.cpp index 59e699161..880b52653 100644 --- a/Frameworks/GME/gme/gme.cpp +++ b/Frameworks/GME/gme/gme.cpp @@ -312,7 +312,7 @@ void gme_set_user_cleanup(Music_Emu* gme, gme_user_cleanup_t func ){ gme->s gme_err_t gme_start_track ( Music_Emu* gme, int index ) { return gme->start_track( index ); } gme_err_t gme_play ( Music_Emu* gme, int n, short p [] ) { return gme->play( n, p ); } -void gme_set_fade ( Music_Emu* gme, int start_msec ) { gme->set_fade( start_msec ); } +void gme_set_fade ( Music_Emu* gme, int start_msec, int length_msec ) { gme->set_fade( start_msec, length_msec ); } gme_bool gme_track_ended ( Music_Emu const* gme ) { return gme->track_ended(); } int gme_tell ( Music_Emu const* gme ) { return gme->tell(); } gme_err_t gme_seek ( Music_Emu* gme, int msec ) { return gme->seek( msec ); } @@ -324,13 +324,13 @@ void gme_mute_voices ( Music_Emu* gme, int mask ) { gme->m void gme_set_equalizer ( Music_Emu* gme, gme_equalizer_t const* eq ) { gme->set_equalizer( *eq ); } void gme_equalizer ( Music_Emu const* gme, gme_equalizer_t* o ) { *o = gme->equalizer(); } const char* gme_voice_name ( Music_Emu const* gme, int i ) { return gme->voice_name( i ); } - -void gme_effects( Music_Emu const* gme, gme_effects_t* out ) -{ - static gme_effects_t const zero = { 0, 0, 0,0,0,0,0,0, 0, 0, 0,0,0,0,0,0 }; - *out = zero; - - #if !GME_DISABLE_EFFECTS + +void gme_effects( Music_Emu const* gme, gme_effects_t* out ) +{ + static gme_effects_t const zero = { 0, 0, 0,0,0,0,0,0, 0, 0, 0,0,0,0,0,0 }; + *out = zero; + + #if !GME_DISABLE_EFFECTS { Simple_Effects_Buffer* b = STATIC_CAST(Simple_Effects_Buffer*,gme->effects_buffer_); if ( b ) diff --git a/Frameworks/GME/gme/gme.h b/Frameworks/GME/gme/gme.h index 41c363a8f..ffac6a7ee 100644 --- a/Frameworks/GME/gme/gme.h +++ b/Frameworks/GME/gme/gme.h @@ -44,7 +44,7 @@ void gme_delete( gme_t* ); /* Sets time to start fading track out. Once fade ends track_ended() returns true. Fade time can be changed while track is playing. */ -void gme_set_fade( gme_t*, int start_msec ); +void gme_set_fade( gme_t*, int start_msec, int length_msec ); /* True if a track has reached its end */ gme_bool gme_track_ended( const gme_t* );