From 51a8b92b1696c8ff27523de753a7c6a743a817de Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 18:38:51 +0000 Subject: Audio output working again git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@838 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UAudioInput_Portaudio.pas | 6 ------ Game/Code/Classes/UAudioPlayback_Portaudio.pas | 2 +- Game/Code/Classes/UMusic.pas | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'Game/Code/Classes') diff --git a/Game/Code/Classes/UAudioInput_Portaudio.pas b/Game/Code/Classes/UAudioInput_Portaudio.pas index c969a1b3..753c69f6 100644 --- a/Game/Code/Classes/UAudioInput_Portaudio.pas +++ b/Game/Code/Classes/UAudioInput_Portaudio.pas @@ -191,25 +191,20 @@ const begin result := false; - writeln('0'); - err := Pa_Initialize(); if(err <> paNoError) then begin Log.LogError('Portaudio.InitializeRecord: ' + Pa_GetErrorText(err)); Exit; end; - writeln('1'); apiIndex := GetPreferredApiIndex(); apiInfo := Pa_GetHostApiInfo(apiIndex); SC := 0; - writeln('2'); // init array-size to max. input-devices count SetLength(AudioInputProcessor.Device, apiInfo^.deviceCount); for i:= 0 to High(AudioInputProcessor.Device) do begin - writeln('25'); // convert API-specific device-index to global index deviceIndex := Pa_HostApiDeviceIndexToDeviceIndex(apiIndex, i); deviceInfo := Pa_GetDeviceInfo(deviceIndex); @@ -303,7 +298,6 @@ begin Inc(SC); end; - writeln('3'); // adjust size to actual input-device count SetLength(AudioInputProcessor.Device, SC); diff --git a/Game/Code/Classes/UAudioPlayback_Portaudio.pas b/Game/Code/Classes/UAudioPlayback_Portaudio.pas index 2743fa86..59571d3d 100644 --- a/Game/Code/Classes/UAudioPlayback_Portaudio.pas +++ b/Game/Code/Classes/UAudioPlayback_Portaudio.pas @@ -411,7 +411,7 @@ begin playback := TAudioPlayback_Portaudio(userdata); with playback do begin - //MixerStream.ReadData(stream, len); + MixerStream.ReadData(stream, len); end; end; diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index 27ab86e1..b06e226d 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -444,13 +444,11 @@ begin //Log.BenchmarkStart(4); Start := AudioPlayback.OpenSound(SoundPath + 'Common start.mp3'); - (* Back := AudioPlayback.OpenSound(SoundPath + 'Common back.mp3'); Swoosh := AudioPlayback.OpenSound(SoundPath + 'menu swoosh.mp3'); Change := AudioPlayback.OpenSound(SoundPath + 'select music change music 50.mp3'); Option := AudioPlayback.OpenSound(SoundPath + 'option change col.mp3'); Click := AudioPlayback.OpenSound(SoundPath + 'rimshot022b.mp3'); - *) //Drum := AudioPlayback.OpenSound(SoundPath + 'bassdrumhard076b.mp3'); //Hihat := AudioPlayback.OpenSound(SoundPath + 'hihatclosed068b.mp3'); -- cgit v1.2.3