From f3ee66ae042f65832d9230dbdaec352b17420bfd Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 18 Dec 2007 12:12:15 +0000 Subject: 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 --- Game/Code/Classes/UAudio_FFMpeg.pas | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Game/Code') 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; -- cgit v1.2.3