changeset 317:3b3887985a5c trunk

[svn] - if buf.size() == 0, bail
author nenolod
date Thu, 30 Nov 2006 20:18:38 -0800
parents fb513e10174e
children eb5d48fcf8ea
files ChangeLog src/console/Fir_Resampler.cxx
diffstat 2 files changed, 122 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Nov 30 19:54:33 2006 -0800
+++ b/ChangeLog	Thu Nov 30 20:18:38 2006 -0800
@@ -1,3 +1,121 @@
+2006-12-01 03:54:33 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [692]
+  - merge libconsole-blargg into mainline libconsole:
+    + obsoletes plugins-ugly:sapplug
+  
+  trunk/src/console/Audacious_Config.cxx |    3 
+  trunk/src/console/Audacious_Config.h   |    3 
+  trunk/src/console/Audacious_Driver.cxx |  838 ++++------------
+  trunk/src/console/Ay_Apu.cxx           |  391 +++++++
+  trunk/src/console/Ay_Apu.h             |  106 ++
+  trunk/src/console/Ay_Cpu.cxx           | 1653 ++++++++++++++++++++++++++++++++
+  trunk/src/console/Ay_Cpu.h             |   92 +
+  trunk/src/console/Ay_Emu.cxx           |  346 ++++++
+  trunk/src/console/Ay_Emu.h             |   63 +
+  trunk/src/console/Blip_Buffer.cxx      |  144 +-
+  trunk/src/console/Blip_Buffer.h        |  309 ++++--
+  trunk/src/console/Classic_Emu.cxx      |  160 ++-
+  trunk/src/console/Classic_Emu.h        |  112 +-
+  trunk/src/console/Data_Reader.cxx      |  316 ++++++
+  trunk/src/console/Data_Reader.h        |  156 +++
+  trunk/src/console/Dual_Resampler.cxx   |   87 -
+  trunk/src/console/Dual_Resampler.h     |   25 
+  trunk/src/console/Effects_Buffer.cxx   |  529 ++++++++++
+  trunk/src/console/Effects_Buffer.h     |   86 +
+  trunk/src/console/Fir_Resampler.cxx    |  133 --
+  trunk/src/console/Fir_Resampler.h      |   25 
+  trunk/src/console/Gb_Apu.cxx           |   87 -
+  trunk/src/console/Gb_Apu.h             |   31 
+  trunk/src/console/Gb_Cpu.cxx           |  320 ++----
+  trunk/src/console/Gb_Cpu.h             |  110 --
+  trunk/src/console/Gb_Oscs.cxx          |   24 
+  trunk/src/console/Gb_Oscs.h            |   11 
+  trunk/src/console/Gbs_Emu.cxx          |  418 +++-----
+  trunk/src/console/Gbs_Emu.h            |   98 -
+  trunk/src/console/Gme_File.cxx         |  210 ++++
+  trunk/src/console/Gme_File.h           |  129 ++
+  trunk/src/console/Gym_Emu.cxx          |  322 +++---
+  trunk/src/console/Gym_Emu.h            |   60 -
+  trunk/src/console/Hes_Apu.cxx          |  315 ++++++
+  trunk/src/console/Hes_Apu.h            |   65 +
+  trunk/src/console/Hes_Cpu.cxx          | 1302 +++++++++++++++++++++++++
+  trunk/src/console/Hes_Cpu.h            |  124 ++
+  trunk/src/console/Hes_Emu.cxx          |  507 +++++++++
+  trunk/src/console/Hes_Emu.h            |   93 +
+  trunk/src/console/Kss_Cpu.cxx          | 1699 +++++++++++++++++++++++++++++++++
+  trunk/src/console/Kss_Cpu.h            |  124 ++
+  trunk/src/console/Kss_Emu.cxx          |  403 +++++++
+  trunk/src/console/Kss_Emu.h            |   95 +
+  trunk/src/console/Kss_Scc_Apu.cxx      |   95 +
+  trunk/src/console/Kss_Scc_Apu.h        |  111 ++
+  trunk/src/console/M3u_Playlist.cxx     |  406 +++++++
+  trunk/src/console/M3u_Playlist.h       |   67 +
+  trunk/src/console/Makefile             |   83 -
+  trunk/src/console/Multi_Buffer.cxx     |  205 ++-
+  trunk/src/console/Multi_Buffer.h       |   93 -
+  trunk/src/console/Music_Emu.cxx        |  392 ++++++-
+  trunk/src/console/Music_Emu.h          |  250 +++-
+  trunk/src/console/Nes_Apu.cxx          |   76 -
+  trunk/src/console/Nes_Apu.h            |   39 
+  trunk/src/console/Nes_Cpu.cxx          |  926 ++++++++++-------
+  trunk/src/console/Nes_Cpu.h            |  188 +--
+  trunk/src/console/Nes_Fme7_Apu.cxx     |   29 
+  trunk/src/console/Nes_Fme7_Apu.h       |   29 
+  trunk/src/console/Nes_Namco_Apu.cxx    |   32 
+  trunk/src/console/Nes_Namco_Apu.h      |   36 
+  trunk/src/console/Nes_Oscs.cxx         |  135 +-
+  trunk/src/console/Nes_Oscs.h           |   17 
+  trunk/src/console/Nes_Vrc6_Apu.cxx     |   39 
+  trunk/src/console/Nes_Vrc6_Apu.h       |   37 
+  trunk/src/console/Nsf_Emu.cxx          |  835 +++++++---------
+  trunk/src/console/Nsf_Emu.h            |  127 --
+  trunk/src/console/Nsfe_Emu.cxx         |  312 +++---
+  trunk/src/console/Nsfe_Emu.h           |  113 --
+  trunk/src/console/Sap_Apu.cxx          |  334 ++++++
+  trunk/src/console/Sap_Apu.h            |   77 +
+  trunk/src/console/Sap_Cpu.cxx          | 1010 +++++++++++++++++++
+  trunk/src/console/Sap_Cpu.h            |   83 +
+  trunk/src/console/Sap_Emu.cxx          |  438 ++++++++
+  trunk/src/console/Sap_Emu.h            |   65 +
+  trunk/src/console/Sms_Apu.cxx          |   81 -
+  trunk/src/console/Sms_Apu.h            |   26 
+  trunk/src/console/Sms_Oscs.h           |   12 
+  trunk/src/console/Snes_Spc.cxx         |  259 ++---
+  trunk/src/console/Snes_Spc.h           |   46 
+  trunk/src/console/Spc_Cpu.cxx          |   87 -
+  trunk/src/console/Spc_Cpu.h            |    7 
+  trunk/src/console/Spc_Dsp.cxx          |  109 +-
+  trunk/src/console/Spc_Dsp.h            |    7 
+  trunk/src/console/Spc_Emu.cxx          |  315 ++++--
+  trunk/src/console/Spc_Emu.h            |   69 -
+  trunk/src/console/Vfs_File.cxx         |   34 
+  trunk/src/console/Vfs_File.h           |   18 
+  trunk/src/console/Vgm_Emu.cxx          |  394 ++++---
+  trunk/src/console/Vgm_Emu.h            |  100 -
+  trunk/src/console/Vgm_Emu_Impl.cxx     |   32 
+  trunk/src/console/Vgm_Emu_Impl.h       |    7 
+  trunk/src/console/Ym2413_Emu.cxx       |    2 
+  trunk/src/console/Ym2413_Emu.h         |    5 
+  trunk/src/console/Ym2612_Emu.cxx       |   19 
+  trunk/src/console/Ym2612_Emu.h         |    5 
+  trunk/src/console/blargg_common.h      |  254 +---
+  trunk/src/console/blargg_config.h      |   26 
+  trunk/src/console/blargg_endian.h      |  186 +--
+  trunk/src/console/blargg_source.h      |   44 
+  trunk/src/console/gb_cpu_io.h          |   69 +
+  trunk/src/console/gme.cxx              |  176 +++
+  trunk/src/console/gme.h                |  201 +++
+  trunk/src/console/gme_design.txt       |  171 +++
+  trunk/src/console/gme_notes.txt        |  509 +++++++--
+  trunk/src/console/gme_readme.txt       |  181 ++-
+  trunk/src/console/gme_type_list.cxx    |   38 
+  trunk/src/console/hes_cpu_io.h         |  101 +
+  trunk/src/console/nes_cpu_io.h         |   82 +
+  trunk/src/console/readme.txt           |   85 +
+  trunk/src/console/sap_cpu_io.h         |   26 
+  110 files changed, 17868 insertions(+), 4718 deletions(-)
+
+
 2006-11-29 22:42:11 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [690]
   Metronom (a.k.a. tact generator) input plugin, ported from XMMS.
--- a/src/console/Fir_Resampler.cxx	Thu Nov 30 19:54:33 2006 -0800
+++ b/src/console/Fir_Resampler.cxx	Thu Nov 30 20:18:38 2006 -0800
@@ -190,6 +190,10 @@
 	int avail = remain - width_ * stereo;
 	if ( count > avail )
 		count = avail;
+
+	/* if the resampler is not used, then bail --nenolod */
+	if ( buf.size() == 0 )
+		return count;
 	
 	remain -= count;
 	write_pos = &buf [remain];