added experimental voice playback after singing

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2154 b956fd51-792f-4845-bead-9b4dfca2ff2c

3 files changed, 69 insertions, 5 deletions

diff --git a/Game/Code/Classes/ULog.pas b/Game/Code/Classes/ULog.pas
index c870a279..ce6d5f07 100644
--- a/Game/Code/Classes/ULog.pas
+++ b/Game/Code/Classes/ULog.pas
@@ -34,7 +34,7 @@ type
     procedure CriticalError(Text: string);

 

     // voice

-    procedure LogVoice(SoundNr: Integer; Player, Artist, Title, Points: string);

+    function LogVoice(SoundNr: Integer; Player, Artist, Title, Points: string): string;

 

     // compability

     procedure LogStatus(Log1, Log2: string);

@@ -172,7 +172,7 @@ begin
   end;

 end;

 

-procedure TLog.LogVoice(SoundNr: Integer; Player, Artist, Title, Points: string);

+function TLog.LogVoice(SoundNr: Integer; Player, Artist, Title, Points: string): string;

 type

   TRiffHeader = record

     riff: Array[0..3] OF Char;

@@ -275,6 +275,7 @@ begin
   end;

 

   FS.Free;

+  LogVoice := FileName;

 end;

 

 procedure TLog.LogStatus(Log1, Log2: string);

diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index 35c84059..795f2241 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -7,6 +7,7 @@ uses SDL, UGraphic, UMusic, URecord, UTime, SysUtils, UDisplay, UIni, ULog, ULyr
 type

   TPlayer = record

     Name:         string;

+    VoiceFile:    string; //Recorded Voice

 

     Score:        real;

     ScoreLine:    real;

@@ -70,8 +71,8 @@ type
 

   TStats = record

     Player: array of TPlayer;
-    SongArtist:   UTF8String;
-    SongTitle:    UTF8String;
+    SongArtist:   String;
+    SongTitle:    String;
   end;
 
   TMedleyPlaylist = record
diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas
index 942c8c81..fbd7fb29 100644
--- a/Game/Code/Classes/UMusic.pas
+++ b/Game/Code/Classes/UMusic.pas
@@ -51,6 +51,8 @@ type
       BassShuffle:        hStream;

       BassApplause:       hStream;

 

+      BassVoices:         array of hStream;

+

       //Custom Sounds

       CustomSounds: array of TCustomSoundEntry;

 

@@ -93,6 +95,12 @@ type
       procedure PlayShuffle;

       procedure StopShuffle;

       procedure PlayApplause;

+

+      function  VoicesOpen(Names: array of string): integer;

+      procedure VoicesPlay;

+      procedure VoicesStop;

+      procedure VoicesClose;

+

       procedure CaptureStart;

       procedure CaptureStop;

       procedure CaptureCard(RecordI, PlayerLeft, PlayerRight: byte);

@@ -313,6 +321,7 @@ begin
     Exit;

   end;

   DSP_VocalRemover := 0;

+  SetLength(BassVoices, 0);

   Log.BenchmarkEnd(4); Log.LogBenchmark('--> Bass Init', 4);

 

   // config playing buffer

@@ -481,7 +490,7 @@ end;
 function TMusic.Open(Name: string): boolean;

 begin

   Loaded := false;

-  

+

   if FileExists(Name) then begin

 {    MediaPlayer.FileName := Name;

     MediaPlayer.Open;}

@@ -948,4 +957,57 @@ begin
   Result := (DSP_VocalRemover <> 0);

 end;

 

+

+function TMusic.VoicesOpen(Names: array of string): integer;

+var

+  I:    integer;

+  num:  integer;

+

+begin

+  SetLength(BassVoices, 0);

+

+  for I := 0 to high(Names) do

+  begin

+    if FileExists(Names[I]) then

+    begin

+      num := high(BassVoices)+1;

+      SetLength(BassVoices, num+1);

+      BassVoices[num] := Bass_StreamCreateFile(false, pchar(Names[I]), 0, 0, 0);

+      DSP_VocalRemover:=0;

+    end;

+  end;

+

+  Result := high(BassVoices)+1;

+end;

+

+procedure TMusic.VoicesPlay;

+var

+  I:  integer;

+begin

+  for I := 0 to high(BassVoices) do

+  begin

+    BASS_ChannelPlay(BassVoices[I], True);

+  end;

+end;

+

+procedure TMusic.VoicesStop;

+var

+  I:  integer;

+begin

+  for I := 0 to high(BassVoices) do

+    Bass_ChannelStop(BassVoices[I]);

+end;

+

+

+procedure TMusic.VoicesClose;

+var

+  I:  integer;

+begin

+  for I := 0 to high(BassVoices) do

+  begin

+    Bass_StreamFree(BassVoices[I]);

+    DSP_VocalRemover:=0;

+  end;

+  SetLength(BassVoices, 0);

+end;

 end.