all SongFile Loading and Saving procedures moved to UFiles.

Added Some Tolerance in Song File Loading and Song Header Loading.
Fix: Programm doesn't Crash anymore when a coruppted Song is loaded for Singing or Editing. Now Jump back to SongScreen and show an Error Message. Also Party Mode is not Interupted, a new Song will be selected automatically.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@197 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 22 insertions, 4 deletions

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index b49e0add..cdce5984 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -2,7 +2,7 @@ unit UScreenSing;
 

 interface

 

-uses UMenu, UMusic, SDL, SysUtils, UPliki, UTime, USongs, UIni, ULog, USmpeg, UTexture, ULyrics,

+uses UMenu, UMusic, SDL, SysUtils, UFiles, UTime, USongs, UIni, ULog, USmpeg, UTexture, ULyrics,

   TextGL, OpenGL12, BASS, UThemes, ULCD, UGraphicClasses;

 

 type

@@ -321,11 +321,29 @@ begin
   Text[TextP3RScore].Visible := V3R;

 

   // load notes

-  CzyscNuty;

+  ResetSingTemp;

 //  Log.LogWarning(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName, '!!!');

   AktSong := CatSongs.Song[CatSongs.Selected];

-

-  WczytajCzesci(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName);

+  try

+    if not LoadSong(CatSongs.Song[CatSongs.Selected].Path + CatSongs.Song[CatSongs.Selected].FileName) then

+    begin

+      //Error Loading Song -> Go back to Song Screen and Show some Error Message

+      FadeTo(@ScreenSong);

+      //Select New Song in Party Mode

+      if ScreenSong.Mode = 1 then

+        ScreenSong.SelectRandomSong;

+      ScreenPopupError.ShowPopup (Language.Translate('ERROR_CORRUPT_SONG'));

+      Exit;

+    end;

+  except

+    //Error Loading Song -> Go back to Song Screen and Show some Error Message

+    FadeTo(@ScreenSong);

+    //Select New Song in Party Mode

+      if ScreenSong.Mode = 1 then

+        ScreenSong.SelectRandomSong;

+    ScreenPopupError.ShowPopup (Language.Translate('ERROR_CORRUPT_SONG'));

+    Exit;

+  end;

   AktSong.Path := CatSongs.Song[CatSongs.Selected].Path;

 //  AktSong.GAP := AktSong.GAP + 40 {4096 = 100ms for buffer} + 20 {microphone} + 60000 / AktSong.BPM[0].BPM / 2; // temporary until UMain will be fixed