aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-12-18 12:12:15 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-12-18 12:12:15 +0000
commitf3ee66ae042f65832d9230dbdaec352b17420bfd (patch)
tree96e8d4ab1d2eb4066b0ee8e8cbd31abd0b06e40d /Game/Code/Classes
parent252ffd6dadbce63252e5b6632ffc9daeb9484365 (diff)
downloadusdx-f3ee66ae042f65832d9230dbdaec352b17420bfd.tar.gz
usdx-f3ee66ae042f65832d9230dbdaec352b17420bfd.tar.xz
usdx-f3ee66ae042f65832d9230dbdaec352b17420bfd.zip
start-sound works now. JAY: it's a '-' not a '+'
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@727 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes')
-rw-r--r--Game/Code/Classes/UAudio_FFMpeg.pas13
1 files changed, 6 insertions, 7 deletions
diff --git a/Game/Code/Classes/UAudio_FFMpeg.pas b/Game/Code/Classes/UAudio_FFMpeg.pas
index ca91f095..fb25b0f9 100644
--- a/Game/Code/Classes/UAudio_FFMpeg.pas
+++ b/Game/Code/Classes/UAudio_FFMpeg.pas
@@ -289,13 +289,12 @@ begin
Pa_Initialize();
StartSoundStream := LoadSoundFromFile(SoundPath + 'Common start.mp3');
- {
- BackSoundStream := LoadSoundFromFile(SoundPath + 'Common Back.mp3');
+ BackSoundStream := LoadSoundFromFile(SoundPath + 'Common back.mp3');
SwooshSoundStream := LoadSoundFromFile(SoundPath + 'menu swoosh.mp3');
ChangeSoundStream := LoadSoundFromFile(SoundPath + 'select music change music 50.mp3');
OptionSoundStream := LoadSoundFromFile(SoundPath + 'option change col.mp3');
ClickSoundStream := LoadSoundFromFile(SoundPath + 'rimshot022b.mp3');
- }
+
// DrumSoundStream := LoadSoundFromFile(SoundPath + 'bassdrumhard076b.mp3');
// HihatSoundStream := LoadSoundFromFile(SoundPath + 'hihatclosed068b.mp3');
// ClapSoundStream := LoadSoundFromFile(SoundPath + 'claps050b.mp3');
@@ -537,8 +536,8 @@ begin
break;
end;
- audio_pkt_data := audio_pkt_data + len1;
- audio_pkt_size := audio_pkt_size + len1;
+ Inc(audio_pkt_data, len1);
+ Dec(audio_pkt_size, len1);
if (data_size <= 0) then
begin
@@ -603,7 +602,7 @@ begin
begin
audio_buf_size := audio_size;
end;
- audio_buf_index := 0; // Todo : jb - SegFault ?
+ audio_buf_index := 0;
end;
len1 := audio_buf_size - audio_buf_index;
@@ -833,7 +832,7 @@ begin
exit;
end;
- Log.LogStatus('SDL opened audio device', 'UAudio_FFMpeg');
+ Log.LogStatus('Opened audio device', 'UAudio_FFMpeg');
//Add CustomSound
csIndex := High(CustomSounds) + 1;