1 files changed, 102 insertions, 271 deletions

diff --git a/apps/codecs/libgme/kss_emu.c b/apps/codecs/libgme/kss_emu.c
index 060a5b74b0..ba80ef613e 100644
--- a/apps/codecs/libgme/kss_emu.c
+++ b/apps/codecs/libgme/kss_emu.c
@@ -1,4 +1,4 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
 
 #include "kss_emu.h"
 
@@ -17,29 +17,14 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
 
 #include "blargg_source.h"
 
-long const clock_rate = 3579545;
+int const clock_rate = 3579545;
 
 const char gme_wrong_file_type [] = "Wrong file type for this emulator";
 
-int const stereo = 2; // number of channels for stereo
-int const silence_max = 6; // seconds
-int const silence_threshold = 0x10;
-long const fade_block_size = 512;
-int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
-
 static void clear_track_vars( struct Kss_Emu* this )
 {
-        this->current_track   = -1;
-        this->out_time         = 0;
-        this->emu_time         = 0;
-        this->emu_track_ended_ = true;
-        this->track_ended      = true;
-        this->fade_start       = INT_MAX / 2 + 1;
-        this->fade_step        = 1;
-        this->silence_time     = 0;
-        this->silence_count    = 0;
-        this->buf_remain       = 0;
-        // warning(); // clear warning
+        this->current_track    = -1;
+        track_stop( &this->track_filter );
 }
 
 static blargg_err_t init_opl_apu( enum opl_type_t type, struct Opl_Apu* out )
@@ -58,17 +43,15 @@ void Kss_init( struct Kss_Emu* this )
         this->chip_flags = 0;
         
         // defaults
-        this->max_initial_silence = 2;
-        this->silence_lookahead   = 6;
-        this->ignore_silence     = false;
-        
-        this->voice_count = 0;
-        clear_track_vars( this );
+        this->tfilter = *track_get_setup( &this->track_filter );
+        this->tfilter.max_initial = 2;
+        this->tfilter.lookahead   = 6;
+        this->track_filter.silence_ignored_ = false;
         
         memset( this->unmapped_read, 0xFF, sizeof this->unmapped_read );
         
         // Init all stuff
-        Buffer_init( &this->stereo_buffer );
+        Buffer_init( &this->stereo_buf );
         
         Z80_init( &this->cpu );
         Rom_init( &this->rom, page_size );
@@ -83,6 +66,10 @@ void Kss_init( struct Kss_Emu* this )
         init_opl_apu( type_msxmusic, &this->msx.music );
         init_opl_apu( type_msxaudio, &this->msx.audio );
 #endif
+
+        this->voice_count = 0;
+        this->voice_types = 0;
+        clear_track_vars( this );
 }
 
 // Track info
@@ -96,7 +83,7 @@ static blargg_err_t check_kss_header( void const* header )
 
 // Setup
 
-static void update_gain( struct Kss_Emu* this )
+static void update_gain_( struct Kss_Emu* this )
 {
         int g = this->gain;
         if ( msx_music_enabled( this ) || msx_audio_enabled( this ) 
@@ -118,6 +105,15 @@ static void update_gain( struct Kss_Emu* this )
         if ( msx_audio_enabled( this ) ) Opl_volume( &this->msx.audio, g );
 }
 
+static void update_gain( struct Kss_Emu* this )
+{
+        if ( this->scc_accessed )
+        {
+                /* dprintf( "SCC accessed\n" ); */
+                update_gain_( this );
+        }
+}
+
 blargg_err_t Kss_load_mem( struct Kss_Emu* this, const void* data, long size )
 {
         /* warning( core.warning() ); */
@@ -176,6 +172,10 @@ blargg_err_t Kss_load_mem( struct Kss_Emu* this, const void* data, long size )
 
                 // sms.psg
                 this->voice_count = sms_osc_count;
+                static int const types [sms_osc_count + opl_osc_count] = {
+                        wave_type+1, wave_type+3, wave_type+2, mixed_type+1, wave_type+0
+                };
+                this->voice_types = types;
                 this->chip_flags |= sms_psg_flag;
 
                 // sms.fm
@@ -191,6 +191,10 @@ blargg_err_t Kss_load_mem( struct Kss_Emu* this, const void* data, long size )
 
                 // msx.psg
                 this->voice_count = ay_osc_count;
+                static int const types [ay_osc_count + opl_osc_count] = {
+                        wave_type+1, wave_type+3, wave_type+2, wave_type+0
+                };
+                this->voice_types = types;
                 this->chip_flags |= msx_psg_flag;
 
                 /* if ( this->header.device_flags & 0x10 )
@@ -220,21 +224,27 @@ blargg_err_t Kss_load_mem( struct Kss_Emu* this, const void* data, long size )
                         // msx.scc
                         this->chip_flags |= msx_scc_flag;
                         this->voice_count = ay_osc_count + scc_osc_count;
+                        static int const types [ay_osc_count + scc_osc_count] = {
+                                wave_type+1, wave_type+3, wave_type+2,
+                                wave_type+0, wave_type+4, wave_type+5, wave_type+6, wave_type+7,
+                        };
+                        this->voice_types = types;
                 }
         }
 
-        this->silence_lookahead = 6;
+        this->tfilter.lookahead   = 6;
         if ( sms_fm_enabled( this ) || msx_music_enabled( this ) || msx_audio_enabled( this ) )
         {
                 if ( !Opl_supported() )
                         ; /* warning( "FM sound not supported" ); */
                 else
-                        this->silence_lookahead = 3; // Opl_Apu is really slow
+                        this->tfilter.lookahead   = 3; // Opl_Apu is really slow
         }
 
         this->clock_rate_ = clock_rate;
-        Buffer_clock_rate( &this->stereo_buffer, clock_rate );
-        this->buf_changed_count = Buffer_channels_changed_count( &this->stereo_buffer );
+        Buffer_clock_rate( &this->stereo_buf, clock_rate );
+        RETURN_ERR( Buffer_set_channel_count( &this->stereo_buf, this->voice_count, this->voice_types ) );
+        this->buf_changed_count = Buffer_channels_changed_count( &this->stereo_buf );
         
         Sound_set_tempo( this, this->tempo );
         Sound_mute_voices( this, this->mute_mask_ );
@@ -265,8 +275,8 @@ static void set_voice( struct Kss_Emu* this, int i, struct Blip_Buffer* center,
                 }
 
                 if ( msx_scc_enabled( this )   && i < scc_osc_count   ) Scc_set_output( &this->msx.scc, i, center );
-                if ( msx_music_enabled( this ) && i < opl_osc_count ) Opl_set_output( &this->msx.music, center );
-                if ( msx_audio_enabled( this ) && i < opl_osc_count ) Opl_set_output( &this->msx.audio, center );
+                if ( msx_music_enabled( this ) && i < opl_osc_count )   Opl_set_output( &this->msx.music, center );
+                if ( msx_audio_enabled( this ) && i < opl_osc_count )   Opl_set_output( &this->msx.audio, center );
         }
 }
 
@@ -465,15 +475,17 @@ blargg_err_t end_frame( struct Kss_Emu* this, kss_time_t end )
 
 // MUSIC
 
-
-blargg_err_t Kss_set_sample_rate( struct Kss_Emu* this, long rate )
+blargg_err_t Kss_set_sample_rate( struct Kss_Emu* this, int rate )
 {
         require( !this->sample_rate ); // sample rate can't be changed once set
-        RETURN_ERR( Buffer_set_sample_rate( &this->stereo_buffer, rate, 1000 / 20 ) );
+        RETURN_ERR( Buffer_set_sample_rate( &this->stereo_buf, rate, 1000 / 20 ) );
         
         // Set bass frequency
-        Buffer_bass_freq( &this->stereo_buffer, 180 );
+        Buffer_bass_freq( &this->stereo_buf, 180 );
+        
         this->sample_rate = rate;
+        RETURN_ERR( track_init( &this->track_filter, this ) );
+        this->tfilter.max_silence = 6 * stereo * this->sample_rate;
         return 0;
 }
 
@@ -501,7 +513,7 @@ void Sound_mute_voices( struct Kss_Emu* this, int mask )
                 }
                 else
                 {
-                        struct channel_t ch = Buffer_channel( &this->stereo_buffer );
+                        struct channel_t ch = Buffer_channel( &this->stereo_buf, i );
                         assert( (ch.center && ch.left && ch.right) ||
                                         (!ch.center && !ch.left && !ch.right) ); // all or nothing
                         set_voice( this, i, ch.center, ch.left, ch.right );
@@ -523,7 +535,6 @@ void Sound_set_tempo( struct Kss_Emu* this, int t )
         this->play_period = (blip_time_t) ((period * FP_ONE_TEMPO) / t);
 }
 
-void fill_buf( struct Kss_Emu* this );
 blargg_err_t Kss_start_track( struct Kss_Emu* this, int track )
 {
         clear_track_vars( this );
@@ -536,7 +547,7 @@ blargg_err_t Kss_start_track( struct Kss_Emu* this, int track )
 
         this->current_track = track;
         
-        Buffer_clear( &this->stereo_buffer );
+        Buffer_clear( &this->stereo_buf );
         
         if ( sms_psg_enabled( this ) ) Sms_apu_reset( &this->sms.psg, 0, 0 );
         if ( sms_fm_enabled( this )  ) Opl_reset( &this->sms.fm );
@@ -546,7 +557,7 @@ blargg_err_t Kss_start_track( struct Kss_Emu* this, int track )
         if ( msx_audio_enabled( this ) ) Opl_reset( &this->msx.audio );
 
         this->scc_accessed = false;
-        update_gain( this );
+        update_gain_( this );
 
         memset( this->ram, 0xC9, 0x4000 );
         memset( this->ram + 0x4000, 0, sizeof this->ram - 0x4000 );
@@ -598,286 +609,106 @@ blargg_err_t Kss_start_track( struct Kss_Emu* this, int track )
         this->gain_updated = false;
         jsr( this, this->header.init_addr );
         
-        this->emu_track_ended_ = false;
-        this->track_ended     = false;
+        // convert filter times to samples
+        struct setup_t s = this->tfilter;
+        s.max_initial *= this->sample_rate * stereo;
+        #ifdef GME_DISABLE_SILENCE_LOOKAHEAD
+                s.lookahead = 1;
+        #endif
+        track_setup( &this->track_filter, &s );
         
-        if ( !this->ignore_silence )
-        {
-                // play until non-silence or end of track
-                long end;
-                for ( end = this->max_initial_silence * stereo * this->sample_rate; this->emu_time < end; )
-                {
-                        fill_buf( this );
-                        if ( this->buf_remain | (int) this->emu_track_ended_ )
-                                break;
-                }
-                
-                this->emu_time      = this->buf_remain;
-                this->out_time      = 0;
-                this->silence_time  = 0;
-                this->silence_count = 0;
-        }
-        /* return track_ended() ? warning() : 0; */
-        return 0;
+        return track_start( &this->track_filter );
 }
 
 // Tell/Seek
 
-static blargg_long msec_to_samples( blargg_long msec, long sample_rate )
+static int msec_to_samples( int msec, int sample_rate )
 {
-        blargg_long sec = msec / 1000;
+        int sec = msec / 1000;
         msec -= sec * 1000;
         return (sec * sample_rate + msec * sample_rate / 1000) * stereo;
 }
 
-long Track_tell( struct Kss_Emu* this )
+int Track_tell( struct Kss_Emu* this )
 {
-        blargg_long rate = this->sample_rate * stereo;
-        blargg_long sec = this->out_time / rate;
-        return sec * 1000 + (this->out_time - sec * rate) * 1000 / rate;
+        int rate = this->sample_rate * stereo;
+        int sec = track_sample_count( &this->track_filter ) / rate;
+        return sec * 1000 + (track_sample_count( &this->track_filter ) - sec * rate) * 1000 / rate;
 }
 
-blargg_err_t Track_seek( struct Kss_Emu* this, long msec )
+blargg_err_t Track_seek( struct Kss_Emu* this, int msec )
 {
-        blargg_long time = msec_to_samples( msec, this->sample_rate );
-        if ( time < this->out_time )
-                RETURN_ERR( Kss_start_track( this, this->current_track ) );
-        return Track_skip( this, time - this->out_time );
+        int time = msec_to_samples( msec, this->sample_rate );
+        if ( time < track_sample_count( &this->track_filter ) )
+        RETURN_ERR( Kss_start_track( this, this->current_track ) );
+        return Track_skip( this, time - track_sample_count( &this->track_filter ) );
 }
 
-blargg_err_t play_( struct Kss_Emu* this, long count, sample_t* out );
-static blargg_err_t skip_( struct Kss_Emu* this, long count )
+blargg_err_t skip_( void *emu, int count )
 {
+        struct Kss_Emu* this = (struct Kss_Emu*) emu;
+        
         // for long skip, mute sound
-        const long threshold = 30000;
+        const int threshold = 32768;
         if ( count > threshold )
         {
                 int saved_mute = this->mute_mask_;
                 Sound_mute_voices( this, ~0 );
-                
-                while ( count > threshold / 2 && !this->emu_track_ended_ )
-                {
-                        RETURN_ERR( play_( this, buf_size, this->buf ) );
-                        count -= buf_size;
-                }
-                
-                Sound_mute_voices( this, saved_mute );
-        }
-        
-        while ( count && !this->emu_track_ended_ )
-        {
-                long n = buf_size;
-                if ( n > count )
-                        n = count;
-                count -= n;
-                RETURN_ERR( play_( this, n, this->buf ) );
-        }
-        return 0;
-}
 
-blargg_err_t Track_skip( struct Kss_Emu* this, long count )
-{
-        require( this->current_track >= 0 ); // start_track() must have been called already
-        this->out_time += count;
-        
-        // remove from silence and buf first
-        {
-                long n = min( count, this->silence_count );
-                this->silence_count -= n;
-                count -= n;
-                
-                n = min( count, this->buf_remain );
-                this->buf_remain -= n;
+                int n = count - threshold/2;
+                n &= ~(2048-1); // round to multiple of 2048
                 count -= n;
-        }
-                
-        if ( count && !this->emu_track_ended_ )
-        {
-                this->emu_time += count;
-                if ( skip_( this, count ) )
-                        this->emu_track_ended_ = true;
-        }
-        
-        if ( !(this->silence_count | this->buf_remain) ) // caught up to emulator, so update track ended
-                this->track_ended |= this->emu_track_ended_;
-        
-        return 0;
-}
-
-// Fading
+                RETURN_ERR( skippy_( &this->track_filter, n ) );
 
-void Track_set_fade( struct Kss_Emu* this, long start_msec, long length_msec )
-{
-        this->fade_step = this->sample_rate * length_msec / (fade_block_size * fade_shift * 1000 / stereo);
-        this->fade_start = msec_to_samples( start_msec, this->sample_rate );
-}
-
-// unit / pow( 2.0, (double) x / step )
-static int int_log( blargg_long x, int step, int unit )
-{
-        int shift = x / step;
-        int fraction = (x - shift * step) * unit / step;
-        return ((unit - fraction) + (fraction >> 1)) >> shift;
-}
-
-static void handle_fade( struct Kss_Emu *this, long out_count, sample_t* out )
-{
-        int i;
-        for ( i = 0; i < out_count; i += fade_block_size )
-        {
-                int const shift = 14;
-                int const unit = 1 << shift;
-                int gain = int_log( (this->out_time + i - this->fade_start) / fade_block_size,
-                                this->fade_step, unit );
-                if ( gain < (unit >> fade_shift) )
-                        this->track_ended = this->emu_track_ended_ = true;
-                
-                sample_t* io = &out [i];
-                int count;
-                for ( count = min( fade_block_size, out_count - i ); count; --count )
-                {
-                        *io = (sample_t) ((*io * gain) >> shift);
-                        ++io;
-                }
+                Sound_mute_voices( this, saved_mute );
         }
-}
-
-// Silence detection
 
-static void emu_play( struct Kss_Emu* this, long count, sample_t* out )
-{
-        check( current_track_ >= 0 );
-        this->emu_time += count;
-        if ( this->current_track >= 0 && !this->emu_track_ended_ ) {
-                if ( play_( this, count, out ) )        
-                        this->emu_track_ended_ = true;
-        }
-        else
-                memset( out, 0, count * sizeof *out );
+        return skippy_( &this->track_filter, count );
 }
 
-// number of consecutive silent samples at end
-static long count_silence( sample_t* begin, long size )
+blargg_err_t Track_skip( struct Kss_Emu* this, int count )
 {
-        sample_t first = *begin;
-        *begin = silence_threshold; // sentinel
-        sample_t* p = begin + size;
-        while ( (unsigned) (*--p + silence_threshold / 2) <= (unsigned) silence_threshold ) { }
-        *begin = first;
-        return size - (p - begin);
+        require( this->current_track >= 0 ); // start_track() must have been called already
+        return track_skip( &this->track_filter, count );
 }
 
-// fill internal buffer and check it for silence
-void fill_buf( struct Kss_Emu* this )
+void Track_set_fade( struct Kss_Emu* this, int start_msec, int length_msec )
 {
-        assert( !this->buf_remain );
-        if ( !this->emu_track_ended_ )
-        {
-                emu_play( this, buf_size, this->buf );
-                long silence = count_silence( this->buf, buf_size );
-                if ( silence < buf_size )
-                {
-                        this->silence_time = this->emu_time - silence;
-                        this->buf_remain   = buf_size;
-                        return;
-                }
-        }
-        this->silence_count += buf_size;
+        track_set_fade( &this->track_filter, msec_to_samples( start_msec, this->sample_rate ),
+                length_msec * this->sample_rate / (1000 / stereo) );
 }
 
-blargg_err_t Kss_play( struct Kss_Emu* this, long out_count, sample_t* out )
+blargg_err_t Kss_play( struct Kss_Emu* this, int out_count, sample_t* out )
 {
-        if ( this->track_ended )
-        {
-                memset( out, 0, out_count * sizeof *out );
-        }
-        else
-        {
-                require( this->current_track >= 0 );
-                require( out_count % stereo == 0 );
-                
-                assert( this->emu_time >= this->out_time );
-                
-                // prints nifty graph of how far ahead we are when searching for silence
-                //debug_printf( "%*s \n", int ((emu_time - out_time) * 7 / sample_rate()), "*" );
-                
-                long pos = 0;
-                if ( this->silence_count )
-                {
-                        // during a run of silence, run emulator at >=2x speed so it gets ahead
-                        long ahead_time = this->silence_lookahead * (this->out_time + out_count -this->silence_time) + this->silence_time;
-                        while ( this->emu_time < ahead_time && !(this->buf_remain |this-> emu_track_ended_) )
-                                fill_buf( this );
-                        
-                        // fill with silence
-                        pos = min( this->silence_count, out_count );
-                        memset( out, 0, pos * sizeof *out );
-                        this->silence_count -= pos;
-                        
-                        if ( this->emu_time - this->silence_time > silence_max * stereo * this->sample_rate )
-                        {
-                                this->track_ended  = this->emu_track_ended_ = true;
-                                this->silence_count = 0;
-                                this->buf_remain    = 0;
-                        }
-                }
-                
-                if ( this->buf_remain )
-                {
-                        // empty silence buf
-                        long n = min( this->buf_remain, out_count - pos );
-                        memcpy( &out [pos], this->buf + (buf_size - this->buf_remain), n * sizeof *out );
-                        this->buf_remain -= n;
-                        pos += n;
-                }
-                
-                // generate remaining samples normally
-                long remain = out_count - pos;
-                if ( remain )
-                {
-                        emu_play( this, remain, out + pos );
-                        this->track_ended |= this->emu_track_ended_;
-                        
-                        if ( !this->ignore_silence || this->out_time > this->fade_start )
-                        {
-                                // check end for a new run of silence
-                                long silence = count_silence( out + pos, remain );
-                                if ( silence < remain )
-                                        this->silence_time = this->emu_time - silence;
-                                
-                                if ( this->emu_time - this->silence_time >= buf_size )
-                                        fill_buf( this ); // cause silence detection on next play()
-                        }
-                }
-                
-                if ( this->out_time > this->fade_start )
-                        handle_fade( this, out_count, out );
-        }
-        this->out_time += out_count;
-        return 0;
+        require( this->current_track >= 0 );
+        require( out_count % stereo == 0 );
+        return track_play( &this->track_filter, out_count, out );
 }
 
-blargg_err_t play_( struct Kss_Emu* this, long count, sample_t* out )
+blargg_err_t play_( void *emu, int count, sample_t* out )
 {
-        long remain = count;
+        struct Kss_Emu* this = (struct Kss_Emu*) emu;
+        
+        int remain = count;
         while ( remain )
         {
-                remain -= Buffer_read_samples( &this->stereo_buffer, &out [count - remain], remain );
+                Buffer_disable_immediate_removal( &this->stereo_buf );
+                remain -= Buffer_read_samples( &this->stereo_buf, &out [count - remain], remain );
                 if ( remain )
                 {
-                        if ( this->buf_changed_count != Buffer_channels_changed_count( &this->stereo_buffer ) )
+                        if ( this->buf_changed_count != Buffer_channels_changed_count( &this->stereo_buf ) )
                         {
-                                this->buf_changed_count = Buffer_channels_changed_count( &this->stereo_buffer );
+                                this->buf_changed_count = Buffer_channels_changed_count( &this->stereo_buf );
+                                
+                                // Remute voices
                                 Sound_mute_voices( this, this->mute_mask_ );
                         }
-                        int msec = Buffer_length( &this->stereo_buffer );
-                        /* blip_time_t clocks_emulated = (blargg_long) msec * clock_rate_ / 1000; */
+                        int msec = Buffer_length( &this->stereo_buf );
                         blip_time_t clocks_emulated = msec * this->clock_rate_ / 1000 - 100;
                         RETURN_ERR( run_clocks( this, &clocks_emulated ) );
                         assert( clocks_emulated );
-                        Buffer_end_frame( &this->stereo_buffer, clocks_emulated );
+                        Buffer_end_frame( &this->stereo_buf, clocks_emulated );
                 }
         }
         return 0;
 }
-