From 11facb268ba723b56279638a64c1c4327d9293bb Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Mon, 14 Dec 2009 20:46:20 +0000 Subject: - 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 --- Medley/src/screens/UScreenSong.pas | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'Medley/src/screens/UScreenSong.pas') diff --git a/Medley/src/screens/UScreenSong.pas b/Medley/src/screens/UScreenSong.pas index c89193a8..421c392a 100644 --- a/Medley/src/screens/UScreenSong.pas +++ b/Medley/src/screens/UScreenSong.pas @@ -1774,13 +1774,7 @@ begin if AudioPlayback.Open(Song.Path.Append(Song.Mp3)) then begin PreviewOpened := Interaction; - - if Song.Medley.Source <> msNone then - begin - CurrentSong := Song; - AudioPlayback.Position := GetTimeFromBeat(Song.Medley.StartBeat); - end else - AudioPlayback.Position := AudioPlayback.Length / 4; + AudioPlayback.Position := Song.PreviewStart; // set preview volume if (Ini.PreviewFading = 0) then @@ -1941,7 +1935,19 @@ begin PlaylistMedley.Song[0] := Interaction; PlaylistMedley.NumMedleySongs := 1; end; - FadeTo(@ScreenSing); + + //TODO: how about case 2? menu for medley mode? + case Ini.OnSongClick of + 0: FadeTo(@ScreenSing); + 1: SelectPlayers; + 2: FadeTo(@ScreenSing); + {2: begin + if (CatSongs.CatNumShow = -3) then + ScreenSongMenu.MenuShow(SM_Playlist) + else + ScreenSongMenu.MenuShow(SM_Main); + end;} + end; end; procedure TScreenSong.SkipTo(Target: cardinal); -- cgit v1.2.3