Regenerated from Universal Headers 3.3.2
diff --git a/Mac/Lib/lib-toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
index fed7e44..0bc8944 100644
--- a/Mac/Lib/lib-toolbox/Sound.py
+++ b/Mac/Lib/lib-toolbox/Sound.py
@@ -1,28 +1,31 @@
-# Generated from 'Macintosh HD:SWDev:Codewarrior Pro 5:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
+# Generated from 'Macintosh HD:SWDev:Metrowerks Codewarrior 6.0:Metrowerks CodeWarrior:MacOS Support:Universal:Interfaces:CIncludes:Sound.h'
 
 def FOUR_CHAR_CODE(x): return x
-soundListRsrc = FOUR_CHAR_CODE('snd ')
-kSimpleBeepID = 1
+soundListRsrc = FOUR_CHAR_CODE('snd ')        
+kSimpleBeepID = 1                             
 # rate48khz = (long)0xBB800000
 # rate44khz = (long)0xAC440000
+rate32khz = 0x7D000000
 rate22050hz = 0x56220000
 rate22khz = 0x56EE8BA3
+rate16khz = 0x3E800000
 rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
+rate8khz = 0x1F400000                    
+sampledSynth = 5                             
 squareWaveSynth = 1
 waveTableSynth = 3
-sampledSynth = 5
 MACE3snthID = 11
 MACE6snthID = 13
-kMiddleC = 60
+kMiddleC = 60                            
 kNoVolume = 0
-kFullVolume = 0x0100
+kFullVolume = 0x0100                        
 stdQLength = 128
 dataOffsetFlag = 0x8000
-kUseOptionalOutputDevice = -1
+kUseOptionalOutputDevice = -1                            
 notCompressed = 0
 fixedCompression = -1
-variableCompression = -2
+variableCompression = -2                            
 twoToOne = 1
 eightToThree = 2
 threeToOne = 3
@@ -32,20 +35,18 @@
 stateBlockSize = 64
 leftOverBlockSize = 32
 firstSoundFormat = 0x0001
-secondSoundFormat = 0x0002
+secondSoundFormat = 0x0002                        
 dbBufferReady = 0x00000001
-dbLastBuffer = 0x00000004
+dbLastBuffer = 0x00000004                    
 sysBeepDisable = 0x0000
 sysBeepEnable = (1 << 0)
-sysBeepSynchronous = (1 << 1)
+sysBeepSynchronous = (1 << 1)                      
 unitTypeNoSelection = 0xFFFF
 unitTypeSeconds = 0x0000
 stdSH = 0x00
 extSH = 0xFF
-cmpSH = 0xFE
+cmpSH = 0xFE                          
 nullCmd = 0
-initCmd = 1
-freeCmd = 2
 quietCmd = 3
 flushCmd = 4
 reInitCmd = 5
@@ -56,6 +57,18 @@
 syncCmd = 14
 availableCmd = 24
 versionCmd = 25
+volumeCmd = 46
+getVolumeCmd = 47
+clockComponentCmd = 50
+getClockComponentCmd = 51
+scheduledSoundCmd = 52
+linkSoundComponentsCmd = 53
+soundCmd = 80
+bufferCmd = 81
+rateMultiplierCmd = 86
+getRateMultiplierCmd = 87
+initCmd = 1
+freeCmd = 2
 totalLoadCmd = 26
 loadCmd = 27
 freqDurationCmd = 40
@@ -64,24 +77,14 @@
 ampCmd = 43
 timbreCmd = 44
 getAmpCmd = 45
-volumeCmd = 46
-getVolumeCmd = 47
-clockComponentCmd = 50
-getClockComponentCmd = 51
-scheduledSoundCmd = 52
-linkSoundComponentsCmd = 53
 waveTableCmd = 60
 phaseCmd = 61
-soundCmd = 80
-bufferCmd = 81
 rateCmd = 82
 continueCmd = 83
 doubleBufferCmd = 84
 getRateCmd = 85
-rateMultiplierCmd = 86
-getRateMultiplierCmd = 87
 sizeCmd = 90
-convertCmd = 91
+convertCmd = 91                            
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
 waveInitChannel1 = 0x05
@@ -90,7 +93,7 @@
 initChan0 = waveInitChannel0
 initChan1 = waveInitChannel1
 initChan2 = waveInitChannel2
-initChan3 = waveInitChannel3
+initChan3 = waveInitChannel3              
 outsideCmpSH = 0
 insideCmpSH = 1
 aceSuccess = 0
@@ -99,7 +102,7 @@
 aceBadComp = 3
 aceBadEncode = 4
 aceBadDest = 5
-aceBadCmd = 6
+aceBadCmd = 6                             
 initChanLeft = 0x0002
 initChanRight = 0x0003
 initNoInterp = 0x0004
@@ -111,7 +114,7 @@
 initPanMask = 0x0003
 initSRateMask = 0x0030
 initStereoMask = 0x00C0
-initCompMask = 0xFF00
+initCompMask = 0xFF00                        
 siActiveChannels = FOUR_CHAR_CODE('chac')
 siActiveLevels = FOUR_CHAR_CODE('lmac')
 siAGCOnOff = FOUR_CHAR_CODE('agc ')
@@ -132,6 +135,11 @@
 siDeviceConnected = FOUR_CHAR_CODE('dcon')
 siDeviceIcon = FOUR_CHAR_CODE('icon')
 siDeviceName = FOUR_CHAR_CODE('name')
+siEQSpectrumBands = FOUR_CHAR_CODE('eqsb')
+siEQSpectrumLevels = FOUR_CHAR_CODE('eqlv')
+siEQSpectrumOnOff = FOUR_CHAR_CODE('eqlo')
+siEQToneControlGain = FOUR_CHAR_CODE('eqtg')
+siEQToneControlOnOff = FOUR_CHAR_CODE('eqtc')
 siHardwareBalance = FOUR_CHAR_CODE('hbal')
 siHardwareBalanceSteps = FOUR_CHAR_CODE('hbls')
 siHardwareBass = FOUR_CHAR_CODE('hbas')
@@ -139,6 +147,7 @@
 siHardwareBusy = FOUR_CHAR_CODE('hwbs')
 siHardwareFormat = FOUR_CHAR_CODE('hwfm')
 siHardwareMute = FOUR_CHAR_CODE('hmut')
+siHardwareMuteNoPrefs = FOUR_CHAR_CODE('hmnp')
 siHardwareTreble = FOUR_CHAR_CODE('htrb')
 siHardwareTrebleSteps = FOUR_CHAR_CODE('hwts')
 siHardwareVolume = FOUR_CHAR_CODE('hvol')
@@ -158,6 +167,7 @@
 siOptionsDialog = FOUR_CHAR_CODE('optd')
 siOSTypeInputSource = FOUR_CHAR_CODE('inpt')
 siOSTypeInputAvailable = FOUR_CHAR_CODE('inav')
+siOutputDeviceName = FOUR_CHAR_CODE('onam')
 siPlayThruOnOff = FOUR_CHAR_CODE('plth')
 siPostMixerSoundComponent = FOUR_CHAR_CODE('psmx')
 siPreMixerSoundComponent = FOUR_CHAR_CODE('prmx')
@@ -185,10 +195,11 @@
 siVoxRecordInfo = FOUR_CHAR_CODE('voxr')
 siVoxStopInfo = FOUR_CHAR_CODE('voxs')
 siWideStereo = FOUR_CHAR_CODE('wide')
+siSupportedExtendedFlags = FOUR_CHAR_CODE('exfl')        
 siCloseDriver = FOUR_CHAR_CODE('clos')
 siInitializeDriver = FOUR_CHAR_CODE('init')
 siPauseRecording = FOUR_CHAR_CODE('paus')
-siUserInterruptProc = FOUR_CHAR_CODE('user')
+siUserInterruptProc = FOUR_CHAR_CODE('user')        
 # kInvalidSource = (long)0xFFFFFFFF
 kNoSource = FOUR_CHAR_CODE('none')
 kCDSource = FOUR_CHAR_CODE('cd  ')
@@ -202,7 +213,7 @@
 kModemSource = FOUR_CHAR_CODE('modm')
 kPCCardSource = FOUR_CHAR_CODE('pcm ')
 kZoomVideoSource = FOUR_CHAR_CODE('zvpc')
-kDVDSource = FOUR_CHAR_CODE('dvda')
+kDVDSource = FOUR_CHAR_CODE('dvda')        
 kNoSoundComponentType = FOUR_CHAR_CODE('****')
 kSoundComponentType = FOUR_CHAR_CODE('sift')
 kSoundComponentPPCType = FOUR_CHAR_CODE('nift')
@@ -215,6 +226,7 @@
 kMixer16SubType = FOUR_CHAR_CODE('mixw')
 kSoundInputDeviceType = FOUR_CHAR_CODE('sinp')
 kWaveInSubType = FOUR_CHAR_CODE('wavi')
+kWaveInSnifferSubType = FOUR_CHAR_CODE('wisn')
 kSoundOutputDeviceType = FOUR_CHAR_CODE('sdev')
 kClassicSubType = FOUR_CHAR_CODE('clas')
 kASCSubType = FOUR_CHAR_CODE('asc ')
@@ -226,8 +238,12 @@
 kWhitSubType = FOUR_CHAR_CODE('whit')
 kSoundBlasterSubType = FOUR_CHAR_CODE('sbls')
 kWaveOutSubType = FOUR_CHAR_CODE('wavo')
+kWaveOutSnifferSubType = FOUR_CHAR_CODE('wosn')
 kDirectSoundSubType = FOUR_CHAR_CODE('dsnd')
+kDirectSoundSnifferSubType = FOUR_CHAR_CODE('dssn')
 kUNIXsdevSubType = FOUR_CHAR_CODE('un1x')
+kUSBSubType = FOUR_CHAR_CODE('usb ')
+kBlueBoxSubType = FOUR_CHAR_CODE('bsnd')
 kSoundCompressor = FOUR_CHAR_CODE('scom')
 kSoundDecompressor = FOUR_CHAR_CODE('sdec')
 kAudioComponentType = FOUR_CHAR_CODE('adio')
@@ -237,6 +253,7 @@
 kPhilipsFaderSubType = FOUR_CHAR_CODE('tvav')
 kSGSToneSubType = FOUR_CHAR_CODE('sgs0')
 kSoundEffectsType = FOUR_CHAR_CODE('snfx')
+kEqualizerSubType = FOUR_CHAR_CODE('eqal')
 kSSpLocalizationSubType = FOUR_CHAR_CODE('snd3')
 kSoundNotCompressed = FOUR_CHAR_CODE('NONE')
 k8BitOffsetBinaryFormat = FOUR_CHAR_CODE('raw ')
@@ -246,6 +263,7 @@
 kFloat64Format = FOUR_CHAR_CODE('fl64')
 k24BitFormat = FOUR_CHAR_CODE('in24')
 k32BitFormat = FOUR_CHAR_CODE('in32')
+k32BitLittleEndianFormat = FOUR_CHAR_CODE('23ni')
 kMACE3Compression = FOUR_CHAR_CODE('MAC3')
 kMACE6Compression = FOUR_CHAR_CODE('MAC6')
 kCDXA4Compression = FOUR_CHAR_CODE('cdx4')
@@ -261,6 +279,8 @@
 kOffsetBinary = k8BitOffsetBinaryFormat
 kTwosComplement = k16BitBigEndianFormat
 kLittleEndianFormat = k16BitLittleEndianFormat
+kMPEGLayer3Format = 0x6D730055
+kFullMPEGLay3Format = FOUR_CHAR_CODE('.mp3')        
 k16BitNativeEndianFormat = k16BitLittleEndianFormat
 k16BitNonNativeEndianFormat = k16BitBigEndianFormat
 k16BitNativeEndianFormat = k16BitBigEndianFormat
@@ -276,6 +296,7 @@
 kReverse = (1L << 16)
 kRateConvert = (1L << 17)
 kCreateSoundSource = (1L << 18)
+kVMAwareness = (1L << 21)
 kHighQuality = (1L << 22)
 kNonRealTime = (1L << 23)
 kSourcePaused = (1 << 0)
@@ -290,7 +311,13 @@
 kNoVolumeConversion = (1 << 6)
 kNoRealtimeProcessing = (1 << 7)
 kScheduledSource = (1 << 8)
-kBestQuality = (1 << 0)
+kNonInterleavedBuffer = (1 << 9)
+kNonPagingMixer = (1 << 10)
+kSoundConverterMixer = (1 << 11)
+kPagingMixer = (1 << 12)
+kVMAwareMixer = (1 << 13)
+kExtendedSoundData = (1 << 14)                     
+kBestQuality = (1 << 0)                      
 kInputMask = 0x000000FF
 kOutputMask = 0x0000FF00
 kOutputShift = 8
@@ -298,11 +325,12 @@
 kSoundComponentBits = 0x00FFFFFF
 kAudioFormatAtomType = FOUR_CHAR_CODE('frma')
 kAudioEndianAtomType = FOUR_CHAR_CODE('enda')
+kAudioVBRAtomType = FOUR_CHAR_CODE('vbra')
 kAudioTerminatorAtomType = 0
 kAVDisplayHeadphoneRemove = 0
 kAVDisplayHeadphoneInsert = 1
 kAVDisplayPlainTalkRemove = 2
-kAVDisplayPlainTalkInsert = 3
+kAVDisplayPlainTalkInsert = 3                             
 audioAllChannels = 0
 audioLeftChannel = 1
 audioRightChannel = 2
@@ -310,19 +338,24 @@
 audioMuted = 1
 audioDoesMono = (1L << 0)
 audioDoesStereo = (1L << 1)
-audioDoesIndependentChannels = (1L << 2)
+audioDoesIndependentChannels = (1L << 2)                    
 siCDQuality = FOUR_CHAR_CODE('cd  ')
 siBestQuality = FOUR_CHAR_CODE('best')
 siBetterQuality = FOUR_CHAR_CODE('betr')
 siGoodQuality = FOUR_CHAR_CODE('good')
-siNoneQuality = FOUR_CHAR_CODE('none')
+siNoneQuality = FOUR_CHAR_CODE('none')        
 siDeviceIsConnected = 1
 siDeviceNotConnected = 0
 siDontKnowIfConnected = -1
 siReadPermission = 0
-siWritePermission = 1
+siWritePermission = 1                             
+kSoundConverterDidntFillBuffer = (1 << 0)
+kSoundConverterHasLeftOverData = (1 << 1)                   
+kExtendedSoundSampleCountNotValid = 1L << 0
+kExtendedSoundBufferSizeValid = 1L << 1                     
 kScheduledSoundDoScheduled = 1 << 0
 kScheduledSoundDoCallBack = 1 << 1
+kScheduledSoundExtendedHdr = 1 << 2
 kSoundComponentInitOutputDeviceSelect = 0x0001
 kSoundComponentSetSourceSelect = 0x0002
 kSoundComponentGetSourceSelect = 0x0003