- SelectPlayers after songselect works now for medley-mode too

- moved medley-tags into txt: #MedleyStartBeat, #MedleyEndBeat
- left *.txtm and the FadeIn and FadeOut tags, but they are from now on deprecated
- new tag: #PREVIEWSTART
- fallback for #PREVIEWSTART: 1. MedleyStart, 2. calculated medleystart, 3. 25%-rule :>

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

1 files changed, 17 insertions, 10 deletions

diff --git a/Medley/src/base/USongs.pas b/Medley/src/base/USongs.pas
index af7f7a16..d0c7fe0a 100644
--- a/Medley/src/base/USongs.pas
+++ b/Medley/src/base/USongs.pas
@@ -312,31 +312,38 @@ var
   Files: TPathDynArray;
   Song: TSong;
   Extension: IPath;
-  MedleyFiles:  TPathDynArray;
-  MedleyExtension: IPath;
+  MedleyFiles:  TPathDynArray; //will be deleted soon!
+  MedleyExtension: IPath;      //will be deleted soon!
 begin
   SetLength(Files, 0);
 
   Extension := Path('.txt');
-  MedleyExtension := Path('.txtm');
+  MedleyExtension := Path('.txtm'); //will be deleted soon!
   FindFilesByExtension(Dir, Extension, true, Files);
 
 
   for I := 0 to High(Files) do
   begin
     Song := TSong.Create(Files[I]);
-
+    Song.Medley.Source := msNone; //will be deleted soon!
     if Song.Analyse then
     begin
-      //medley support...   TODO: move it (see USong...)
-      SetLength(MedleyFiles, 0);
-      FindFilesByExtension(Files[I].GetPath, MedleyExtension, true, MedleyFiles);
-
-      if Length(MedleyFiles)>0 then
+      //TODO: delete it to deactivate *.txtm support (see USong...)
+      if Song.Medley.Source = msNone then
       begin
-        Song.ReadMedleyFile(MedleyFiles[0]);
+        SetLength(MedleyFiles, 0);
+        FindFilesByExtension(Files[I].GetPath, MedleyExtension, true, MedleyFiles);
+
+        if Length(MedleyFiles)>0 then
+        begin
+          Song.ReadMedleyFile(MedleyFiles[0]);
+        end;
       end;
 
+      //medley support
+      if Song.Medley.Source = msNone then
+        Song.FindRefrainStart;
+
       SongList.Add(Song);
     end else
     begin