chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed GME track length limiting when seeking backwards

Browse source
This commit is contained in:
Chris Moeller 2013-10-31 17:35:18 -07:00
parent 2cfdacf890
commit 355df0b3b0
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Frameworks/GME/gme/Music_Emu.cpp
View file

@ -14,13 +14,13 @@ License along with this module; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
#include "blargg_source.h" #include "blargg_source.h"
int const stereo = 2; // number of channels for stereo int const stereo = 2; // number of channels for stereo
Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180, 0,0,0,0,0,0,0,0 }; Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180, 0,0,0,0,0,0,0,0 };
void Music_Emu::clear_track_vars() void Music_Emu::clear_track_vars()
{ {
current_track_ = -1; current_track_ = -1;
warning(); // clear warning warning(); // clear warning
track_filter.stop(); track_filter.stop();
@ -40,6 +40,8 @@ Music_Emu::gme_t()
mute_mask_ = 0; mute_mask_ = 0;
tempo_ = 1.0; tempo_ = 1.0;
gain_ = 1.0; gain_ = 1.0;
fade_set = false;
// defaults // defaults
tfilter = track_filter.setup(); tfilter = track_filter.setup();
@ -152,7 +154,11 @@ blargg_err_t Music_Emu::seek( int msec )
{ {
int time = msec_to_samples( msec ); int time = msec_to_samples( msec );
if ( time < track_filter.sample_count() ) if ( time < track_filter.sample_count() )
{
RETURN_ERR( start_track( current_track_ ) ); RETURN_ERR( start_track( current_track_ ) );
if ( fade_set )
set_fade( length_msec, fade_msec );
}
return skip( time - track_filter.sample_count() ); return skip( time - track_filter.sample_count() );
} }
@ -211,6 +217,9 @@ blargg_err_t Music_Emu::start_track( int track )
void Music_Emu::set_fade( int start_msec, int length_msec ) void Music_Emu::set_fade( int start_msec, int length_msec )
{ {
fade_set = true;
this->length_msec = start_msec;
this->fade_msec = length_msec;
track_filter.set_fade( msec_to_samples( start_msec ), track_filter.set_fade( msec_to_samples( start_msec ),
length_msec * sample_rate() / (1000 / stereo) ); length_msec * sample_rate() / (1000 / stereo) );
} }

4
Frameworks/GME/gme/Music_Emu.h
View file

@ -196,6 +196,10 @@ private:
double gain_; double gain_;
int sample_rate_; int sample_rate_;
int current_track_; int current_track_;
bool fade_set;
int length_msec;
int fade_msec;
void clear_track_vars(); void clear_track_vars();
int msec_to_samples( int msec ) const; int msec_to_samples( int msec ) const;