From 873f177f08dc7c4fe2d7e50bbe7709df98e238d3 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 14:58:32 +0000
Subject: rename Screen part2

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1306 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 584 +++++++++++++++++++++++++++++++++++++
 1 file changed, 584 insertions(+)
 create mode 100644 src/screens/UScreenEditConvert.pas

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
new file mode 100644
index 00000000..dfde696e
--- /dev/null
+++ b/src/screens/UScreenEditConvert.pas
@@ -0,0 +1,584 @@
+unit UScreenEditConvert;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+uses UMenu,
+     SDL,
+     {$IFDEF UseMIDIPort}
+     MidiFile,
+     MidiOut,
+     {$ENDIF}
+     ULog,
+     USongs,
+     USong,
+     UMusic,
+     UThemes;
+
+type
+  TNote = record
+    Event:        integer;
+    EventType:    integer;
+    Channel:    integer;
+    Start:    real;
+    Len:      real;
+    Data1:    integer;
+    Data2:    integer;
+    Str:      string;
+  end;
+
+  TTrack = record
+    Note:     array of TNote;
+    Name:     string;
+    Hear:     boolean;
+    Status:   byte;     // 0 - none, 1 - notes, 2 - lyrics, 3 - notes + lyrics
+  end;
+
+  TNuta = record
+    Start:    integer;
+    Len:      integer;
+    Tone:     integer;
+    Lyric:    string;
+    NewSentence:  boolean;
+  end;
+
+  TArrayTrack = array of TTrack;
+
+  TScreenEditConvert = class(TMenu)
+    public
+      ATrack:             TArrayTrack; // actual track
+//      Track:              TArrayTrack;
+      Channel:            TArrayTrack;
+      ColR:               array[0..100] of real;
+      ColG:               array[0..100] of real;
+      ColB:               array[0..100] of real;
+      Len:                real;
+      Sel:                integer;
+      Selected:           boolean;
+//      FileName:           string;
+
+      {$IFDEF UseMIDIPort}
+      MidiFile:           TMidiFile;
+      MidiTrack:          TMidiTrack;
+      MidiEvent:          pMidiEvent;
+      MidiOut:            TMidiOutput;
+      {$ENDIF}
+      
+      Song:               TSong;
+      Lines:              TLines;
+      BPM:                real;
+      Ticks:              real;
+      Note:               array of TNuta;
+
+      procedure AddLyric(Start: integer; Text: string);
+      procedure Extract;
+
+      {$IFDEF UseMIDIPort}
+      procedure MidiFile1MidiEvent(event: PMidiEvent);
+      {$ENDIF}
+      
+      function SelectedNumber: integer;
+      constructor Create; override;
+      procedure onShow; override;
+      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function Draw: boolean; override;
+      procedure onHide; override;
+  end;
+
+implementation
+uses UGraphic,
+     SysUtils,
+     UDrawTexture,
+     TextGL,
+     UFiles,
+     UMain,
+     UIni,
+     gl,
+     USkins;
+
+function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+var
+  T:    integer;
+begin
+  Result := true;
+  If (PressedDown) Then
+  begin // Key Down
+    // check normal keys
+    case WideCharUpperCase(CharCode)[1] of
+      'Q':
+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+
+    // check special keys
+    case PressedKey of
+      SDLK_ESCAPE,
+      SDLK_BACKSPACE :
+        begin
+      {$IFDEF UseMIDIPort}
+          MidiFile.StopPlaying;
+      {$ENDIF}
+          AudioPlayback.PlaySound(SoundLib.Back);
+          FadeTo(@ScreenEdit);
+        end;
+
+      SDLK_RETURN:
+        begin
+          if Interaction = 0 then
+          begin
+            AudioPlayback.PlaySound(SoundLib.Start);
+            ScreenOpen.BackScreen := @ScreenEditConvert;
+            FadeTo(@ScreenOpen);
+          end;
+
+          if Interaction = 1 then
+          begin
+            Selected := false;
+      {$IFDEF UseMIDIPort}
+            MidiFile.OnMidiEvent := MidiFile1MidiEvent;
+//            MidiFile.GoToTime(MidiFile.GetTrackLength div 2);
+            MidiFile.StartPlaying;
+            {$ENDIF}
+          end;
+
+          if Interaction = 2 then begin
+            Selected := true;
+            {$IFDEF UseMIDIPort}
+            MidiFile.OnMidiEvent := nil;
+            {$ENDIF}
+            {for T := 0 to High(ATrack) do begin
+              if ATrack[T].Hear then begin
+                MidiTrack := MidiFile.GetTrack(T);
+                MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
+              end;
+            end;
+            MidiFile.StartPlaying;//}
+          end;
+
+          if Interaction = 3 then begin
+            if SelectedNumber > 0 then begin
+              Extract;
+              SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
+            end;
+          end;
+
+        end;
+
+      SDLK_SPACE:
+        begin
+//          ATrack[Sel].Hear := not ATrack[Sel].Hear;
+          ATrack[Sel].Status := (ATrack[Sel].Status + 1) mod 4;
+
+{          if Selected then begin
+            MidiTrack := MidiFile.GetTrack(Sel);
+            if Track[Sel].Hear then
+              MidiTrack.OnMidiEvent := MidiFile1MidiEvent
+            else
+              MidiTrack.OnMidiEvent := nil;
+          end;}
+        end;
+
+      SDLK_RIGHT:
+        begin
+          InteractNext;
+        end;
+
+      SDLK_LEFT:
+        begin
+          InteractPrev;
+        end;
+
+      SDLK_DOWN:
+        begin
+          Inc(Sel);
+          if Sel > High(ATrack) then Sel := 0;
+        end;
+      SDLK_UP:
+        begin
+          Dec(Sel);
+          if Sel < 0 then Sel := High(ATrack);
+        end;
+    end;
+  end;
+end;
+
+procedure TScreenEditConvert.AddLyric(Start: integer; Text: string);
+var
+  N:    integer;
+begin
+  for N := 0 to High(Note) do begin
+    if Note[N].Start = Start then begin
+      // check for new sentece
+      if Copy(Text, 1, 1) = '\' then Delete(Text, 1, 1);
+      if Copy(Text, 1, 1) = '/' then begin
+        Delete(Text, 1, 1);
+        Note[N].NewSentence := true;
+      end;
+
+      // overwrite lyric od append
+      if Note[N].Lyric = '-' then
+        Note[N].Lyric := Text
+      else
+        Note[N].Lyric := Note[N].Lyric + Text;
+    end;
+  end;
+end;
+
+procedure TScreenEditConvert.Extract;
+var
+  T:    integer;
+  C:    integer;
+  N:    integer;
+  Nu:   integer;
+  NoteTemp: TNuta;
+  Move: integer;
+  Max, Min: integer;
+begin
+  // song info
+  Song.Title := '';
+  Song.Artist := '';
+  Song.Mp3 := '';
+  Song.Resolution := 4;
+  SetLength(Song.BPM, 1);
+  Song.BPM[0].BPM := BPM*4;
+
+  SetLength(Note, 0);
+
+  // extract notes
+  for T := 0 to High(ATrack) do begin
+//    if ATrack[T].Hear then begin
+    if ((ATrack[T].Status div 1) and 1) = 1 then begin
+      for N := 0 to High(ATrack[T].Note) do begin
+        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then begin
+          Nu := Length(Note);
+          SetLength(Note, Nu + 1);
+          Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
+          Note[Nu].Len := Round(ATrack[T].Note[N].Len / Ticks);
+          Note[Nu].Tone := ATrack[T].Note[N].Data1 - 12*5;
+          Note[Nu].Lyric := '-';
+        end;
+      end;
+    end;
+  end;
+
+  // extract lyrics
+  for T := 0 to High(ATrack) do begin
+//    if ATrack[T].Hear then begin
+    if ((ATrack[T].Status div 2) and 1) = 1 then begin
+      for N := 0 to High(ATrack[T].Note) do begin
+        if (ATrack[T].Note[N].EventType = 15) then begin
+//          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
+          AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
+        end;
+      end;
+    end;
+  end;
+
+  // sort notes
+  for N := 0 to High(Note) do
+    for Nu := 0 to High(Note)-1 do
+      if Note[Nu].Start > Note[Nu+1].Start then begin
+        NoteTemp := Note[Nu];
+        Note[Nu] := Note[Nu+1];
+        Note[Nu+1] := NoteTemp;
+      end;
+
+  // move to 0 at beginning
+  Move := Note[0].Start;
+  for N := 0 to High(Note) do
+    Note[N].Start := Note[N].Start - Move;
+
+  // copy notes
+  SetLength(Lines.Line, 1);
+  Lines.Number := 1;
+  Lines.High := 0;
+
+  C := 0;
+  N := 0;
+  Lines.Line[C].HighNote := -1;
+
+  for Nu := 0 to High(Note) do begin
+    if Note[Nu].NewSentence then begin // nowa linijka
+      SetLength(Lines.Line, Length(Lines.Line)+1);
+      Lines.Number := Lines.Number + 1;
+      Lines.High := Lines.High + 1;
+      C := C + 1;
+      N := 0;
+      SetLength(Lines.Line[C].Note, 0);
+      Lines.Line[C].HighNote := -1;
+
+      //Calculate Start of the Last Sentence
+      if (C > 0) and (Nu > 0) then
+      begin
+        Max := Note[Nu].Start;
+        Min := Note[Nu-1].Start + Note[Nu-1].Len;
+        
+        case (Max - Min) of
+          0:    Lines.Line[C].Start := Max;
+          1:    Lines.Line[C].Start := Max;
+          2:    Lines.Line[C].Start := Max - 1;
+          3:    Lines.Line[C].Start := Max - 2;
+          else
+            if ((Max - Min) > 4) then
+              Lines.Line[C].Start := Min + 2
+            else
+              Lines.Line[C].Start := Max;
+
+        end; // case
+
+      end;
+    end;
+
+    // tworzy miejsce na nowa nute
+    SetLength(Lines.Line[C].Note, Length(Lines.Line[C].Note)+1);
+
+    // dopisuje
+    Lines.Line[C].Note[N].Start := Note[Nu].Start;
+    Lines.Line[C].Note[N].Length := Note[Nu].Len;
+    Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
+    Lines.Line[C].Note[N].Text := Note[Nu].Lyric;
+    //All Notes are Freestyle when Converted Fix:
+    Lines.Line[C].Note[N].NoteType := ntNormal;
+    Inc(N);
+  end;
+end;
+
+function TScreenEditConvert.SelectedNumber: integer;
+var
+  T:    integer; // track
+begin
+  Result := 0;
+  for T := 0 to High(ATrack) do
+//    if ATrack[T].Hear then Inc(Result);
+    if ((ATrack[T].Status div 1) and 1) = 1 then Inc(Result);
+end;
+
+{$IFDEF UseMIDIPort}
+procedure TScreenEditConvert.MidiFile1MidiEvent(event: PMidiEvent);
+begin
+//  Log.LogStatus(IntToStr(event.event), 'MIDI');
+  MidiOut.PutShort(event.event, event.data1, event.data2);
+end;
+{$ENDIF}
+
+constructor TScreenEditConvert.Create;
+var
+  P:  integer;
+begin
+  inherited Create;
+  AddButton(40, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
+  AddButtonText(15, 5, 0, 0, 0, 'Open');
+//  Button[High(Button)].Text[0].Size := 11;
+
+  AddButton(160, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
+  AddButtonText(25, 5, 0, 0, 0, 'Play');
+
+  AddButton(280, 20, 200, 40, Skin.GetTextureFileName('ButtonF'));
+  AddButtonText(25, 5, 0, 0, 0, 'Play Selected');
+
+  AddButton(500, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
+  AddButtonText(20, 5, 0, 0, 0, 'Save');
+
+
+{  MidiOut := TMidiOutput.Create(nil);
+//  MidiOut.Close;
+//  MidiOut.DeviceID := 0;
+  if Ini.Debug = 1 then
+    MidiOut.ProductName := 'Microsoft GS Wavetable SW Synth'; // for my kxproject without midi table
+  Log.LogStatus(MidiOut.ProductName, 'MIDI');
+  MidiOut.Open;
+//  MidiOut.SetVolume(100, 100); // temporary}
+
+  ConversionFileName := GamePath + 'file.mid';
+  {$IFDEF UseMIDIPort}
+  MidiFile := TMidiFile.Create(nil);
+  {$ENDIF}
+
+  for P := 0 to 100 do begin
+    ColR[P] := Random(10)/10;
+    ColG[P] := Random(10)/10;
+    ColB[P] := Random(10)/10;
+  end;
+
+end;
+
+procedure TScreenEditConvert.onShow;
+var
+  T:    integer; // track
+  N:    integer; // note
+  C:    integer; // channel
+  CN:   integer; // channel note
+begin
+  inherited;
+
+{$IFDEF UseMIDIPort}
+  MidiOut := TMidiOutput.Create(nil);
+  if Ini.Debug = 1 then
+    MidiOut.ProductName := 'Microsoft GS Wavetable SW Synth'; // for my kxproject without midi table
+  Log.LogStatus(MidiOut.ProductName, 'MIDI');
+  MidiOut.Open;
+
+
+  if FileExists(ConversionFileName) then
+  begin
+    MidiFile.Filename := ConversionFileName;
+    MidiFile.ReadFile;
+
+
+    Len := 0;
+    Sel := 0;
+    BPM := MidiFile.Bpm;
+    Ticks := MidiFile.TicksPerQuarter / 4;
+
+{    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+      SetLength(Track, Length(Track)+1);
+      MidiTrack := MidiFile.GetTrack(T);
+      MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
+      Track[T].Name := MidiTrack.getName;
+
+      for N := 0 to MidiTrack.getEventCount-1 do begin
+        SetLength(Track[T].Note, Length(Track[T].Note)+1);
+        MidiEvent := MidiTrack.GetEvent(N);
+        Track[T].Note[N].Start := MidiEvent.time;
+        Track[T].Note[N].Len := MidiEvent.len;
+        Track[T].Note[N].Event := MidiEvent.event;
+        Track[T].Note[N].EventType := MidiEvent.event div 16;
+        Track[T].Note[N].Channel := MidiEvent.event and 15;
+        Track[T].Note[N].Data1 := MidiEvent.data1;
+        Track[T].Note[N].Data2 := MidiEvent.data2;
+        Track[T].Note[N].Str := MidiEvent.str;
+
+        if Track[T].Note[N].Start + Track[T].Note[N].Len > Len then
+          Len := Track[T].Note[N].Start + Track[T].Note[N].Len;
+      end;
+    end;}
+
+
+    SetLength(Channel, 16);
+    for T := 0 to 15 do
+    begin
+      Channel[T].Name := IntToStr(T+1);
+      SetLength(Channel[T].Note, 0);
+      Channel[T].Status := 0;
+    end;
+
+    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+      MidiTrack := MidiFile.GetTrack(T);
+      MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
+
+      for N := 0 to MidiTrack.getEventCount-1 do begin
+        MidiEvent := MidiTrack.GetEvent(N);
+        C := MidiEvent.event and 15;
+
+        CN := Length(Channel[C].Note);
+        SetLength(Channel[C].Note, CN+1);
+
+        Channel[C].Note[CN].Start := MidiEvent.time;
+        Channel[C].Note[CN].Len := MidiEvent.len;
+        Channel[C].Note[CN].Event := MidiEvent.event;
+        Channel[C].Note[CN].EventType := MidiEvent.event div 16;
+        Channel[C].Note[CN].Channel := MidiEvent.event and 15;
+        Channel[C].Note[CN].Data1 := MidiEvent.data1;
+        Channel[C].Note[CN].Data2 := MidiEvent.data2;
+        Channel[C].Note[CN].Str := MidiEvent.str;
+
+        if Channel[C].Note[CN].Start + Channel[C].Note[CN].Len > Len then
+          Len := Channel[C].Note[CN].Start + Channel[C].Note[CN].Len;
+      end;
+    end;
+    ATrack := Channel;
+
+  end;
+
+  Interaction := 0;
+{$ENDIF}
+end;
+
+function TScreenEditConvert.Draw: boolean;
+var
+  Pet:    integer;
+  Pet2:   integer;
+  Bottom: real;
+  X:      real;
+  Y:      real;
+  H:      real;
+  YSkip:  real;
+begin
+  // draw static menu
+  inherited Draw;
+
+  Y := 100;
+
+  H := Length(ATrack)*40;
+  if H > 480 then H := 480;
+  Bottom := Y + H;
+
+  YSkip := H / Length(ATrack);
+
+  // select
+  DrawQuad(10, Y+Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
+
+  // selected - now me use Status System
+  for Pet := 0 to High(ATrack) do
+    if ATrack[Pet].Hear then
+      DrawQuad(10, Y+Pet*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
+  glColor3f(0, 0, 0);
+  for Pet := 0 to High(ATrack) do begin
+    if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
+      SetFontPos(25, Y + Pet*YSkip + 10);
+      SetFontSize(5);
+      glPrint('N');
+    end;
+    if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
+      SetFontPos(40, Y + Pet*YSkip + 10);
+      SetFontSize(5);
+      glPrint('L');
+    end;
+  end;
+
+  DrawLine(10, Y,   10, Bottom, 0, 0, 0);
+  DrawLine(60, Y,   60, Bottom, 0, 0, 0);
+  DrawLine(790, Y, 790, Bottom, 0, 0, 0);
+
+  for Pet := 0 to Length(ATrack) do
+    DrawLine(10, Y+Pet*YSkip, 790, Y+Pet*YSkip, 0, 0, 0);
+
+  for Pet := 0 to High(ATrack) do begin
+    SetFontPos(11, Y + 10 + Pet*YSkip);
+    SetFontSize(5);
+    glPrint(pchar(ATrack[Pet].Name));
+  end;
+
+  for Pet := 0 to High(ATrack) do
+    for Pet2 := 0 to High(ATrack[Pet].Note) do begin
+      if ATrack[Pet].Note[Pet2].EventType = 9 then
+        DrawQuad(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + (Pet+1)*YSkip - ATrack[Pet].Note[Pet2].Data1*35/127, 3, 3, ColR[Pet], ColG[Pet], ColB[Pet]);
+      if ATrack[Pet].Note[Pet2].EventType = 15 then
+        DrawLine(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + 0.75 * YSkip + Pet*YSkip, 60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + YSkip + Pet*YSkip, ColR[Pet], ColG[Pet], ColB[Pet]);
+    end;
+
+  // playing line
+  {$IFDEF UseMIDIPort}
+  X := 60 + MidiFile.GetCurrentTime/MidiFile.GetTrackLength*730;
+  {$ENDIF}
+  DrawLine(X, Y, X, Bottom, 0.3, 0.3, 0.3);
+
+  Result := true;
+end;
+
+procedure TScreenEditConvert.onHide;
+begin
+{$IFDEF UseMIDIPort}
+  MidiOut.Close;
+  MidiOut.Free;
+{$ENDIF}
+end;
+
+end.
-- 
cgit v1.2.3


From f16756422a5dbb24ce1b751bb9e2bb1de4f19713 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 23 Sep 2008 21:17:50 +0000
Subject: added file headers

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1404 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index dfde696e..4173fac2 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -1,3 +1,28 @@
+{* UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *}
+
 unit UScreenEditConvert;
 
 interface
-- 
cgit v1.2.3


From 2f768387f3849699320229a5b756db78af1207a2 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 19 Oct 2008 16:24:59 +0000
Subject: The size given to TextGL.SetSize() now expresses the size in pixel
 (formerly it was 1/3 of the pixel-size). For theme and plugin compatibility
 the following functions multiply the size with 3: - UScreenSingModi.Print -
 TTheme.ThemeLoadText - TTheme.ThemeLoadSelectSlide

TODO: Convert the themes/plugins and remove the "*3"

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1459 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 4173fac2..9efa1a92 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -558,12 +558,12 @@ begin
   for Pet := 0 to High(ATrack) do begin
     if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
       SetFontPos(25, Y + Pet*YSkip + 10);
-      SetFontSize(5);
+      SetFontSize(15);
       glPrint('N');
     end;
     if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
       SetFontPos(40, Y + Pet*YSkip + 10);
-      SetFontSize(5);
+      SetFontSize(15);
       glPrint('L');
     end;
   end;
@@ -577,7 +577,7 @@ begin
 
   for Pet := 0 to High(ATrack) do begin
     SetFontPos(11, Y + 10 + Pet*YSkip);
-    SetFontSize(5);
+    SetFontSize(15);
     glPrint(pchar(ATrack[Pet].Name));
   end;
 
-- 
cgit v1.2.3


From e8a388e32a4563ac9ea0895ca6c7cdf83cf9d3ec Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 28 Oct 2008 18:57:02 +0000
Subject: - glPrint(Pchar) -> glPrint(string) - glPrintLetter removed - font
 engine handles FT_PIXEL_MODE_MONO as
 FT_Glyph_To_Bitmap(FT_RENDER_MODE_NORMAL) might return a 1bit/pixel
 black/white image instead of 8bit/pixel gray shaded one (happened with 16px
 japanese glyphs of simsun.ttf, latin ones were correct).

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1482 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 9efa1a92..8de2efe4 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -578,7 +578,7 @@ begin
   for Pet := 0 to High(ATrack) do begin
     SetFontPos(11, Y + 10 + Pet*YSkip);
     SetFontSize(15);
-    glPrint(pchar(ATrack[Pet].Name));
+    glPrint(ATrack[Pet].Name);
   end;
 
   for Pet := 0 to High(ATrack) do
-- 
cgit v1.2.3


From 6585afce2ccd8e7c5ccb3bb3599d4723b00a0433 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 28 Oct 2008 20:16:05 +0000
Subject: some compiler warnings/hints removed

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1485 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8de2efe4..8cc6c59d 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -127,8 +127,6 @@ uses UGraphic,
      USkins;
 
 function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
-var
-  T:    integer;
 begin
   Result := true;
   If (PressedDown) Then
-- 
cgit v1.2.3


From d33f56a40d9e8325a2782f90bb253dece5127c5f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 3 Nov 2008 14:53:17 +0000
Subject: All comments are English now (Polish ones have been translated)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1498 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8cc6c59d..97a4bf2c 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -328,7 +328,7 @@ begin
   Lines.Line[C].HighNote := -1;
 
   for Nu := 0 to High(Note) do begin
-    if Note[Nu].NewSentence then begin // nowa linijka
+    if Note[Nu].NewSentence then begin // new line
       SetLength(Lines.Line, Length(Lines.Line)+1);
       Lines.Number := Lines.Number + 1;
       Lines.High := Lines.High + 1;
@@ -359,10 +359,10 @@ begin
       end;
     end;
 
-    // tworzy miejsce na nowa nute
+    // create space for new note
     SetLength(Lines.Line[C].Note, Length(Lines.Line[C].Note)+1);
 
-    // dopisuje
+    // initialize note
     Lines.Line[C].Note[N].Start := Note[Nu].Start;
     Lines.Line[C].Note[N].Length := Note[Nu].Len;
     Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
@@ -526,8 +526,8 @@ end;
 
 function TScreenEditConvert.Draw: boolean;
 var
-  Pet:    integer;
-  Pet2:   integer;
+  Count:    integer;
+  Count2:   integer;
   Bottom: real;
   X:      real;
   Y:      real;
@@ -549,18 +549,18 @@ begin
   DrawQuad(10, Y+Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
 
   // selected - now me use Status System
-  for Pet := 0 to High(ATrack) do
-    if ATrack[Pet].Hear then
-      DrawQuad(10, Y+Pet*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
+  for Count := 0 to High(ATrack) do
+    if ATrack[Count].Hear then
+      DrawQuad(10, Y+Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
-  for Pet := 0 to High(ATrack) do begin
-    if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
-      SetFontPos(25, Y + Pet*YSkip + 10);
+  for Count := 0 to High(ATrack) do begin
+    if ((ATrack[Count].Status div 1) and 1) = 1 then begin
+      SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
-      SetFontPos(40, Y + Pet*YSkip + 10);
+    if ((ATrack[Count].Status div 2) and 1) = 1 then begin
+      SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('L');
     end;
@@ -570,21 +570,21 @@ begin
   DrawLine(60, Y,   60, Bottom, 0, 0, 0);
   DrawLine(790, Y, 790, Bottom, 0, 0, 0);
 
-  for Pet := 0 to Length(ATrack) do
-    DrawLine(10, Y+Pet*YSkip, 790, Y+Pet*YSkip, 0, 0, 0);
+  for Count := 0 to Length(ATrack) do
+    DrawLine(10, Y+Count*YSkip, 790, Y+Count*YSkip, 0, 0, 0);
 
-  for Pet := 0 to High(ATrack) do begin
-    SetFontPos(11, Y + 10 + Pet*YSkip);
+  for Count := 0 to High(ATrack) do begin
+    SetFontPos(11, Y + 10 + Count*YSkip);
     SetFontSize(15);
-    glPrint(ATrack[Pet].Name);
+    glPrint(ATrack[Count].Name);
   end;
 
-  for Pet := 0 to High(ATrack) do
-    for Pet2 := 0 to High(ATrack[Pet].Note) do begin
-      if ATrack[Pet].Note[Pet2].EventType = 9 then
-        DrawQuad(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + (Pet+1)*YSkip - ATrack[Pet].Note[Pet2].Data1*35/127, 3, 3, ColR[Pet], ColG[Pet], ColB[Pet]);
-      if ATrack[Pet].Note[Pet2].EventType = 15 then
-        DrawLine(60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + 0.75 * YSkip + Pet*YSkip, 60 + ATrack[Pet].Note[Pet2].Start/Len * 725, Y + YSkip + Pet*YSkip, ColR[Pet], ColG[Pet], ColB[Pet]);
+  for Count := 0 to High(ATrack) do
+    for Count2 := 0 to High(ATrack[Count].Note) do begin
+      if ATrack[Count].Note[Count2].EventType = 9 then
+        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127, 3, 3, ColR[Count], ColG[Count], ColB[Count]);
+      if ATrack[Count].Note[Count2].EventType = 15 then
+        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + 0.75 * YSkip + Count*YSkip, 60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + YSkip + Count*YSkip, ColR[Count], ColG[Count], ColB[Count]);
     end;
 
   // playing line
-- 
cgit v1.2.3


From d826e9135078f7fa719046069ce10da1e382bfc3 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 27 Nov 2008 21:50:41 +0000
Subject: some more formatting

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1530 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 229 ++++++++++++++++++++++---------------
 1 file changed, 135 insertions(+), 94 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 97a4bf2c..24f2730c 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -33,35 +33,36 @@ interface
 
 {$I switches.inc}
 
-uses UMenu,
-     SDL,
-     {$IFDEF UseMIDIPort}
-     MidiFile,
-     MidiOut,
-     {$ENDIF}
-     ULog,
-     USongs,
-     USong,
-     UMusic,
-     UThemes;
+uses
+  UMenu,
+  SDL,
+  {$IFDEF UseMIDIPort}
+  MidiFile,
+  MidiOut,
+  {$ENDIF}
+  ULog,
+  USongs,
+  USong,
+  UMusic,
+  UThemes;
 
 type
   TNote = record
-    Event:        integer;
-    EventType:    integer;
-    Channel:    integer;
-    Start:    real;
-    Len:      real;
-    Data1:    integer;
-    Data2:    integer;
-    Str:      string;
+    Event:     integer;
+    EventType: integer;
+    Channel:   integer;
+    Start:     real;
+    Len:       real;
+    Data1:     integer;
+    Data2:     integer;
+    Str:       string;
   end;
 
   TTrack = record
-    Note:     array of TNote;
-    Name:     string;
-    Hear:     boolean;
-    Status:   byte;     // 0 - none, 1 - notes, 2 - lyrics, 3 - notes + lyrics
+    Note:   array of TNote;
+    Name:   string;
+    Hear:   boolean;
+    Status: byte;     // 0 - none, 1 - notes, 2 - lyrics, 3 - notes + lyrics
   end;
 
   TNuta = record
@@ -76,29 +77,29 @@ type
 
   TScreenEditConvert = class(TMenu)
     public
-      ATrack:             TArrayTrack; // actual track
-//      Track:              TArrayTrack;
-      Channel:            TArrayTrack;
-      ColR:               array[0..100] of real;
-      ColG:               array[0..100] of real;
-      ColB:               array[0..100] of real;
-      Len:                real;
-      Sel:                integer;
-      Selected:           boolean;
-//      FileName:           string;
+      ATrack:    TArrayTrack; // actual track
+//      Track:     TArrayTrack;
+      Channel:   TArrayTrack;
+      ColR:      array[0..100] of real;
+      ColG:      array[0..100] of real;
+      ColB:      array[0..100] of real;
+      Len:       real;
+      Sel:       integer;
+      Selected:  boolean;
+//      FileName:  string;
 
       {$IFDEF UseMIDIPort}
-      MidiFile:           TMidiFile;
-      MidiTrack:          TMidiTrack;
-      MidiEvent:          pMidiEvent;
-      MidiOut:            TMidiOutput;
+      MidiFile:  TMidiFile;
+      MidiTrack: TMidiTrack;
+      MidiEvent: pMidiEvent;
+      MidiOut:   TMidiOutput;
       {$ENDIF}
       
-      Song:               TSong;
-      Lines:              TLines;
-      BPM:                real;
-      Ticks:              real;
-      Note:               array of TNuta;
+      Song:      TSong;
+      Lines:     TLines;
+      BPM:       real;
+      Ticks:     real;
+      Note:      array of TNuta;
 
       procedure AddLyric(Start: integer; Text: string);
       procedure Extract;
@@ -110,23 +111,25 @@ type
       function SelectedNumber: integer;
       constructor Create; override;
       procedure onShow; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure onHide; override;
   end;
 
 implementation
-uses UGraphic,
-     SysUtils,
-     UDrawTexture,
-     TextGL,
-     UFiles,
-     UMain,
-     UIni,
-     gl,
-     USkins;
-
-function TScreenEditConvert.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
+
+uses
+  UGraphic,
+  SysUtils,
+  UDrawTexture,
+  TextGL,
+  UFiles,
+  UMain,
+  UIni,
+  gl,
+  USkins;
+
+function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
   If (PressedDown) Then
@@ -171,13 +174,16 @@ begin
             {$ENDIF}
           end;
 
-          if Interaction = 2 then begin
+          if Interaction = 2 then
+	  begin
             Selected := true;
             {$IFDEF UseMIDIPort}
             MidiFile.OnMidiEvent := nil;
             {$ENDIF}
-            {for T := 0 to High(ATrack) do begin
-              if ATrack[T].Hear then begin
+            {for T := 0 to High(ATrack) do
+	    begin
+              if ATrack[T].Hear then
+	      begin
                 MidiTrack := MidiFile.GetTrack(T);
                 MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
               end;
@@ -185,8 +191,10 @@ begin
             MidiFile.StartPlaying;//}
           end;
 
-          if Interaction = 3 then begin
-            if SelectedNumber > 0 then begin
+          if Interaction = 3 then
+	  begin
+            if SelectedNumber > 0 then
+	    begin
               Extract;
               SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
             end;
@@ -199,7 +207,8 @@ begin
 //          ATrack[Sel].Hear := not ATrack[Sel].Hear;
           ATrack[Sel].Status := (ATrack[Sel].Status + 1) mod 4;
 
-{          if Selected then begin
+{          if Selected then
+          begin
             MidiTrack := MidiFile.GetTrack(Sel);
             if Track[Sel].Hear then
               MidiTrack.OnMidiEvent := MidiFile1MidiEvent
@@ -221,12 +230,14 @@ begin
       SDLK_DOWN:
         begin
           Inc(Sel);
-          if Sel > High(ATrack) then Sel := 0;
+          if Sel > High(ATrack) then
+	    Sel := 0;
         end;
       SDLK_UP:
         begin
           Dec(Sel);
-          if Sel < 0 then Sel := High(ATrack);
+          if Sel < 0 then
+	    Sel := High(ATrack);
         end;
     end;
   end;
@@ -236,11 +247,15 @@ procedure TScreenEditConvert.AddLyric(Start: integer; Text: string);
 var
   N:    integer;
 begin
-  for N := 0 to High(Note) do begin
-    if Note[N].Start = Start then begin
+  for N := 0 to High(Note) do
+  begin
+    if Note[N].Start = Start then
+    begin
       // check for new sentece
-      if Copy(Text, 1, 1) = '\' then Delete(Text, 1, 1);
-      if Copy(Text, 1, 1) = '/' then begin
+      if Copy(Text, 1, 1) = '\' then
+        Delete(Text, 1, 1);
+      if Copy(Text, 1, 1) = '/' then
+      begin
         Delete(Text, 1, 1);
         Note[N].NewSentence := true;
       end;
@@ -275,11 +290,16 @@ begin
   SetLength(Note, 0);
 
   // extract notes
-  for T := 0 to High(ATrack) do begin
-//    if ATrack[T].Hear then begin
-    if ((ATrack[T].Status div 1) and 1) = 1 then begin
-      for N := 0 to High(ATrack[T].Note) do begin
-        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then begin
+  for T := 0 to High(ATrack) do
+  begin
+//    if ATrack[T].Hear then
+//    begin
+    if ((ATrack[T].Status div 1) and 1) = 1 then
+    begin
+      for N := 0 to High(ATrack[T].Note) do
+      begin
+        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then
+	begin
           Nu := Length(Note);
           SetLength(Note, Nu + 1);
           Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
@@ -292,11 +312,16 @@ begin
   end;
 
   // extract lyrics
-  for T := 0 to High(ATrack) do begin
-//    if ATrack[T].Hear then begin
-    if ((ATrack[T].Status div 2) and 1) = 1 then begin
-      for N := 0 to High(ATrack[T].Note) do begin
-        if (ATrack[T].Note[N].EventType = 15) then begin
+  for T := 0 to High(ATrack) do
+  begin
+//    if ATrack[T].Hear then
+//    begin
+    if ((ATrack[T].Status div 2) and 1) = 1 then
+    begin
+      for N := 0 to High(ATrack[T].Note) do
+      begin
+        if (ATrack[T].Note[N].EventType = 15) then
+	begin
 //          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
           AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
         end;
@@ -307,7 +332,8 @@ begin
   // sort notes
   for N := 0 to High(Note) do
     for Nu := 0 to High(Note)-1 do
-      if Note[Nu].Start > Note[Nu+1].Start then begin
+      if Note[Nu].Start > Note[Nu+1].Start then
+      begin
         NoteTemp := Note[Nu];
         Note[Nu] := Note[Nu+1];
         Note[Nu+1] := NoteTemp;
@@ -327,8 +353,10 @@ begin
   N := 0;
   Lines.Line[C].HighNote := -1;
 
-  for Nu := 0 to High(Note) do begin
-    if Note[Nu].NewSentence then begin // new line
+  for Nu := 0 to High(Note) do
+  begin
+    if Note[Nu].NewSentence then // new line
+    begin
       SetLength(Lines.Line, Length(Lines.Line)+1);
       Lines.Number := Lines.Number + 1;
       Lines.High := Lines.High + 1;
@@ -379,8 +407,10 @@ var
 begin
   Result := 0;
   for T := 0 to High(ATrack) do
-//    if ATrack[T].Hear then Inc(Result);
-    if ((ATrack[T].Status div 1) and 1) = 1 then Inc(Result);
+//    if ATrack[T].Hear then
+//      Inc(Result);
+    if ((ATrack[T].Status div 1) and 1) = 1 then
+      Inc(Result);
 end;
 
 {$IFDEF UseMIDIPort}
@@ -424,7 +454,8 @@ begin
   MidiFile := TMidiFile.Create(nil);
   {$ENDIF}
 
-  for P := 0 to 100 do begin
+  for P := 0 to 100 do
+  begin
     ColR[P] := Random(10)/10;
     ColG[P] := Random(10)/10;
     ColB[P] := Random(10)/10;
@@ -460,13 +491,15 @@ begin
     BPM := MidiFile.Bpm;
     Ticks := MidiFile.TicksPerQuarter / 4;
 
-{    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+{    for T := 0 to MidiFile.NumberOfTracks-1 do
+    begin
       SetLength(Track, Length(Track)+1);
       MidiTrack := MidiFile.GetTrack(T);
       MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
       Track[T].Name := MidiTrack.getName;
 
-      for N := 0 to MidiTrack.getEventCount-1 do begin
+      for N := 0 to MidiTrack.getEventCount-1 do
+      begin
         SetLength(Track[T].Note, Length(Track[T].Note)+1);
         MidiEvent := MidiTrack.GetEvent(N);
         Track[T].Note[N].Start := MidiEvent.time;
@@ -492,11 +525,13 @@ begin
       Channel[T].Status := 0;
     end;
 
-    for T := 0 to MidiFile.NumberOfTracks-1 do begin
+    for T := 0 to MidiFile.NumberOfTracks-1 do
+    begin
       MidiTrack := MidiFile.GetTrack(T);
       MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
 
-      for N := 0 to MidiTrack.getEventCount-1 do begin
+      for N := 0 to MidiTrack.getEventCount-1 do
+      begin
         MidiEvent := MidiTrack.GetEvent(N);
         C := MidiEvent.event and 15;
 
@@ -526,8 +561,8 @@ end;
 
 function TScreenEditConvert.Draw: boolean;
 var
-  Count:    integer;
-  Count2:   integer;
+  Count:  integer;
+  Count2: integer;
   Bottom: real;
   X:      real;
   Y:      real;
@@ -540,7 +575,8 @@ begin
   Y := 100;
 
   H := Length(ATrack)*40;
-  if H > 480 then H := 480;
+  if H > 480 then
+    H := 480;
   Bottom := Y + H;
 
   YSkip := H / Length(ATrack);
@@ -553,13 +589,16 @@ begin
     if ATrack[Count].Hear then
       DrawQuad(10, Y+Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
-  for Count := 0 to High(ATrack) do begin
-    if ((ATrack[Count].Status div 1) and 1) = 1 then begin
+  for Count := 0 to High(ATrack) do
+  begin
+    if ((ATrack[Count].Status div 1) and 1) = 1 then
+    begin
       SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if ((ATrack[Count].Status div 2) and 1) = 1 then begin
+    if ((ATrack[Count].Status div 2) and 1) = 1 then
+    begin
       SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('L');
@@ -573,14 +612,16 @@ begin
   for Count := 0 to Length(ATrack) do
     DrawLine(10, Y+Count*YSkip, 790, Y+Count*YSkip, 0, 0, 0);
 
-  for Count := 0 to High(ATrack) do begin
+  for Count := 0 to High(ATrack) do
+  begin
     SetFontPos(11, Y + 10 + Count*YSkip);
     SetFontSize(15);
     glPrint(ATrack[Count].Name);
   end;
 
   for Count := 0 to High(ATrack) do
-    for Count2 := 0 to High(ATrack[Count].Note) do begin
+    for Count2 := 0 to High(ATrack[Count].Note) do
+    begin
       if ATrack[Count].Note[Count2].EventType = 9 then
         DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127, 3, 3, ColR[Count], ColG[Count], ColB[Count]);
       if ATrack[Count].Note[Count2].EventType = 15 then
-- 
cgit v1.2.3


From 1b3ba5ddb4b810b11eabdc8f2d99c5dca2a1063c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 13 Dec 2008 21:11:10 +0000
Subject: replace terrible code by using a set for Notes and Lyrics.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1540 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 24f2730c..56afdefd 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -62,7 +62,7 @@ type
     Note:   array of TNote;
     Name:   string;
     Hear:   boolean;
-    Status: byte;     // 0 - none, 1 - notes, 2 - lyrics, 3 - notes + lyrics
+    Status: set of (notes, lyrics);
   end;
 
   TNuta = record
@@ -205,7 +205,16 @@ begin
       SDLK_SPACE:
         begin
 //          ATrack[Sel].Hear := not ATrack[Sel].Hear;
-          ATrack[Sel].Status := (ATrack[Sel].Status + 1) mod 4;
+	  if Notes in ATrack[Sel].Status then
+	  begin
+	    ATrack[Sel].Status := ATrack[Sel].Status - [Notes];
+	    if Lyrics in ATrack[Sel].Status then
+	      ATrack[Sel].Status := ATrack[Sel].Status - [Lyrics]
+	    else
+	      ATrack[Sel].Status := ATrack[Sel].Status + [Lyrics];
+	  end
+	  else
+	    ATrack[Sel].Status := ATrack[Sel].Status + [Notes];
 
 {          if Selected then
           begin
@@ -294,7 +303,7 @@ begin
   begin
 //    if ATrack[T].Hear then
 //    begin
-    if ((ATrack[T].Status div 1) and 1) = 1 then
+    if Notes in ATrack[T].Status then
     begin
       for N := 0 to High(ATrack[T].Note) do
       begin
@@ -316,7 +325,7 @@ begin
   begin
 //    if ATrack[T].Hear then
 //    begin
-    if ((ATrack[T].Status div 2) and 1) = 1 then
+    if Lyrics in ATrack[T].Status then
     begin
       for N := 0 to High(ATrack[T].Note) do
       begin
@@ -409,7 +418,7 @@ begin
   for T := 0 to High(ATrack) do
 //    if ATrack[T].Hear then
 //      Inc(Result);
-    if ((ATrack[T].Status div 1) and 1) = 1 then
+    if Notes in ATrack[T].Status then
       Inc(Result);
 end;
 
@@ -516,13 +525,12 @@ begin
       end;
     end;}
 
-
     SetLength(Channel, 16);
     for T := 0 to 15 do
     begin
       Channel[T].Name := IntToStr(T+1);
       SetLength(Channel[T].Note, 0);
-      Channel[T].Status := 0;
+      Channel[T].Status := [];
     end;
 
     for T := 0 to MidiFile.NumberOfTracks-1 do
@@ -591,13 +599,13 @@ begin
   glColor3f(0, 0, 0);
   for Count := 0 to High(ATrack) do
   begin
-    if ((ATrack[Count].Status div 1) and 1) = 1 then
+    if Notes in ATrack[Count].Status then
     begin
       SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if ((ATrack[Count].Status div 2) and 1) = 1 then
+    if Lyrics in ATrack[Count].Status then
     begin
       SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
-- 
cgit v1.2.3


From 458111738476004a914af6fd3e117eb84a35ab6a Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 7 Mar 2009 01:06:07 +0000
Subject: unclutter UMain.pas. Create UPath.pas. Tests on all platformssvn
 statussvn status

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1625 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 56afdefd..8ef43770 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -119,14 +119,15 @@ type
 implementation
 
 uses
-  UGraphic,
   SysUtils,
-  UDrawTexture,
   TextGL,
+  gl,
+  UDrawTexture,
   UFiles,
-  UMain,
+  UGraphic,
   UIni,
-  gl,
+  UMain,
+  UPath,
   USkins;
 
 function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
-- 
cgit v1.2.3


From b38fa5a07ab1f5604372176c8e84ddfb075133ee Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 7 Mar 2009 19:53:00 +0000
Subject: unclutter Umain: ConversionFileName moved to UScreenEditConvert

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1626 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8ef43770..89fd64c5 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -116,6 +116,9 @@ type
       procedure onHide; override;
   end;
 
+var
+  ConversionFileName: string;
+
 implementation
 
 uses
-- 
cgit v1.2.3


From c7f5d683c1eae49e30ee42a76557661f57311b9e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 25 Apr 2009 10:09:59 +0000
Subject: Cosmetics. No code change

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1694 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 43 ++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 89fd64c5..361a3be7 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -136,7 +136,7 @@ uses
 function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
 begin
   Result := true;
-  If (PressedDown) Then
+  if (PressedDown) then
   begin // Key Down
     // check normal keys
     case WideCharUpperCase(CharCode)[1] of
@@ -179,15 +179,15 @@ begin
           end;
 
           if Interaction = 2 then
-	  begin
+          begin
             Selected := true;
             {$IFDEF UseMIDIPort}
             MidiFile.OnMidiEvent := nil;
             {$ENDIF}
             {for T := 0 to High(ATrack) do
-	    begin
+            begin
               if ATrack[T].Hear then
-	      begin
+              begin
                 MidiTrack := MidiFile.GetTrack(T);
                 MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
               end;
@@ -196,9 +196,9 @@ begin
           end;
 
           if Interaction = 3 then
-	  begin
+          begin
             if SelectedNumber > 0 then
-	    begin
+            begin
               Extract;
               SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
             end;
@@ -209,16 +209,16 @@ begin
       SDLK_SPACE:
         begin
 //          ATrack[Sel].Hear := not ATrack[Sel].Hear;
-	  if Notes in ATrack[Sel].Status then
-	  begin
-	    ATrack[Sel].Status := ATrack[Sel].Status - [Notes];
-	    if Lyrics in ATrack[Sel].Status then
-	      ATrack[Sel].Status := ATrack[Sel].Status - [Lyrics]
-	    else
-	      ATrack[Sel].Status := ATrack[Sel].Status + [Lyrics];
-	  end
-	  else
-	    ATrack[Sel].Status := ATrack[Sel].Status + [Notes];
+          if Notes in ATrack[Sel].Status then
+          begin
+            ATrack[Sel].Status := ATrack[Sel].Status - [Notes];
+            if Lyrics in ATrack[Sel].Status then
+              ATrack[Sel].Status := ATrack[Sel].Status - [Lyrics]
+            else
+              ATrack[Sel].Status := ATrack[Sel].Status + [Lyrics];
+          end
+          else
+            ATrack[Sel].Status := ATrack[Sel].Status + [Notes];
 
 {          if Selected then
           begin
@@ -244,13 +244,13 @@ begin
         begin
           Inc(Sel);
           if Sel > High(ATrack) then
-	    Sel := 0;
+            Sel := 0;
         end;
       SDLK_UP:
         begin
           Dec(Sel);
           if Sel < 0 then
-	    Sel := High(ATrack);
+            Sel := High(ATrack);
         end;
     end;
   end;
@@ -312,7 +312,7 @@ begin
       for N := 0 to High(ATrack[T].Note) do
       begin
         if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then
-	begin
+        begin
           Nu := Length(Note);
           SetLength(Note, Nu + 1);
           Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
@@ -334,7 +334,7 @@ begin
       for N := 0 to High(ATrack[T].Note) do
       begin
         if (ATrack[T].Note[N].EventType = 15) then
-	begin
+        begin
 //          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
           AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
         end;
@@ -452,7 +452,6 @@ begin
   AddButton(500, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(20, 5, 0, 0, 0, 'Save');
 
-
 {  MidiOut := TMidiOutput.Create(nil);
 //  MidiOut.Close;
 //  MidiOut.DeviceID := 0;
@@ -492,13 +491,11 @@ begin
   Log.LogStatus(MidiOut.ProductName, 'MIDI');
   MidiOut.Open;
 
-
   if FileExists(ConversionFileName) then
   begin
     MidiFile.Filename := ConversionFileName;
     MidiFile.ReadFile;
 
-
     Len := 0;
     Sel := 0;
     BPM := MidiFile.Bpm;
-- 
cgit v1.2.3


From a4d1d415d9dda4aada1126a2b520a3588e446d12 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 1 Jun 2009 20:50:52 +0000
Subject: fix a mac crash and possibly others. division by zero

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1797 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 43 ++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 361a3be7..e4a691cf 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -34,6 +34,7 @@ interface
 {$I switches.inc}
 
 uses
+  math,
   UMenu,
   SDL,
   {$IFDEF UseMIDIPort}
@@ -575,7 +576,7 @@ var
   Bottom: real;
   X:      real;
   Y:      real;
-  H:      real;
+  Height: real;
   YSkip:  real;
 begin
   // draw static menu
@@ -583,20 +584,24 @@ begin
 
   Y := 100;
 
-  H := Length(ATrack)*40;
-  if H > 480 then
-    H := 480;
-  Bottom := Y + H;
+  Height := min(480, 40 * Length(ATrack));
+  Bottom := Y + Height;
 
-  YSkip := H / Length(ATrack);
+  if Length(ATrack) = 0 then // prevent crash with uncomplete code. 
+  begin
+    Log.LogDebug ('UScreenEditConvert -> TScreenEditConvert.Draw:', 'Length(ATrack) = 0');
+    YSkip := 40;
+  end
+  else 
+    YSkip := Height / Length(ATrack);
 
   // select
-  DrawQuad(10, Y+Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
+  DrawQuad(10, Y + Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
 
   // selected - now me use Status System
   for Count := 0 to High(ATrack) do
     if ATrack[Count].Hear then
-      DrawQuad(10, Y+Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
+      DrawQuad(10, Y + Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
   for Count := 0 to High(ATrack) do
   begin
@@ -614,12 +619,12 @@ begin
     end;
   end;
 
-  DrawLine(10, Y,   10, Bottom, 0, 0, 0);
-  DrawLine(60, Y,   60, Bottom, 0, 0, 0);
+  DrawLine( 10, Y,  10, Bottom, 0, 0, 0);
+  DrawLine( 60, Y,  60, Bottom, 0, 0, 0);
   DrawLine(790, Y, 790, Bottom, 0, 0, 0);
 
   for Count := 0 to Length(ATrack) do
-    DrawLine(10, Y+Count*YSkip, 790, Y+Count*YSkip, 0, 0, 0);
+    DrawLine(10, Y + Count*YSkip, 790, Y + Count*YSkip, 0, 0, 0);
 
   for Count := 0 to High(ATrack) do
   begin
@@ -632,9 +637,21 @@ begin
     for Count2 := 0 to High(ATrack[Count].Note) do
     begin
       if ATrack[Count].Note[Count2].EventType = 9 then
-        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127, 3, 3, ColR[Count], ColG[Count], ColB[Count]);
+        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len*725,
+                 Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127,
+                 3,
+                 3,
+                 ColR[Count],
+                 ColG[Count],
+                 ColB[Count]);
       if ATrack[Count].Note[Count2].EventType = 15 then
-        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + 0.75 * YSkip + Count*YSkip, 60 + ATrack[Count].Note[Count2].Start/Len * 725, Y + YSkip + Count*YSkip, ColR[Count], ColG[Count], ColB[Count]);
+        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len*725,
+                 Y + 0.75*YSkip + Count*YSkip,
+                 60 + ATrack[Count].Note[Count2].Start/Len*725,
+                 Y + YSkip + Count*YSkip,
+                 ColR[Count],
+                 ColG[Count],
+                 ColB[Count]);
     end;
 
   // playing line
-- 
cgit v1.2.3


From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Nov 2009 00:27:55 +0000
Subject: merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 679 +++++++++++++++++++++++--------------
 1 file changed, 416 insertions(+), 263 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index e4a691cf..b2fb7773 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -25,6 +25,29 @@
 
 unit UScreenEditConvert;
 
+{*
+ * See
+ * MIDI Recommended Practice (RP-017): SMF Lyric Meta Event Definition
+ *   http://www.midi.org/techspecs/rp17.php
+ * MIDI Recommended Practice (RP-026): SMF Language and Display Extensions
+ *   http://www.midi.org/techspecs/rp26.php
+ * MIDI File Format
+ *   http://www.sonicspot.com/guide/midifiles.html
+ * KMIDI File Format
+ *   http://gnese.free.fr/Projects/KaraokeTime/Fichiers/karfaq.html
+ *   http://journals.rpungin.fotki.com/karaoke/category/midi
+ *
+ * There are two widely spread karaoke formats:
+ * - KMIDI (.kar), an inofficial midi extension by Tune 1000
+ * - Standard Midi files with lyric meta-tags (SMF with lyrics, .mid).
+ *
+ * KMIDI uses two tracks, the first just contains a header (mostly track 2) and
+ * the second the lyrics (track 3). It uses text meta tags for the lyrics.
+ * SMF uses just one track (normally track 1) and uses lyric meta tags for storage.
+ *
+ * Most files are in the KMIDI format. Some Midi files contain both lyric types.
+ *}
+
 interface
 
 {$IFDEF FPC}
@@ -45,10 +68,11 @@ uses
   USongs,
   USong,
   UMusic,
-  UThemes;
+  UThemes,
+  UPath;
 
 type
-  TNote = record
+  TMidiNote = record
     Event:     integer;
     EventType: integer;
     Channel:   integer;
@@ -56,70 +80,65 @@ type
     Len:       real;
     Data1:     integer;
     Data2:     integer;
-    Str:       string;
+    Str:       UTF8String; // normally ASCII
   end;
 
+  TLyricType = (ltKMIDI, ltSMFLyric);
+
   TTrack = record
-    Note:   array of TNote;
-    Name:   string;
-    Hear:   boolean;
-    Status: set of (notes, lyrics);
+    Note:   array of TMidiNote;
+    Name:   UTF8String; // normally ASCII
+    Status: set of (tsNotes, tsLyrics); //< track contains notes, lyrics or both
+    LyricType: set of TLyricType;
+    NoteType:  (ntNone, ntAvail);
   end;
 
-  TNuta = record
+  TNote = record
     Start:    integer;
     Len:      integer;
     Tone:     integer;
-    Lyric:    string;
+    Lyric:    UTF8String;
     NewSentence:  boolean;
   end;
 
   TArrayTrack = array of TTrack;
 
   TScreenEditConvert = class(TMenu)
-    public
-      ATrack:    TArrayTrack; // actual track
-//      Track:     TArrayTrack;
-      Channel:   TArrayTrack;
+    private
+      Tracks:    TArrayTrack; // current track
       ColR:      array[0..100] of real;
       ColG:      array[0..100] of real;
       ColB:      array[0..100] of real;
       Len:       real;
-      Sel:       integer;
-      Selected:  boolean;
-//      FileName:  string;
+      SelTrack:  integer;     // index of selected track
+      fFileName: IPath;
 
       {$IFDEF UseMIDIPort}
       MidiFile:  TMidiFile;
-      MidiTrack: TMidiTrack;
-      MidiEvent: pMidiEvent;
       MidiOut:   TMidiOutput;
       {$ENDIF}
-      
-      Song:      TSong;
-      Lines:     TLines;
+
       BPM:       real;
       Ticks:     real;
-      Note:      array of TNuta;
+      Note:      array of TNote;
 
-      procedure AddLyric(Start: integer; Text: string);
-      procedure Extract;
+      procedure AddLyric(Start: integer; LyricType: TLyricType; Text: UTF8String);
+      procedure Extract(out Song: TSong; out Lines: TLines);
 
       {$IFDEF UseMIDIPort}
       procedure MidiFile1MidiEvent(event: PMidiEvent);
       {$ENDIF}
-      
-      function SelectedNumber: integer;
+
+      function CountSelectedTracks: integer;
+
+    public
       constructor Create; override;
-      procedure onShow; override;
-      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
-      procedure onHide; override;
+      procedure OnHide; override;
   end;
 
-var
-  ConversionFileName: string;
-
 implementation
 
 uses
@@ -131,17 +150,42 @@ uses
   UGraphic,
   UIni,
   UMain,
-  UPath,
-  USkins;
-
-function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+  UPathUtils,
+  USkins,
+  ULanguage,
+  UTextEncoding,
+  UUnicodeUtils;
+
+const
+  // MIDI/KAR lyrics are specified to be ASCII only.
+  // Assume backward compatible CP1252 encoding.
+  DEFAULT_ENCODING = encCP1252;
+
+const
+  MIDI_EVENTTYPE_NOTEOFF    = $8;
+  MIDI_EVENTTYPE_NOTEON     = $9;
+  MIDI_EVENTTYPE_META_SYSEX = $F;
+
+  MIDI_EVENT_META = $FF;
+  MIDI_META_TEXT   = $1;
+  MIDI_META_LYRICS = $5;
+
+function TScreenEditConvert.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
+{$IFDEF UseMIDIPort}
+var
+  SResult: TSaveSongResult;
+  Playing: boolean;
+  MidiTrack: TMidiTrack;
+  Song:  TSong;
+  Lines: TLines;
+{$ENDIF}
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
+    case UCS4UpperCase(CharCode) of
+      Ord('Q'):
         begin
           Result := false;
           Exit;
@@ -153,9 +197,10 @@ begin
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
         begin
-      {$IFDEF UseMIDIPort}
-          MidiFile.StopPlaying;
-      {$ENDIF}
+          {$IFDEF UseMIDIPort}
+          if (MidiFile <> nil) then
+            MidiFile.StopPlaying;
+          {$ENDIF}
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(@ScreenEdit);
         end;
@@ -165,70 +210,97 @@ begin
           if Interaction = 0 then
           begin
             AudioPlayback.PlaySound(SoundLib.Start);
+            ScreenOpen.Filename := GamePath.Append('file.mid');
             ScreenOpen.BackScreen := @ScreenEditConvert;
             FadeTo(@ScreenOpen);
-          end;
-
-          if Interaction = 1 then
+          end
+          else if Interaction = 1 then
           begin
-            Selected := false;
-      {$IFDEF UseMIDIPort}
-            MidiFile.OnMidiEvent := MidiFile1MidiEvent;
-//            MidiFile.GoToTime(MidiFile.GetTrackLength div 2);
-            MidiFile.StartPlaying;
+            {$IFDEF UseMIDIPort}
+            if (MidiFile <> nil) then
+            begin
+              MidiFile.OnMidiEvent := MidiFile1MidiEvent;
+              //MidiFile.GoToTime(MidiFile.GetTrackLength div 2);
+              MidiFile.StartPlaying;
+            end;
             {$ENDIF}
-          end;
-
-          if Interaction = 2 then
+          end
+          else if Interaction = 2 then
           begin
-            Selected := true;
             {$IFDEF UseMIDIPort}
-            MidiFile.OnMidiEvent := nil;
-            {$ENDIF}
-            {for T := 0 to High(ATrack) do
+            if (MidiFile <> nil) then
             begin
-              if ATrack[T].Hear then
-              begin
-                MidiTrack := MidiFile.GetTrack(T);
-                MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
-              end;
+              MidiFile.OnMidiEvent := nil;
+              MidiFile.StartPlaying;
             end;
-            MidiFile.StartPlaying;//}
-          end;
-
-          if Interaction = 3 then
+            {$ENDIF}
+          end
+          else if Interaction = 3 then
           begin
-            if SelectedNumber > 0 then
+            {$IFDEF UseMIDIPort}
+            if CountSelectedTracks > 0 then
+            begin
+              Extract(Song, Lines);
+              SResult := SaveSong(Song, Lines, fFileName.SetExtension('.txt'),
+                       false);
+              FreeAndNil(Song);
+              if (SResult = ssrOK) then
+                ScreenPopupInfo.ShowPopup(Language.Translate('INFO_FILE_SAVED'))
+              else
+                ScreenPopupError.ShowPopup(Language.Translate('ERROR_SAVE_FILE_FAILED'));
+            end
+            else
             begin
-              Extract;
-              SaveSong(Song, Lines, ChangeFileExt(ConversionFileName, '.txt'), false);
+              ScreenPopupError.ShowPopup(Language.Translate('EDITOR_ERROR_NO_TRACK_SELECTED'));
             end;
+            {$ENDIF}
           end;
 
         end;
 
       SDLK_SPACE:
         begin
-//          ATrack[Sel].Hear := not ATrack[Sel].Hear;
-          if Notes in ATrack[Sel].Status then
+          {$IFDEF UseMIDIPort}
+          if (MidiFile <> nil) then
           begin
-            ATrack[Sel].Status := ATrack[Sel].Status - [Notes];
-            if Lyrics in ATrack[Sel].Status then
-              ATrack[Sel].Status := ATrack[Sel].Status - [Lyrics]
-            else
-              ATrack[Sel].Status := ATrack[Sel].Status + [Lyrics];
-          end
-          else
-            ATrack[Sel].Status := ATrack[Sel].Status + [Notes];
+            if (Tracks[SelTrack].NoteType = ntAvail) and
+               (Tracks[SelTrack].LyricType <> []) then
+            begin
+              if (Tracks[SelTrack].Status = []) then
+                Tracks[SelTrack].Status := [tsNotes]
+              else if (Tracks[SelTrack].Status = [tsNotes]) then
+                Tracks[SelTrack].Status := [tsLyrics]
+              else if (Tracks[SelTrack].Status = [tsLyrics]) then
+                Tracks[SelTrack].Status := [tsNotes, tsLyrics]
+              else if (Tracks[SelTrack].Status = [tsNotes, tsLyrics]) then
+                Tracks[SelTrack].Status := [];
+            end
+            else if (Tracks[SelTrack].NoteType = ntAvail) then
+            begin
+              if (Tracks[SelTrack].Status = []) then
+                Tracks[SelTrack].Status := [tsNotes]
+              else
+                Tracks[SelTrack].Status := [];
+            end
+            else if (Tracks[SelTrack].LyricType <> []) then
+            begin
+              if (Tracks[SelTrack].Status = []) then
+                Tracks[SelTrack].Status := [tsLyrics]
+              else
+                Tracks[SelTrack].Status := [];
+            end;
 
-{          if Selected then
-          begin
-            MidiTrack := MidiFile.GetTrack(Sel);
-            if Track[Sel].Hear then
+            Playing := (MidiFile.GetCurrentTime > 0);
+            MidiFile.StopPlaying();
+            MidiTrack := MidiFile.GetTrack(SelTrack);
+            if tsNotes in Tracks[SelTrack].Status then
               MidiTrack.OnMidiEvent := MidiFile1MidiEvent
             else
               MidiTrack.OnMidiEvent := nil;
-          end;}
+            if (Playing) then
+              MidiFile.ContinuePlaying();
+          end;
+          {$ENDIF}
         end;
 
       SDLK_RIGHT:
@@ -243,102 +315,161 @@ begin
 
       SDLK_DOWN:
         begin
-          Inc(Sel);
-          if Sel > High(ATrack) then
-            Sel := 0;
+          Inc(SelTrack);
+          if SelTrack > High(Tracks) then
+            SelTrack := 0;
         end;
       SDLK_UP:
         begin
-          Dec(Sel);
-          if Sel < 0 then
-            Sel := High(ATrack);
+          Dec(SelTrack);
+          if SelTrack < 0 then
+            SelTrack := High(Tracks);
         end;
     end;
   end;
 end;
 
-procedure TScreenEditConvert.AddLyric(Start: integer; Text: string);
+procedure TScreenEditConvert.AddLyric(Start: integer; LyricType: TLyricType; Text: UTF8String);
 var
   N:    integer;
 begin
-  for N := 0 to High(Note) do
+  // find corresponding note
+  N := 0;
+  while (N <= High(Note)) do
   begin
     if Note[N].Start = Start then
-    begin
-      // check for new sentece
-      if Copy(Text, 1, 1) = '\' then
-        Delete(Text, 1, 1);
-      if Copy(Text, 1, 1) = '/' then
-      begin
-        Delete(Text, 1, 1);
-        Note[N].NewSentence := true;
-      end;
+      Break;
+    Inc(N);
+  end;
 
-      // overwrite lyric od append
-      if Note[N].Lyric = '-' then
-        Note[N].Lyric := Text
-      else
-        Note[N].Lyric := Note[N].Lyric + Text;
+  // check if note was found
+  if (N > High(Note)) then
+    Exit;
+  
+  // set text
+  if (LyricType = ltKMIDI) then
+  begin
+    // end of paragraph
+    if Copy(Text, 1, 1) = '\' then
+    begin
+      Delete(Text, 1, 1);
+    end
+    // end of line
+    else if Copy(Text, 1, 1) = '/' then
+    begin
+      Delete(Text, 1, 1);
+      Note[N].NewSentence := true;
+    end;
+  end
+  else // SMFLyric
+  begin
+    // Line Feed -> end of paragraph
+    if Copy(Text, 1, 1) = #$0A then
+    begin
+      Delete(Text, 1, 1);
+    end
+    // Carriage Return -> end of line
+    else if Copy(Text, 1, 1) = #$0D then
+    begin
+      Delete(Text, 1, 1);
+      Note[N].NewSentence := true;
     end;
   end;
+
+  // overwrite lyric or append
+  if Note[N].Lyric = '-' then
+    Note[N].Lyric := Text
+  else
+    Note[N].Lyric := Note[N].Lyric + Text;
 end;
 
-procedure TScreenEditConvert.Extract;
+procedure TScreenEditConvert.Extract(out Song: TSong; out Lines: TLines);
+
 var
   T:    integer;
   C:    integer;
   N:    integer;
   Nu:   integer;
-  NoteTemp: TNuta;
+  NoteTemp: TNote;
   Move: integer;
   Max, Min: integer;
+  LyricType: TLyricType;
+  Text: UTF8String;
 begin
   // song info
-  Song.Title := '';
-  Song.Artist := '';
-  Song.Mp3 := '';
+  Song := TSong.Create();
+  Song.Clear();
   Song.Resolution := 4;
   SetLength(Song.BPM, 1);
   Song.BPM[0].BPM := BPM*4;
-
   SetLength(Note, 0);
 
   // extract notes
-  for T := 0 to High(ATrack) do
+  for T := 0 to High(Tracks) do
   begin
-//    if ATrack[T].Hear then
-//    begin
-    if Notes in ATrack[T].Status then
+    if tsNotes in Tracks[T].Status then
     begin
-      for N := 0 to High(ATrack[T].Note) do
+      for N := 0 to High(Tracks[T].Note) do
       begin
-        if (ATrack[T].Note[N].EventType = 9) and (ATrack[T].Note[N].Data2 > 0) then
+        if (Tracks[T].Note[N].EventType = MIDI_EVENTTYPE_NOTEON) and
+           (Tracks[T].Note[N].Data2 > 0) then
         begin
           Nu := Length(Note);
           SetLength(Note, Nu + 1);
-          Note[Nu].Start := Round(ATrack[T].Note[N].Start / Ticks);
-          Note[Nu].Len := Round(ATrack[T].Note[N].Len / Ticks);
-          Note[Nu].Tone := ATrack[T].Note[N].Data1 - 12*5;
+          Note[Nu].Start := Round(Tracks[T].Note[N].Start / Ticks);
+          Note[Nu].Len := Round(Tracks[T].Note[N].Len / Ticks);
+          Note[Nu].Tone := Tracks[T].Note[N].Data1 - 12*5;
           Note[Nu].Lyric := '-';
         end;
       end;
     end;
   end;
 
-  // extract lyrics
-  for T := 0 to High(ATrack) do
+  // extract lyrics (and artist + title info)
+  for T := 0 to High(Tracks) do
   begin
-//    if ATrack[T].Hear then
-//    begin
-    if Lyrics in ATrack[T].Status then
+    if not (tsLyrics in Tracks[T].Status) then
+      Continue;
+
+    for N := 0 to High(Tracks[T].Note) do
     begin
-      for N := 0 to High(ATrack[T].Note) do
+      if (Tracks[T].Note[N].Event = MIDI_EVENT_META) then
       begin
-        if (ATrack[T].Note[N].EventType = 15) then
+        // determine and validate lyric meta tag
+        if (ltKMIDI in Tracks[T].LyricType) and
+           (Tracks[T].Note[N].Data1 = MIDI_META_TEXT) then
         begin
-//          Log.LogStatus('<' + Track[T].Note[N].Str + '>', 'MIDI');
-          AddLyric(Round(ATrack[T].Note[N].Start / Ticks), ATrack[T].Note[N].Str);
+          Text := Tracks[T].Note[N].Str;
+          
+          // check for meta info
+          if (Length(Text) > 2) and (Text[1] = '@') then
+          begin
+            case Text[2] of
+              'L': Song.Language := Copy(Text, 3, Length(Text)); // language
+              'T': begin // title info
+                if (Song.Artist = '') then
+                  Song.Artist := Copy(Text, 3, Length(Text))
+                else if (Song.Title = '') then
+                  Song.Title := Copy(Text, 3, Length(Text));
+              end;
+            end;
+            Continue;
+          end;
+
+          LyricType := ltKMIDI;
+        end
+        else if (ltSMFLyric in Tracks[T].LyricType) and
+                (Tracks[T].Note[N].Data1 = MIDI_META_LYRICS) then
+        begin
+          LyricType := ltSMFLyric;
+        end
+        else
+        begin
+          // unknown meta event
+          Continue;
         end;
+
+        AddLyric(Round(Tracks[T].Note[N].Start / Ticks), LyricType, Tracks[T].Note[N].Str);
       end;
     end;
   end;
@@ -360,8 +491,12 @@ begin
 
   // copy notes
   SetLength(Lines.Line, 1);
-  Lines.Number := 1;
-  Lines.High := 0;
+  Lines.Number     := 1;
+  Lines.High       := 0;
+  Lines.Current    := 0;
+  Lines.Resolution := 0;
+  Lines.NotesGAP   := 0;
+  Lines.ScoreValue := 0;
 
   C := 0;
   N := 0;
@@ -403,35 +538,37 @@ begin
 
     // create space for new note
     SetLength(Lines.Line[C].Note, Length(Lines.Line[C].Note)+1);
+    Inc(Lines.Line[C].HighNote);
 
     // initialize note
     Lines.Line[C].Note[N].Start := Note[Nu].Start;
     Lines.Line[C].Note[N].Length := Note[Nu].Len;
     Lines.Line[C].Note[N].Tone := Note[Nu].Tone;
-    Lines.Line[C].Note[N].Text := Note[Nu].Lyric;
-    //All Notes are Freestyle when Converted Fix:
+    Lines.Line[C].Note[N].Text := DecodeStringUTF8(Note[Nu].Lyric, DEFAULT_ENCODING);
     Lines.Line[C].Note[N].NoteType := ntNormal;
     Inc(N);
   end;
 end;
 
-function TScreenEditConvert.SelectedNumber: integer;
+function TScreenEditConvert.CountSelectedTracks: integer;
 var
   T:    integer; // track
 begin
   Result := 0;
-  for T := 0 to High(ATrack) do
-//    if ATrack[T].Hear then
-//      Inc(Result);
-    if Notes in ATrack[T].Status then
+  for T := 0 to High(Tracks) do
+    if tsNotes in Tracks[T].Status then
       Inc(Result);
 end;
 
 {$IFDEF UseMIDIPort}
 procedure TScreenEditConvert.MidiFile1MidiEvent(event: PMidiEvent);
 begin
-//  Log.LogStatus(IntToStr(event.event), 'MIDI');
-  MidiOut.PutShort(event.event, event.data1, event.data2);
+  //Log.LogStatus(IntToStr(event.event), 'MIDI');
+  try
+    MidiOut.PutShort(event.event, event.data1, event.data2);
+  except
+    MidiFile.StopPlaying();
+  end;
 end;
 {$ENDIF}
 
@@ -442,7 +579,7 @@ begin
   inherited Create;
   AddButton(40, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(15, 5, 0, 0, 0, 'Open');
-//  Button[High(Button)].Text[0].Size := 11;
+  //Button[High(Button)].Text[0].Size := 11;
 
   AddButton(160, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(25, 5, 0, 0, 0, 'Play');
@@ -453,19 +590,7 @@ begin
   AddButton(500, 20, 100, 40, Skin.GetTextureFileName('ButtonF'));
   AddButtonText(20, 5, 0, 0, 0, 'Save');
 
-{  MidiOut := TMidiOutput.Create(nil);
-//  MidiOut.Close;
-//  MidiOut.DeviceID := 0;
-  if Ini.Debug = 1 then
-    MidiOut.ProductName := 'Microsoft GS Wavetable SW Synth'; // for my kxproject without midi table
-  Log.LogStatus(MidiOut.ProductName, 'MIDI');
-  MidiOut.Open;
-//  MidiOut.SetVolume(100, 100); // temporary}
-
-  ConversionFileName := GamePath + 'file.mid';
-  {$IFDEF UseMIDIPort}
-  MidiFile := TMidiFile.Create(nil);
-  {$ENDIF}
+  fFileName := PATH_NONE;
 
   for P := 0 to 100 do
   begin
@@ -476,96 +601,124 @@ begin
 
 end;
 
-procedure TScreenEditConvert.onShow;
+procedure TScreenEditConvert.OnShow;
 var
   T:    integer; // track
   N:    integer; // note
-  C:    integer; // channel
-  CN:   integer; // channel note
+  {$IFDEF UseMIDIPort}
+  MidiTrack: TMidiTrack;
+  MidiEvent: PMidiEvent;
+  {$ENDIF}
+  FileOpened: boolean;
+  KMIDITrackIndex, SMFTrackIndex: integer;
 begin
   inherited;
 
+  Interaction := 0;
+
 {$IFDEF UseMIDIPort}
   MidiOut := TMidiOutput.Create(nil);
-  if Ini.Debug = 1 then
-    MidiOut.ProductName := 'Microsoft GS Wavetable SW Synth'; // for my kxproject without midi table
-  Log.LogStatus(MidiOut.ProductName, 'MIDI');
+  Log.LogInfo(MidiOut.ProductName, 'MIDI');
   MidiOut.Open;
+  MidiFile := nil;
+  SetLength(Tracks, 0);
+
+  // Filename is only <> PATH_NONE if we called the OpenScreen before
+  fFilename := ScreenOpen.Filename;
+  if (fFilename = PATH_NONE) then
+    Exit;
+  ScreenOpen.Filename := PATH_NONE;
 
-  if FileExists(ConversionFileName) then
+  FileOpened := false;
+  if fFileName.Exists then
   begin
-    MidiFile.Filename := ConversionFileName;
-    MidiFile.ReadFile;
+    MidiFile := TMidiFile.Create(nil);
+    MidiFile.Filename := fFileName;
+    try
+      MidiFile.ReadFile;
+      FileOpened := true;
+    except
+      MidiFile.Free;
+    end;
+  end;
 
-    Len := 0;
-    Sel := 0;
-    BPM := MidiFile.Bpm;
-    Ticks := MidiFile.TicksPerQuarter / 4;
+  if (not FileOpened) then
+  begin
+    ScreenPopupError.ShowPopup(Language.Translate('ERROR_FILE_NOT_FOUND'));
+    Exit;
+  end;
 
-{    for T := 0 to MidiFile.NumberOfTracks-1 do
-    begin
-      SetLength(Track, Length(Track)+1);
-      MidiTrack := MidiFile.GetTrack(T);
-      MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
-      Track[T].Name := MidiTrack.getName;
+  Len := 0;
+  SelTrack := 0;
+  BPM := MidiFile.Bpm;
+  Ticks := MidiFile.TicksPerQuarter / 4;
 
-      for N := 0 to MidiTrack.getEventCount-1 do
-      begin
-        SetLength(Track[T].Note, Length(Track[T].Note)+1);
-        MidiEvent := MidiTrack.GetEvent(N);
-        Track[T].Note[N].Start := MidiEvent.time;
-        Track[T].Note[N].Len := MidiEvent.len;
-        Track[T].Note[N].Event := MidiEvent.event;
-        Track[T].Note[N].EventType := MidiEvent.event div 16;
-        Track[T].Note[N].Channel := MidiEvent.event and 15;
-        Track[T].Note[N].Data1 := MidiEvent.data1;
-        Track[T].Note[N].Data2 := MidiEvent.data2;
-        Track[T].Note[N].Str := MidiEvent.str;
-
-        if Track[T].Note[N].Start + Track[T].Note[N].Len > Len then
-          Len := Track[T].Note[N].Start + Track[T].Note[N].Len;
-      end;
-    end;}
+  KMIDITrackIndex := -1;
+  SMFTrackIndex := -1;
 
-    SetLength(Channel, 16);
-    for T := 0 to 15 do
-    begin
-      Channel[T].Name := IntToStr(T+1);
-      SetLength(Channel[T].Note, 0);
-      Channel[T].Status := [];
-    end;
+  SetLength(Tracks, MidiFile.NumberOfTracks);
+  for T := 0 to MidiFile.NumberOfTracks-1 do
+    Tracks[T].LyricType := [];
 
-    for T := 0 to MidiFile.NumberOfTracks-1 do
+  for T := 0 to MidiFile.NumberOfTracks-1 do
+  begin
+    MidiTrack := MidiFile.GetTrack(T);
+    MidiTrack.OnMidiEvent := nil;
+    Tracks[T].Name := DecodeStringUTF8(MidiTrack.getName, DEFAULT_ENCODING);
+    Tracks[T].NoteType := ntNone;
+    Tracks[T].Status := [];
+
+    SetLength(Tracks[T].Note, MidiTrack.getEventCount());
+    for N := 0 to MidiTrack.getEventCount-1 do
     begin
-      MidiTrack := MidiFile.GetTrack(T);
-      MidiTrack.OnMidiEvent := MidiFile1MidiEvent;
-
-      for N := 0 to MidiTrack.getEventCount-1 do
+      MidiEvent := MidiTrack.GetEvent(N);
+
+      Tracks[T].Note[N].Start     := MidiEvent.time;
+      Tracks[T].Note[N].Len       := MidiEvent.len;
+      Tracks[T].Note[N].Event     := MidiEvent.event;
+      Tracks[T].Note[N].EventType := MidiEvent.event shr 4;
+      Tracks[T].Note[N].Channel   := MidiEvent.event and $0F;
+      Tracks[T].Note[N].Data1     := MidiEvent.data1;
+      Tracks[T].Note[N].Data2     := MidiEvent.data2;
+      Tracks[T].Note[N].Str       := DecodeStringUTF8(MidiEvent.str, DEFAULT_ENCODING);
+
+      if (Tracks[T].Note[N].Event = MIDI_EVENT_META) then
+      begin
+        case (Tracks[T].Note[N].Data1) of
+          MIDI_META_TEXT: begin
+            // KMIDI lyrics (uses MIDI_META_TEXT events)
+            if (StrLComp(PAnsiChar(Tracks[T].Note[N].Str), '@KMIDI KARAOKE FILE', 19) = 0) and
+               (High(Tracks) >= T+1) then
+            begin
+              // The '@KMIDI ...' mark is in the first track (mostly named 'Soft Karaoke')
+              // but the lyrics are in the second track (named 'Words')
+              Tracks[T+1].LyricType := Tracks[T+1].LyricType + [ltKMIDI];
+              KMIDITrackIndex := T+1;
+            end;
+          end;
+          MIDI_META_LYRICS: begin
+            // lyrics in Standard Midi File format found (uses MIDI_META_LYRICS events)
+            Tracks[T].LyricType := Tracks[T].LyricType + [ltSMFLyric];
+            SMFTrackIndex := T;
+          end;
+        end;
+      end
+      else if (Tracks[T].Note[N].EventType = MIDI_EVENTTYPE_NOTEON) then
       begin
-        MidiEvent := MidiTrack.GetEvent(N);
-        C := MidiEvent.event and 15;
-
-        CN := Length(Channel[C].Note);
-        SetLength(Channel[C].Note, CN+1);
-
-        Channel[C].Note[CN].Start := MidiEvent.time;
-        Channel[C].Note[CN].Len := MidiEvent.len;
-        Channel[C].Note[CN].Event := MidiEvent.event;
-        Channel[C].Note[CN].EventType := MidiEvent.event div 16;
-        Channel[C].Note[CN].Channel := MidiEvent.event and 15;
-        Channel[C].Note[CN].Data1 := MidiEvent.data1;
-        Channel[C].Note[CN].Data2 := MidiEvent.data2;
-        Channel[C].Note[CN].Str := MidiEvent.str;
-
-        if Channel[C].Note[CN].Start + Channel[C].Note[CN].Len > Len then
-          Len := Channel[C].Note[CN].Start + Channel[C].Note[CN].Len;
+        // notes available
+        Tracks[T].NoteType := ntAvail;
       end;
-    end;
-    ATrack := Channel;
 
+      if Tracks[T].Note[N].Start + Tracks[T].Note[N].Len > Len then
+        Len := Tracks[T].Note[N].Start + Tracks[T].Note[N].Len;
+    end;
   end;
 
-  Interaction := 0;
+  // set default lyric track. Prefer KMIDI.
+  if (KMIDITrackIndex > -1) then
+    Tracks[KMIDITrackIndex].Status := Tracks[KMIDITrackIndex].Status + [tsLyrics]
+  else if (SMFTrackIndex > -1) then
+    Tracks[SMFTrackIndex].Status := Tracks[SMFTrackIndex].Status + [tsLyrics];
 {$ENDIF}
 end;
 
@@ -578,41 +731,44 @@ var
   Y:      real;
   Height: real;
   YSkip:  real;
+  TrackName: UTF8String;
 begin
   // draw static menu
   inherited Draw;
 
   Y := 100;
 
-  Height := min(480, 40 * Length(ATrack));
+  Height := min(480, 40 * Length(Tracks));
   Bottom := Y + Height;
 
-  if Length(ATrack) = 0 then // prevent crash with uncomplete code. 
-  begin
-    Log.LogDebug ('UScreenEditConvert -> TScreenEditConvert.Draw:', 'Length(ATrack) = 0');
-    YSkip := 40;
-  end
-  else 
-    YSkip := Height / Length(ATrack);
+  YSkip := Height / Length(Tracks);
 
-  // select
-  DrawQuad(10, Y + Sel*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
+  // highlight selected track
+  DrawQuad(10, Y+SelTrack*YSkip, 780, YSkip, 0.8, 0.8, 0.8);
 
-  // selected - now me use Status System
-  for Count := 0 to High(ATrack) do
-    if ATrack[Count].Hear then
+  // track-selection info
+  for Count := 0 to High(Tracks) do
+    if Tracks[Count].Status <> [] then
       DrawQuad(10, Y + Count*YSkip, 50, YSkip, 0.8, 0.3, 0.3);
   glColor3f(0, 0, 0);
-  for Count := 0 to High(ATrack) do
+  for Count := 0 to High(Tracks) do
   begin
-    if Notes in ATrack[Count].Status then
+    if Tracks[Count].NoteType = ntAvail then
     begin
+      if tsNotes in Tracks[Count].Status then
+        glColor3f(0, 0, 0)
+      else
+        glColor3f(0.7, 0.7, 0.7);
       SetFontPos(25, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('N');
     end;
-    if Lyrics in ATrack[Count].Status then
+    if Tracks[Count].LyricType <> [] then
     begin
+      if tsLyrics in Tracks[Count].Status then
+        glColor3f(0, 0, 0)
+      else
+        glColor3f(0.7, 0.7, 0.7);
       SetFontPos(40, Y + Count*YSkip + 10);
       SetFontSize(15);
       glPrint('L');
@@ -623,51 +779,48 @@ begin
   DrawLine( 60, Y,  60, Bottom, 0, 0, 0);
   DrawLine(790, Y, 790, Bottom, 0, 0, 0);
 
-  for Count := 0 to Length(ATrack) do
+  for Count := 0 to Length(Tracks) do
     DrawLine(10, Y + Count*YSkip, 790, Y + Count*YSkip, 0, 0, 0);
 
-  for Count := 0 to High(ATrack) do
+  for Count := 0 to High(Tracks) do
   begin
-    SetFontPos(11, Y + 10 + Count*YSkip);
+    SetFontPos(65, Y + Count*YSkip);
     SetFontSize(15);
-    glPrint(ATrack[Count].Name);
+    glPrint(Tracks[Count].Name);
   end;
 
-  for Count := 0 to High(ATrack) do
-    for Count2 := 0 to High(ATrack[Count].Note) do
+  for Count := 0 to High(Tracks) do
+  begin
+    for Count2 := 0 to High(Tracks[Count].Note) do
     begin
-      if ATrack[Count].Note[Count2].EventType = 9 then
-        DrawQuad(60 + ATrack[Count].Note[Count2].Start/Len*725,
-                 Y + (Count+1)*YSkip - ATrack[Count].Note[Count2].Data1*35/127,
-                 3,
-                 3,
-                 ColR[Count],
-                 ColG[Count],
-                 ColB[Count]);
-      if ATrack[Count].Note[Count2].EventType = 15 then
-        DrawLine(60 + ATrack[Count].Note[Count2].Start/Len*725,
-                 Y + 0.75*YSkip + Count*YSkip,
-                 60 + ATrack[Count].Note[Count2].Start/Len*725,
-                 Y + YSkip + Count*YSkip,
-                 ColR[Count],
-                 ColG[Count],
-                 ColB[Count]);
+      if Tracks[Count].Note[Count2].EventType = MIDI_EVENTTYPE_NOTEON then
+        DrawQuad(60 + Tracks[Count].Note[Count2].Start/Len * 725,
+                 Y + (Count+1)*YSkip - Tracks[Count].Note[Count2].Data1*35/127,
+                 3, 3,
+                 ColR[Count], ColG[Count], ColB[Count]);
+      if Tracks[Count].Note[Count2].EventType = 15 then
+        DrawLine(60 + Tracks[Count].Note[Count2].Start/Len * 725, Y + 0.75 * YSkip + Count*YSkip,
+                 60 + Tracks[Count].Note[Count2].Start/Len * 725, Y + YSkip + Count*YSkip,
+                 ColR[Count], ColG[Count], ColB[Count]);
     end;
+  end;
 
   // playing line
   {$IFDEF UseMIDIPort}
-  X := 60 + MidiFile.GetCurrentTime/MidiFile.GetTrackLength*730;
+  if (MidiFile <> nil) then
+    X := 60 + MidiFile.GetCurrentTime/MidiFile.GetTrackLength*730;
   {$ENDIF}
   DrawLine(X, Y, X, Bottom, 0.3, 0.3, 0.3);
 
   Result := true;
 end;
 
-procedure TScreenEditConvert.onHide;
+procedure TScreenEditConvert.OnHide;
 begin
 {$IFDEF UseMIDIPort}
+  FreeAndNil(MidiFile);
   MidiOut.Close;
-  MidiOut.Free;
+  FreeAndNil(MidiOut);
 {$ENDIF}
 end;
 
-- 
cgit v1.2.3


From 54f567282784181b99a3012fd9db03dae60f361e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 22 Feb 2010 18:27:15 +0000
Subject: screens code cleanup

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2146 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenEditConvert.pas | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/screens/UScreenEditConvert.pas')

diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index b2fb7773..8b13d410 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -602,15 +602,15 @@ begin
 end;
 
 procedure TScreenEditConvert.OnShow;
+{$IFDEF UseMIDIPort}
 var
   T:    integer; // track
   N:    integer; // note
-  {$IFDEF UseMIDIPort}
   MidiTrack: TMidiTrack;
   MidiEvent: PMidiEvent;
-  {$ENDIF}
   FileOpened: boolean;
   KMIDITrackIndex, SMFTrackIndex: integer;
+{$ENDIF}
 begin
   inherited;
 
@@ -731,7 +731,6 @@ var
   Y:      real;
   Height: real;
   YSkip:  real;
-  TrackName: UTF8String;
 begin
   // draw static menu
   inherited Draw;
-- 
cgit v1.2.3