From fc4526d5bbcdc08a74726dacb1d6b0f821003837 Mon Sep 17 00:00:00 2001
From: hegyak <hegyak@gmail.com>
Date: Fri, 10 Oct 2014 09:27:47 +0000
Subject: [PATCH] Merge r7965 from Trunk into branches/release. This fixes Sega
 CD Scanning (fast forward and rewind).

---
 Dist/MakeRelease.bat        |   2 ++
 genplus-gx/core/cd_hw/cdd.c |   1 +
 output/dll/libgenplusgx.dll | Bin 1916416 -> 1916416 bytes
 3 files changed, 3 insertions(+)

diff --git a/Dist/MakeRelease.bat b/Dist/MakeRelease.bat
index e7e730c83e5..6b7d2949f1f 100644
--- a/Dist/MakeRelease.bat
+++ b/Dist/MakeRelease.bat
@@ -14,6 +14,7 @@ copy *.dll dll
 zip -X -r ..\Dist\BizHawk.zip EmuHawk.exe DiscoHawk.exe defctrl.json dll shaders gamedb NES\Palettes Lua Gameboy\Palettes -x *.pdb -x *.lib -x *.pgd -x *.exp -x dll\libsneshawk-64*.exe
 
 cd ..\Dist
+
 unzip BizHawk.zip -d temp
 del BizHawk.zip
 
@@ -21,6 +22,7 @@ rmdir /s /q temp\lua
 svn export ..\output\lua temp\Lua
 
 cd temp
+md firmware
 upx -d dll\*.dll
 upx -d dll\*.exe
 upx -d *.exe
diff --git a/genplus-gx/core/cd_hw/cdd.c b/genplus-gx/core/cd_hw/cdd.c
index 2d70fd89256..4b334e278ae 100644
--- a/genplus-gx/core/cd_hw/cdd.c
+++ b/genplus-gx/core/cd_hw/cdd.c
@@ -472,6 +472,7 @@ void cdd_update(void)
   {
     /* fast-forward or fast-rewind */
     cdd.lba += cdd.scanOffset;
+	cdd.sampleLba += cdd.scanOffset;
 
     /* check current track limits */
     if (cdd.lba >= cdd.toc.tracks[cdd.index].end)
diff --git a/output/dll/libgenplusgx.dll b/output/dll/libgenplusgx.dll
index 7bd6bde7287c54a2d5d6b90519304c8652b0f13e..8032b2f5b94fe67609a82455ee43c865970f938c 100644
GIT binary patch
delta 274
zcmZqpQ_}FKWWopLUIX)qpM9C7q~$g{GrBS|Mr`h6dOMqO@8t4%D&jL37#J4LsCX^V
z%{v81GO{iKlFTP2ub#KAIbnW#!hA*`W&&bnAZ7t#Rv=~rVs;?r0Afxc=GvYxpL@z`
zkWKC1y?B6_7l`?Qm>-A*fLIWSg@9NXh(&-{bo+NNv8f#b4$rRFPU5`kwrgeEG>s+i
z`?k-yEGEIq++kq8eftfu&03lZtd?1=vD$34)9QfLNvjK1*R1Yay|8+3_0@{en%!E+
qTH0FCTFqL=+IadzX7O|Fi7etkECIxlKr98s(m*V;J&{Frz9j(U%x?Ao

delta 271
zcmZqpQ_}FKWWopLfBR)7e)eT{ijm#y%;?I<7`C~S>FsRBZIjFAsR&GDU|{Ixol@~y
zfSGp&kes|}-nz*Tl-ZjT=C>!zX9Qv<AZ7+)79eH?Vm2UV2VxE&<^*D{?FsX_r>q89
z)BfFy2Z(urm=B2gfmi^D1%X%yh=qYz1c*hqfA<ob+99w|=u1v%${~-nYc3Z}6}j+Z
z`<%;S60FQW_seYGenV`tmij`g<yLE~Hd*boI%IXy>b%trtA|!EtlnAuvSP62widCL
pvX-}2wbq$FnOXcCBSU)vi#QNV0I?(xO98Po5X)>&V3A#52>>9pZ^i%s