From 17e9c7d05befafc38d0fb1db56acfa7c78e244db Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Wed, 22 Oct 2003 03:53:23 +0000
Subject: [PATCH] Remove sample compression option

---
 zsnes/src/cfgload.asm      | 11 +----------
 zsnes/src/cpu/dspproc.asm  |  2 +-
 zsnes/src/dos/zloader.c    |  8 +-------
 zsnes/src/gui/gui.asm      |  2 +-
 zsnes/src/linux/zloaderw.c |  2 +-
 zsnes/src/ui.asm           |  1 -
 zsnes/src/win/zloaderw.c   |  7 +------
 7 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm
index f98c6689..6005516e 100644
--- a/zsnes/src/cfgload.asm
+++ b/zsnes/src/cfgload.asm
@@ -22,7 +22,7 @@ EXTSYM JoyXC,JoyYC,LoadDir,LoadDrive,SRAMDrive,mode7tab
 EXTSYM pl1selk,pl1startk,pl1upk,pl2Ak,pl2Bk,pl2Lk,pl2Rk
 EXTSYM pl2Xk,pl2Yk,pl2contrl,pl2downk,pl2leftk,pl2rightk
 EXTSYM pl2selk,pl2startk,pl2upk,DontSavePath
-EXTSYM Force8b,MusicRelVol,SRAMDir,SoundCompD,SoundQuality
+EXTSYM Force8b,MusicRelVol,SRAMDir,SoundQuality
 EXTSYM StereoSound,antienab,cvidmode,enterpress,frameskip,guioff
 EXTSYM newengen,per2exec,pl1Ak,pl1Bk,pl1Lk,pl1Rk,pl1Xk,pl1Yk
 EXTSYM pl1contrl,pl1downk,pl1leftk,pl1rightk,scanlines,soundon
@@ -1559,15 +1559,6 @@ NEWSYM getcfg
 .nogetreinit
     ret
 
-.getbufdisable
-    cmp dword[.strlenb],1
-    jne .nobufdisable
-    cmp byte[.stringb],'1'
-    jne .nobufdisable
-    mov byte[SoundCompD],1
-.nobufdisable
-    ret
-
 .getstereo
     cmp dword[.strlenb],1
     jne .nostereo
diff --git a/zsnes/src/cpu/dspproc.asm b/zsnes/src/cpu/dspproc.asm
index cb1e9291..eb59c23b 100644
--- a/zsnes/src/cpu/dspproc.asm
+++ b/zsnes/src/cpu/dspproc.asm
@@ -126,7 +126,7 @@ EXTSYM delay
 EXTSYM spcBuffera
 EXTSYM DSPMem
 EXTSYM SoundInterpType
-EXTSYM NoiseData,SoundCompD,Voice0Disable,csounddisable,spcRamcmp
+EXTSYM NoiseData,Voice0Disable,csounddisable,spcRamcmp
 EXTSYM cfgecho,Surround,SoundBufEn
 EXTSYM echobuf,ENVDisable
 EXTSYM LowPassFilterType
diff --git a/zsnes/src/dos/zloader.c b/zsnes/src/dos/zloader.c
index 6d2f0f31..32f38f0d 100644
--- a/zsnes/src/dos/zloader.c
+++ b/zsnes/src/dos/zloader.c
@@ -32,7 +32,7 @@ extern void makeextension(void);
 
 extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
                      MMXSupport, Force8b, ForcePal, GUIClick, MouseDis,
-                     MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
+                     MusicRelVol, ScreenScale, SoundQuality,
                      StereoSound, V8Mode, antienab, cvidmode, debugdisble,
                      debugger, enterpress, finterleave, frameskip,
                      gammalevel, guioff, per2exec, pl1contrl, pl2contrl,
@@ -339,12 +339,6 @@ int pccmdline(void)
           }
           break;
         }
-        case 'b':
-        {
-          SoundCompD=1;
-          break;
-        }
-
         case 'c':
         {
           if(nn == 'c')
diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index ade2918e..1c61c3c9 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -66,7 +66,7 @@
 
 EXTSYM curblank, vidpastecopyscr, frameskip, newengen, vsyncon
 EXTSYM cvidmode, antienab, smallscreenon, smallscreence,NetQuit
-EXTSYM soundon, StereoSound, SoundCompD, SoundQuality, MusicRelVol
+EXTSYM soundon, StereoSound, SoundQuality, MusicRelVol
 EXTSYM endprog, continueprog, spcBuffera, spcRamcmp, cbitmode, makepal
 EXTSYM t1cc, LoadDir, SRAMDir, LoadDrive,SRAMDrive, initsnes, romloadskip
 EXTSYM fname, makeextension, sram, clearmem2, loadfileGUI, GUIloadfailed
diff --git a/zsnes/src/linux/zloaderw.c b/zsnes/src/linux/zloaderw.c
index 31a0dd5f..1e126fb7 100644
--- a/zsnes/src/linux/zloaderw.c
+++ b/zsnes/src/linux/zloaderw.c
@@ -38,7 +38,7 @@ extern void makeextension(void);
 
 extern unsigned char	Palette0, SPC700sh, OffBy1Line, DSPDisable,
 			MMXSupport, Force8b, ForcePal, ForceNTSC, GUIClick, MouseDis,
-			MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
+			MusicRelVol, ScreeScale, SoundQuality,
 			StereoSound, V8Mode, antienab, cvidmode, debugdisble,
 			debugger, enterpress, finterleave, frameskip,
 			gammalevel, guioff, per2exec, pl1contrl, pl2contrl,
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 01a0041d..bdd3f979 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -162,7 +162,6 @@ YesMMX    db 'MMX support found and enabled.',13,10,13,10,0
 ; global variables
 
 NEWSYM per2exec,      dd 100            ; percentage of opcodes to execute
-NEWSYM SoundCompD,    db 1              ; Disable Sound Compression Buffering (1=y)
 
 %ifdef __MSDOS__
 NEWSYM cvidmode,      db 4              ; video mode, 0=320x240, 1=256x256
diff --git a/zsnes/src/win/zloaderw.c b/zsnes/src/win/zloaderw.c
index 241f8437..94570224 100644
--- a/zsnes/src/win/zloaderw.c
+++ b/zsnes/src/win/zloaderw.c
@@ -35,7 +35,7 @@ int pccmdline(void);
 
 extern unsigned char Palette0, SPC700sh, OffBy1Line, DSPDisable,
                      MMXSupport, Force8b, ForcePal, GUIClick, MouseDis,
-                     MusicRelVol, ScreenScale, SoundCompD, SoundQuality,
+                     MusicRelVol, ScreenScale, SoundQuality,
                      StereoSound, V8Mode, antienab, cvidmode, debugdisble,
                      debugger, enterpress, finterleave, frameskip,
                      gammalevel, guioff, per2exec, pl1contrl, pl2contrl,
@@ -629,11 +629,6 @@ int pccmdline(void)
 //          }
           break;
         }
-        case 'b':
-        {
-          SoundCompD=1;
-          break;
-        }
         case 'c':
         {
           if(nn == 'c')