From 7a01b05b3861a667eb32ce2e0fc88ff3bacb99ae Mon Sep 17 00:00:00 2001
From: mogguh <mogguh@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 2 Sep 2008 17:25:26 +0000
Subject: Moved: The folder classes has been renamed to base Updated:
 ultrastardx.dpr has been changed accordingly

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
new file mode 100644
index 00000000..710cd44f
--- /dev/null
+++ b/src/base/USongs.pas
@@ -0,0 +1,806 @@
+unit USongs;
+
+interface
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+{$IFDEF DARWIN}
+  {$IFDEF DEBUG}
+    {$DEFINE USE_PSEUDO_THREAD}
+  {$ENDIF}
+{$ENDIF}
+
+uses
+    {$IFDEF MSWINDOWS}
+      Windows,
+      DirWatch,
+    {$ELSE}
+      {$IFNDEF DARWIN}
+        syscall,
+      {$ENDIF}
+      baseunix,
+      UnixType,
+    {$ENDIF}
+    SysUtils,
+    Classes,
+    UPlatform,
+    ULog,
+    UTexture,
+    UCommon,
+    {$IFDEF DARWIN}
+      cthreads,
+    {$ENDIF}
+    {$IFDEF USE_PSEUDO_THREAD}
+      PseudoThread,
+    {$ENDIF}
+    USong,
+    UCatCovers;
+
+type
+
+  TBPM = record
+    BPM:        real;
+    StartBeat:  real;
+  end;
+
+  TScore = record
+    Name:       widestring;
+    Score:      integer;
+    Length:     string;
+  end;
+
+  {$IFDEF USE_PSEUDO_THREAD}
+  TSongs = class( TPseudoThread )
+  {$ELSE}
+  TSongs = class( TThread )
+  {$ENDIF}
+  private
+    fNotify, fWatch     : longint;
+    fParseSongDirectory : boolean;
+    fProcessing         : boolean;
+    {$ifdef MSWINDOWS}
+    fDirWatch           : TDirectoryWatch;
+    {$endif}
+    procedure int_LoadSongList;
+    procedure DoDirChanged(Sender: TObject);
+  protected
+    procedure Execute; override;
+  public
+    SongList  : TList;          // array of songs
+    Selected  : integer;        // selected song index
+    constructor Create();
+    destructor  Destroy(); override;
+
+
+    procedure LoadSongList;     // load all songs
+    procedure BrowseDir(Dir: widestring); // should return number of songs in the future
+    procedure BrowseTXTFiles(Dir: widestring);
+    procedure BrowseXMLFiles(Dir: widestring);
+    procedure Sort(Order: integer);
+    function  FindSongFile(Dir, Mask: widestring): widestring;
+    property  Processing : boolean read fProcessing;
+  end;
+
+
+  TCatSongs = class
+    Song:       array of TSong; // array of categories with songs
+    Selected:   integer; // selected song index
+    Order:      integer; // order type (0=title)
+    CatNumShow: integer; // Category Number being seen
+    CatCount:   integer; //Number of Categorys
+
+    procedure SortSongs();
+    procedure Refresh; // refreshes arrays by recreating them from Songs array
+    procedure ShowCategory(Index: integer); // expands all songs in category
+    procedure HideCategory(Index: integer); // hides all songs in category
+    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed
+    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys
+    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song
+    function VisibleSongs: integer; // returns number of visible songs (for tabs)
+    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)
+
+    function SetFilter(FilterStr: string; const fType: Byte): Cardinal;
+  end;
+
+var
+  Songs:      TSongs;    // all songs
+  CatSongs:   TCatSongs; // categorized songs
+
+const
+  IN_ACCESS        = $00000001; //* File was accessed */
+  IN_MODIFY        = $00000002; //* File was modified */
+  IN_ATTRIB        = $00000004; //* Metadata changed */
+  IN_CLOSE_WRITE   = $00000008; //* Writtable file was closed */
+  IN_CLOSE_NOWRITE = $00000010; //* Unwrittable file closed */
+  IN_OPEN          = $00000020; //* File was opened */
+  IN_MOVED_FROM    = $00000040; //* File was moved from X */
+  IN_MOVED_TO      = $00000080; //* File was moved to Y */
+  IN_CREATE        = $00000100; //* Subfile was created */
+  IN_DELETE        = $00000200; //* Subfile was deleted */
+  IN_DELETE_SELF   = $00000400; //* Self was deleted */
+
+
+implementation
+
+uses StrUtils,
+     UGraphic,
+     UCovers,
+     UFiles,
+     UMain,
+     UIni;
+
+constructor TSongs.Create();
+begin
+  // do not start thread BEFORE initialization (suspended = true)
+  inherited Create(true);
+  Self.FreeOnTerminate := true;
+
+  SongList := TList.Create();
+
+  // FIXME: threaded loading does not work this way.
+  // It will just cause crashes but nothing else at the moment.
+  (*
+  {$ifdef MSWINDOWS}
+    fDirWatch := TDirectoryWatch.create(nil);
+    fDirWatch.OnChange     := DoDirChanged;
+    fDirWatch.Directory    := SongPath;
+    fDirWatch.WatchSubDirs := true;
+    fDirWatch.active       := true;
+  {$ENDIF}
+
+  // now we can start the thread
+  Resume();
+  *)
+
+  // until it is fixed, simply load the song-list
+  int_LoadSongList();
+end;
+
+destructor TSongs.Destroy();
+begin
+  FreeAndNil( SongList );
+  inherited;
+end;
+
+procedure TSongs.DoDirChanged(Sender: TObject);
+begin
+  LoadSongList();
+end;
+
+procedure TSongs.Execute();
+var
+  fChangeNotify : THandle;
+begin
+{$IFDEF USE_PSEUDO_THREAD}
+  int_LoadSongList();
+{$ELSE}
+  fParseSongDirectory := true;
+
+  while not terminated do
+  begin
+
+    if fParseSongDirectory then
+    begin
+      Log.LogStatus('Calling int_LoadSongList', 'TSongs.Execute');
+      int_LoadSongList();
+    end;
+
+    Suspend();
+  end;
+{$ENDIF}
+end;
+
+procedure TSongs.int_LoadSongList;
+var
+  I: integer;
+begin
+  try
+    fProcessing := true;
+
+    Log.LogStatus('Searching For Songs', 'SongList');
+
+    // browse directories
+    for I := 0 to SongPaths.Count-1 do
+      BrowseDir(SongPaths[I]);
+
+    if assigned( CatSongs ) then
+      CatSongs.Refresh;
+
+    if assigned( CatCovers ) then
+      CatCovers.Load;
+
+    //if assigned( Covers ) then
+    //  Covers.Load;
+
+    if assigned(ScreenSong)  then
+    begin
+      ScreenSong.GenerateThumbnails();
+      ScreenSong.OnShow; // refresh ScreenSong
+    end;
+
+  finally
+    Log.LogStatus('Search Complete', 'SongList');
+
+    fParseSongDirectory := false;
+    fProcessing         := false;
+  end;
+end;
+
+
+procedure TSongs.LoadSongList;
+begin
+  fParseSongDirectory := true;
+  Resume();
+end;
+
+procedure TSongs.BrowseDir(Dir: widestring);
+begin
+ BrowseTXTFiles(Dir);
+ BrowseXMLFiles(Dir);
+end;
+
+procedure TSongs.BrowseTXTFiles(Dir: widestring);
+var
+  i       : integer;
+  Files   : TDirectoryEntryArray;
+  lSong   : TSong;
+begin
+
+  Files    := Platform.DirectoryFindFiles( Dir, '.txt', true);
+
+  for i := 0 to Length(Files)-1 do
+  begin
+    if Files[i].IsDirectory then
+    begin
+      BrowseTXTFiles( Dir + Files[i].Name + PathDelim );  //Recursive Call
+    end
+    else
+    begin
+      lSong := TSong.create( Dir + Files[i].Name );
+
+      if lSong.Analyse then
+        SongList.add( lSong )
+      else
+      begin
+        Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
+        freeandnil( lSong );
+      end;
+
+    end;
+  end;
+  SetLength( Files, 0);
+
+end;
+
+procedure TSongs.BrowseXMLFiles(Dir: widestring);
+var
+  i       : integer;
+  Files   : TDirectoryEntryArray;
+  lSong   : TSong;
+begin
+
+  Files := Platform.DirectoryFindFiles( Dir, '.xml', true);
+
+  for i := 0 to Length(Files)-1 do
+  begin
+    if Files[i].IsDirectory then
+    begin
+      BrowseXMLFiles( Dir + Files[i].Name + PathDelim ); //Recursive Call
+    end
+    else
+    begin
+      lSong := TSong.create( Dir + Files[i].Name );
+
+      if lSong.AnalyseXML then
+	SongList.add( lSong )
+      else
+      begin
+	Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
+	freeandnil( lSong );
+      end;
+
+    end;
+  end;
+  SetLength( Files, 0);
+
+end;
+
+(*
+ * Comparison functions for sorting
+ *)
+
+function CompareByEdition(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Edition, TSong(Song2).Edition);
+end;
+
+function CompareByGenre(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Genre, TSong(Song2).Genre);
+end;
+
+function CompareByTitle(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Title, TSong(Song2).Title);
+end;
+
+function CompareByArtist(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Artist, TSong(Song2).Artist);
+end;
+
+function CompareByFolder(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Folder, TSong(Song2).Folder);
+end;
+
+function CompareByLanguage(Song1, Song2: Pointer): integer;
+begin
+  Result := CompareText(TSong(Song1).Language, TSong(Song2).Language);
+end;
+
+procedure TSongs.Sort(Order: integer);
+var
+  CompareFunc: TListSortCompare;
+begin
+  // FIXME: what is the difference between artist and artist2, etc.?
+  case Order of
+    sEdition: // by edition
+      CompareFunc := CompareByEdition;
+    sGenre: // by genre
+      CompareFunc := CompareByGenre;
+    sTitle: // by title
+      CompareFunc := CompareByTitle;
+    sArtist: // by artist
+      CompareFunc := CompareByArtist;
+    sFolder: // by folder
+      CompareFunc := CompareByFolder;
+    sTitle2: // by title2
+      CompareFunc := CompareByTitle;
+    sArtist2: // by artist2
+      CompareFunc := CompareByArtist;
+    sLanguage: // by Language
+      CompareFunc := CompareByLanguage;
+    else
+      Log.LogCritical('Unsupported comparison', 'TSongs.Sort');
+      Exit; // suppress warning
+  end; // case
+
+  // Note: Do not use TList.Sort() as it uses QuickSort which is instable.
+  // For example, if a list is sorted by title first and
+  // by artist afterwards, the songs of an artist will not be sorted by title anymore.
+  // The stable MergeSort guarantees to maintain this order. 
+  MergeSort(SongList, CompareFunc);
+end;
+
+function TSongs.FindSongFile(Dir, Mask: widestring): widestring;
+var
+  SR:     TSearchRec;   // for parsing song directory
+begin
+  Result := '';
+  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then
+  begin
+    Result := SR.Name;
+  end; // if
+  FindClose(SR);
+end;
+
+procedure TCatSongs.SortSongs();
+begin
+  case Ini.Sorting of
+    sEdition: begin
+        Songs.Sort(sTitle);
+        Songs.Sort(sArtist);
+        Songs.Sort(sEdition);
+      end;
+    sGenre: begin
+        Songs.Sort(sTitle);
+        Songs.Sort(sArtist);
+        Songs.Sort(sGenre);
+      end;
+    sLanguage: begin
+        Songs.Sort(sTitle);
+        Songs.Sort(sArtist);
+        Songs.Sort(sLanguage);
+      end;
+    sFolder: begin
+        Songs.Sort(sTitle);
+        Songs.Sort(sArtist);
+        Songs.Sort(sFolder);
+      end;
+    sTitle: begin
+        Songs.Sort(sTitle);
+      end;
+    sArtist: begin
+        Songs.Sort(sTitle);
+        Songs.Sort(sArtist);
+      end;
+    sTitle2: begin
+        Songs.Sort(sArtist2);
+        Songs.Sort(sTitle2);
+      end;
+    sArtist2: begin
+        Songs.Sort(sTitle2);
+        Songs.Sort(sArtist2);
+      end;
+  end; // case
+end;
+
+procedure TCatSongs.Refresh;
+var
+  SongIndex:   integer;
+  CurSong:     TSong;
+  CatIndex:    integer; // index of current song in Song
+  Letter:      char;    // current letter for sorting using letter
+  CurCategory: string;  // current edition for sorting using edition, genre etc.
+  Order:       integer; // number used for ordernum
+  LetterTmp:   char;
+  CatNumber:   integer; // Number of Song in Category
+
+  procedure AddCategoryButton(const CategoryName: string);
+  var
+    PrevCatBtnIndex: integer;
+  begin
+    Inc(Order);
+    CatIndex := Length(Song);
+    SetLength(Song, CatIndex+1);
+    Song[CatIndex] := TSong.Create();
+    Song[CatIndex].Artist := '[' + CategoryName + ']';
+    Song[CatIndex].Main := true;
+    Song[CatIndex].OrderTyp := 0;
+    Song[CatIndex].OrderNum := Order;
+    Song[CatIndex].Cover := CatCovers.GetCover(Ini.Sorting, CategoryName);
+    Song[CatIndex].Visible := true;
+
+    // set number of songs in previous category
+    PrevCatBtnIndex := CatIndex - CatNumber - 1;
+    if ((PrevCatBtnIndex >= 0) and Song[PrevCatBtnIndex].Main) then
+      Song[PrevCatBtnIndex].CatNumber := CatNumber;
+
+    CatNumber := 0;
+ end;
+
+begin
+  CatNumShow := -1;
+
+  SortSongs();
+
+  CurCategory := '';
+  Order := 0;
+  CatNumber := 0;
+
+  // Note: do NOT set Letter to ' ', otherwise no category-button will be
+  // created for songs beginning with ' ' if songs of this category exist.
+  // TODO: trim song-properties so ' ' will not occur as first chararcter. 
+  Letter := #0;
+
+  // clear song-list
+  for SongIndex := 0 to Songs.SongList.Count-1 do
+  begin
+    // free category buttons
+    // Note: do NOT delete songs, they are just references to Songs.SongList entries
+    CurSong := TSong(Songs.SongList[SongIndex]);
+    if (CurSong.Main) then
+      CurSong.Free;
+  end;
+  SetLength(Song, 0);
+
+  for SongIndex := 0 to Songs.SongList.Count-1 do
+  begin
+    CurSong := TSong(Songs.SongList[SongIndex]);
+    // if tabs are on, add section buttons for each new section
+    if (Ini.Tabs = 1) then
+    begin
+      if (Ini.Sorting = sEdition) and
+         (CompareText(CurCategory, CurSong.Edition) <> 0) then
+      begin
+        CurCategory := CurSong.Edition;
+
+        // TODO: remove this block if it is not needed anymore
+        {
+        if CurSection = 'Singstar Part 2' then CoverName := 'Singstar';
+        if CurSection = 'Singstar German' then CoverName := 'Singstar';
+        if CurSection = 'Singstar Spanish' then CoverName := 'Singstar';
+        if CurSection = 'Singstar Italian' then CoverName := 'Singstar';
+        if CurSection = 'Singstar French' then CoverName := 'Singstar';
+        if CurSection = 'Singstar 80s Polish' then CoverName := 'Singstar 80s';
+        }
+
+        // add Category Button
+        AddCategoryButton(CurCategory);
+      end
+
+      else if (Ini.Sorting = sGenre) and
+              (CompareText(CurCategory, CurSong.Genre) <> 0) then
+      begin
+        CurCategory := CurSong.Genre;
+        // add Genre Button
+        AddCategoryButton(CurCategory);
+      end
+
+      else if (Ini.Sorting = sLanguage) and
+              (CompareText(CurCategory, CurSong.Language) <> 0) then
+      begin
+        CurCategory := CurSong.Language;
+        // add Language Button
+        AddCategoryButton(CurCategory);
+      end
+
+      else if (Ini.Sorting = sTitle) and
+              (Length(CurSong.Title) >= 1) and
+              (Letter <> UpperCase(CurSong.Title)[1]) then
+      begin
+        Letter := Uppercase(CurSong.Title)[1];
+        // add a letter Category Button
+        AddCategoryButton(Letter);
+      end
+
+      else if (Ini.Sorting = sArtist) and
+              (Length(CurSong.Artist) >= 1) and
+              (Letter <> UpperCase(CurSong.Artist)[1]) then
+      begin
+        Letter := UpperCase(CurSong.Artist)[1];
+        // add a letter Category Button
+        AddCategoryButton(Letter);
+      end
+
+      else if (Ini.Sorting = sFolder) and
+              (CompareText(CurCategory, CurSong.Folder) <> 0) then
+      begin
+        CurCategory := CurSong.Folder;
+        // add folder tab
+        AddCategoryButton(CurCategory);
+      end
+
+      else if (Ini.Sorting = sTitle2) and
+              (Length(CurSong.Title) >= 1) then
+      begin
+        // pack all numbers into a category named '#'
+        if (CurSong.Title[1] >= '0') and (CurSong.Title[1] <= '9') then
+          LetterTmp := '#'
+        else
+          LetterTmp := UpperCase(CurSong.Title)[1];
+
+        if (Letter <> LetterTmp) then
+        begin
+          Letter := LetterTmp;
+          // add a letter Category Button
+          AddCategoryButton(Letter);
+        end;
+      end
+
+      else if (Ini.Sorting = sArtist2) and
+              (Length(CurSong.Artist)>=1) then
+      begin
+        // pack all numbers into a category named '#'
+        if (CurSong.Artist[1] >= '0') and (CurSong.Artist[1] <= '9') then
+          LetterTmp := '#'
+        else
+          LetterTmp := UpperCase(CurSong.Artist)[1];
+
+        if (Letter <> LetterTmp) then
+        begin
+          Letter := LetterTmp;
+          // add a letter Category Button
+          AddCategoryButton(Letter);
+        end;
+      end;
+    end;
+
+    CatIndex := Length(Song);
+    SetLength(Song, CatIndex+1);
+
+    Inc(CatNumber); // increase number of songs in category
+
+    // copy reference to current song
+    Song[CatIndex] := CurSong;
+
+    // set song's category info
+    CurSong.OrderNum := Order; // assigns category
+    CurSong.CatNumber := CatNumber;
+
+    if (Ini.Tabs = 0) then
+      CurSong.Visible := true
+    else if (Ini.Tabs = 1) then
+      CurSong.Visible := false;
+
+    {
+    if (Ini.Tabs = 1) and (Order = 1) then
+    begin
+      //open first tab
+      CurSong.Visible := true;
+    end;
+    CurSong.Visible := true;
+    }
+  end;
+
+  // set CatNumber of last category
+  if (Ini.Tabs_at_startup = 1) and (High(Song) >= 1) then
+  begin
+    // set number of songs in previous category
+    SongIndex := CatIndex - CatNumber;
+    if ((SongIndex >= 0) and Song[SongIndex].Main) then
+      Song[SongIndex].CatNumber := CatNumber;
+  end;
+
+  // update number of categories
+  CatCount := Order;
+end;
+
+procedure TCatSongs.ShowCategory(Index: integer);
+var
+  S:    integer; // song
+begin
+  CatNumShow := Index;
+  for S := 0 to high(CatSongs.Song) do
+  begin
+{
+    if (CatSongs.Song[S].OrderNum = Index) and (not CatSongs.Song[S].Main) then
+      CatSongs.Song[S].Visible := true
+    else
+      CatSongs.Song[S].Visible := false;
+}
+//  KMS: This should be the same, but who knows :-)
+    CatSongs.Song[S].Visible := ( (CatSongs.Song[S].OrderNum = Index) and (not CatSongs.Song[S].Main) );
+  end;
+end;
+
+procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category
+var
+  S:    integer; // song
+begin
+  for S := 0 to high(CatSongs.Song) do
+  begin
+    if not CatSongs.Song[S].Main then
+      CatSongs.Song[S].Visible := false // hides all at now
+  end;
+end;
+
+procedure TCatSongs.ClickCategoryButton(Index: integer);
+var
+  Num, S:    integer;
+begin
+  Num := CatSongs.Song[Index].OrderNum;
+  if Num <> CatNumShow then
+  begin
+    ShowCategory(Num);
+  end
+  else
+  begin
+    ShowCategoryList;
+  end;
+end;
+
+//Hide Categorys when in Category Hack
+procedure TCatSongs.ShowCategoryList;
+var
+  Num, S:    integer;
+begin
+  // Hide All Songs Show All Cats
+  for S := 0 to high(CatSongs.Song) do
+    CatSongs.Song[S].Visible := CatSongs.Song[S].Main;
+  CatSongs.Selected := CatNumShow; //Show last shown Category
+  CatNumShow := -1;
+end;
+//Hide Categorys when in Category Hack End
+
+//Wrong song selected when tabs on bug
+function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song
+var
+  I: integer;
+begin
+  Result := -1;
+  I := SearchFrom + 1;
+  while not CatSongs.Song[I].Visible do
+  begin
+    Inc (I);
+    if (I>high(CatSongs.Song)) then
+      I := low(CatSongs.Song);
+    if (I = SearchFrom) then //Make One Round and no song found->quit
+      break;
+  end;
+end;
+//Wrong song selected when tabs on bug End
+
+(**
+ * Returns the number of visible songs.
+ *)
+function TCatSongs.VisibleSongs: integer;
+var
+  SongIndex: integer;
+begin
+  Result := 0;
+  for SongIndex := 0 to High(CatSongs.Song) do
+  begin
+    if (CatSongs.Song[SongIndex].Visible) then
+      Inc(Result);
+  end;
+end;
+
+(**
+ * Returns the index of a song in the subset of all visible songs.
+ * If all songs are visible, the result will be equal to the Index parameter. 
+ *)
+function TCatSongs.VisibleIndex(Index: integer): integer;
+var
+  SongIndex: integer;
+begin
+  Result := 0;
+  for SongIndex := 0 to Index-1 do
+  begin
+    if (CatSongs.Song[SongIndex].Visible) then
+      Inc(Result);
+  end;
+end;
+
+function TCatSongs.SetFilter(FilterStr: string; const fType: Byte): Cardinal;
+var
+  I, J: integer;
+  cString: string;
+  SearchStr: array of string;
+begin
+  {fType: 0: All
+          1: Title
+          2: Artist}
+  FilterStr := Trim(FilterStr);
+  if FilterStr<>'' then
+  begin
+    Result := 0;
+    //Create Search Array
+    SetLength(SearchStr, 1);
+    I := Pos (' ', FilterStr);
+    while (I <> 0) do
+    begin
+      SetLength (SearchStr, Length(SearchStr) + 1);
+      cString := Copy(FilterStr, 1, I-1);
+      if (cString <> ' ') and (cString <> '') then
+        SearchStr[High(SearchStr)-1] := cString;
+      Delete (FilterStr, 1, I);
+
+      I := Pos (' ', FilterStr);
+    end;
+    //Copy last Word
+    if (FilterStr <> ' ') and (FilterStr <> '') then
+      SearchStr[High(SearchStr)] := FilterStr;
+
+    for I:=0 to High(Song) do
+    begin
+      if not Song[i].Main then
+      begin
+        case fType of
+          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;
+          1: cString := Song[I].Title;
+          2: cString := Song[I].Artist;
+        end;
+        Song[i].Visible:=True;
+        //Look for every Searched Word
+        for J := 0 to High(SearchStr) do
+        begin
+          Song[i].Visible := Song[i].Visible and AnsiContainsText(cString, SearchStr[J])
+        end;
+        if Song[i].Visible then
+          Inc(Result);
+      end
+      else
+        Song[i].Visible:=False;
+    end;
+    CatNumShow := -2;
+  end
+  else
+  begin
+    for i:=0 to High(Song) do
+    begin
+      Song[i].Visible := (Ini.Tabs=1) = Song[i].Main;
+      CatNumShow := -1;
+    end;
+    Result := 0;
+  end;
+end;
+
+// -----------------------------------------------------------------------------
+
+end.
-- 
cgit v1.2.3


From dbf39d5bfc56c24a67d481187c619dc84828221f Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 23 Sep 2008 21:17:22 +0000
Subject: gpl header added and property svn:header set to "HeadURL Id"

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 710cd44f..d6f016bf 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.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 USongs;
 
 interface
-- 
cgit v1.2.3


From 015b6c092b0779ee9b53ed1ee78044737f8dc592 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 23 Sep 2008 21:43:52 +0000
Subject: indentation unified, no code change.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1406 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/USongs.pas | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index d6f016bf..6f1f7c51 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -40,30 +40,30 @@ interface
 {$ENDIF}
 
 uses
-    {$IFDEF MSWINDOWS}
-      Windows,
-      DirWatch,
-    {$ELSE}
-      {$IFNDEF DARWIN}
-        syscall,
-      {$ENDIF}
-      baseunix,
-      UnixType,
-    {$ENDIF}
-    SysUtils,
-    Classes,
-    UPlatform,
-    ULog,
-    UTexture,
-    UCommon,
-    {$IFDEF DARWIN}
-      cthreads,
-    {$ENDIF}
-    {$IFDEF USE_PSEUDO_THREAD}
-      PseudoThread,
+  {$IFDEF MSWINDOWS}
+    Windows,
+    DirWatch,
+  {$ELSE}
+    {$IFNDEF DARWIN}
+      syscall,
     {$ENDIF}
-    USong,
-    UCatCovers;
+    baseunix,
+    UnixType,
+  {$ENDIF}
+  SysUtils,
+  Classes,
+  UPlatform,
+  ULog,
+  UTexture,
+  UCommon,
+  {$IFDEF DARWIN}
+    cthreads,
+  {$ENDIF}
+  {$IFDEF USE_PSEUDO_THREAD}
+    PseudoThread,
+  {$ENDIF}
+  USong,
+  UCatCovers;
 
 type
 
-- 
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/base/USongs.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 6f1f7c51..6f66bf3f 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -687,7 +687,7 @@ end;
 
 procedure TCatSongs.ClickCategoryButton(Index: integer);
 var
-  Num, S:    integer;
+  Num:    integer;
 begin
   Num := CatSongs.Song[Index].OrderNum;
   if Num <> CatNumShow then
@@ -703,7 +703,7 @@ end;
 //Hide Categorys when in Category Hack
 procedure TCatSongs.ShowCategoryList;
 var
-  Num, S:    integer;
+  S:    integer;
 begin
   // Hide All Songs Show All Cats
   for S := 0 to high(CatSongs.Song) do
-- 
cgit v1.2.3


From 6d9dc62a08dd1ee9efa9309eea71dba8f7a94b0c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 2 Jan 2009 23:16:37 +0000
Subject: capture failure of file/dir access. Courtesy to Filipe Cabecinhas.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1545 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/USongs.pas | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 6f66bf3f..7f5125a9 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -275,7 +275,11 @@ var
   lSong   : TSong;
 begin
 
-  Files    := Platform.DirectoryFindFiles( Dir, '.txt', true);
+  try
+    Files := Platform.DirectoryFindFiles( Dir, '.txt', true)
+  except
+    Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseTXTFiles')
+  end;
 
   for i := 0 to Length(Files)-1 do
   begin
@@ -308,7 +312,11 @@ var
   lSong   : TSong;
 begin
 
-  Files := Platform.DirectoryFindFiles( Dir, '.xml', true);
+  try
+    Files := Platform.DirectoryFindFiles( Dir, '.xml', true)
+  except
+    Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseXMLFiles')
+  end;
 
   for i := 0 to Length(Files)-1 do
   begin
-- 
cgit v1.2.3


From 4bfd179d6903b623b446b17db42c1454aa0b56a0 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 4 Feb 2009 17:35:38 +0000
Subject: Tabs_at_startup -> TabsAtStartup

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 7f5125a9..4d702163 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -652,7 +652,7 @@ begin
   end;
 
   // set CatNumber of last category
-  if (Ini.Tabs_at_startup = 1) and (High(Song) >= 1) then
+  if (Ini.TabsAtStartup = 1) and (High(Song) >= 1) then
   begin
     // set number of songs in previous category
     SongIndex := CatIndex - CatNumber;
-- 
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/base/USongs.pas | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 4d702163..79e1eb59 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -151,12 +151,14 @@ const
 
 implementation
 
-uses StrUtils,
-     UGraphic,
-     UCovers,
-     UFiles,
-     UMain,
-     UIni;
+uses
+  StrUtils,
+  UCovers,
+  UFiles,
+  UGraphic,
+  UIni,
+  UPath,
+  UMain;
 
 constructor TSongs.Create();
 begin
-- 
cgit v1.2.3


From f469075a0335399c753ae5d2d362047dedf116b1 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 7 Mar 2009 21:14:14 +0000
Subject: final cleanup of Umain. Creation of UNote

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 79e1eb59..6c356d06 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -158,7 +158,7 @@ uses
   UGraphic,
   UIni,
   UPath,
-  UMain;
+  UNote;
 
 constructor TSongs.Create();
 begin
-- 
cgit v1.2.3


From 2e7b7c8ec95c52044df4317aaab6d7789c868e57 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 23 Mar 2009 12:34:50 +0000
Subject: cosmetics

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 6c356d06..3f3c06cc 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -266,8 +266,8 @@ end;
 
 procedure TSongs.BrowseDir(Dir: widestring);
 begin
- BrowseTXTFiles(Dir);
- BrowseXMLFiles(Dir);
+  BrowseTXTFiles(Dir);
+  BrowseXMLFiles(Dir);
 end;
 
 procedure TSongs.BrowseTXTFiles(Dir: widestring);
-- 
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/base/USongs.pas | 203 ++++++++++++++++++++++++++--------------------------
 1 file changed, 102 insertions(+), 101 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 3f3c06cc..9d44a086 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -68,35 +68,35 @@ uses
 type
 
   TBPM = record
-    BPM:        real;
-    StartBeat:  real;
+    BPM:       real;
+    StartBeat: real;
   end;
 
   TScore = record
-    Name:       widestring;
-    Score:      integer;
-    Length:     string;
+    Name:      widestring;
+    Score:     integer;
+    Length:    string;
   end;
 
   {$IFDEF USE_PSEUDO_THREAD}
-  TSongs = class( TPseudoThread )
+  TSongs = class(TPseudoThread)
   {$ELSE}
-  TSongs = class( TThread )
+  TSongs = class(TThread)
   {$ENDIF}
   private
-    fNotify, fWatch     : longint;
-    fParseSongDirectory : boolean;
-    fProcessing         : boolean;
+    fNotify, fWatch:     longint;
+    fParseSongDirectory: boolean;
+    fProcessing:         boolean;
     {$ifdef MSWINDOWS}
-    fDirWatch           : TDirectoryWatch;
+    fDirWatch:           TDirectoryWatch;
     {$endif}
     procedure int_LoadSongList;
     procedure DoDirChanged(Sender: TObject);
   protected
     procedure Execute; override;
   public
-    SongList  : TList;          // array of songs
-    Selected  : integer;        // selected song index
+    SongList: TList;          // array of songs
+    Selected: integer;        // selected song index
     constructor Create();
     destructor  Destroy(); override;
 
@@ -107,7 +107,7 @@ type
     procedure BrowseXMLFiles(Dir: widestring);
     procedure Sort(Order: integer);
     function  FindSongFile(Dir, Mask: widestring): widestring;
-    property  Processing : boolean read fProcessing;
+    property  Processing  boolean read fProcessing;
   end;
 
 
@@ -116,24 +116,24 @@ type
     Selected:   integer; // selected song index
     Order:      integer; // order type (0=title)
     CatNumShow: integer; // Category Number being seen
-    CatCount:   integer; //Number of Categorys
+    CatCount:   integer; // Number of Categorys
 
     procedure SortSongs();
-    procedure Refresh; // refreshes arrays by recreating them from Songs array
-    procedure ShowCategory(Index: integer); // expands all songs in category
-    procedure HideCategory(Index: integer); // hides all songs in category
-    procedure ClickCategoryButton(Index: integer); // uses ShowCategory and HideCategory when needed
-    procedure ShowCategoryList; //Hides all Songs And Show the List of all Categorys
-    function FindNextVisible(SearchFrom:integer): integer; //Find Next visible Song
-    function VisibleSongs: integer; // returns number of visible songs (for tabs)
-    function VisibleIndex(Index: integer): integer; // returns visible song index (skips invisible)
-
-    function SetFilter(FilterStr: string; const fType: Byte): Cardinal;
+    procedure Refresh;                                      // refreshes arrays by recreating them from Songs array
+    procedure ShowCategory(Index: integer);                 // expands all songs in category
+    procedure HideCategory(Index: integer);                 // hides all songs in category
+    procedure ClickCategoryButton(Index: integer);          // uses ShowCategory and HideCategory when needed
+    procedure ShowCategoryList;                             // Hides all Songs And Show the List of all Categorys
+    function FindNextVisible(SearchFrom: integer): integer; // Find Next visible Song
+    function VisibleSongs: integer;                         // returns number of visible songs (for tabs)
+    function VisibleIndex(Index: integer): integer;         // returns visible song index (skips invisible)
+
+    function SetFilter(FilterStr: string; const fType: byte): cardinal;
   end;
 
 var
-  Songs:      TSongs;    // all songs
-  CatSongs:   TCatSongs; // categorized songs
+  Songs:    TSongs;    // all songs
+  CatSongs: TCatSongs; // categorized songs
 
 const
   IN_ACCESS        = $00000001; //* File was accessed */
@@ -170,7 +170,7 @@ begin
 
   // FIXME: threaded loading does not work this way.
   // It will just cause crashes but nothing else at the moment.
-  (*
+(*
   {$ifdef MSWINDOWS}
     fDirWatch := TDirectoryWatch.create(nil);
     fDirWatch.OnChange     := DoDirChanged;
@@ -181,7 +181,7 @@ begin
 
   // now we can start the thread
   Resume();
-  *)
+*)
 
   // until it is fixed, simply load the song-list
   int_LoadSongList();
@@ -189,7 +189,7 @@ end;
 
 destructor TSongs.Destroy();
 begin
-  FreeAndNil( SongList );
+  FreeAndNil(SongList);
   inherited;
 end;
 
@@ -200,7 +200,7 @@ end;
 
 procedure TSongs.Execute();
 var
-  fChangeNotify : THandle;
+  fChangeNotify: THandle;
 begin
 {$IFDEF USE_PSEUDO_THREAD}
   int_LoadSongList();
@@ -234,13 +234,13 @@ begin
     for I := 0 to SongPaths.Count-1 do
       BrowseDir(SongPaths[I]);
 
-    if assigned( CatSongs ) then
+    if assigned(CatSongs) then
       CatSongs.Refresh;
 
-    if assigned( CatCovers ) then
+    if assigned(CatCovers) then
       CatCovers.Load;
 
-    //if assigned( Covers ) then
+    //if assigned(Covers) then
     //  Covers.Load;
 
     if assigned(ScreenSong)  then
@@ -272,75 +272,75 @@ end;
 
 procedure TSongs.BrowseTXTFiles(Dir: widestring);
 var
-  i       : integer;
-  Files   : TDirectoryEntryArray;
-  lSong   : TSong;
+  i:     integer;
+  Files: TDirectoryEntryArray;
+  lSong: TSong;
 begin
 
   try
-    Files := Platform.DirectoryFindFiles( Dir, '.txt', true)
+    Files := Platform.DirectoryFindFiles(Dir, '.txt', true)
   except
     Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseTXTFiles')
   end;
 
-  for i := 0 to Length(Files)-1 do
+  for i := 0 to Length(Files) - 1 do
   begin
     if Files[i].IsDirectory then
     begin
-      BrowseTXTFiles( Dir + Files[i].Name + PathDelim );  //Recursive Call
+      BrowseTXTFiles(Dir + Files[i].Name + PathDelim);  //Recursive Call
     end
     else
     begin
-      lSong := TSong.create( Dir + Files[i].Name );
+      lSong := TSong.create(Dir + Files[i].Name);
 
       if lSong.Analyse then
-        SongList.add( lSong )
+        SongList.add(lSong)
       else
       begin
         Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
-        freeandnil( lSong );
+        freeandnil(lSong);
       end;
 
     end;
   end;
-  SetLength( Files, 0);
+  SetLength(Files, 0);
 
 end;
 
 procedure TSongs.BrowseXMLFiles(Dir: widestring);
 var
-  i       : integer;
-  Files   : TDirectoryEntryArray;
-  lSong   : TSong;
+  i:     integer;
+  Files: TDirectoryEntryArray;
+  lSong: TSong;
 begin
 
   try
-    Files := Platform.DirectoryFindFiles( Dir, '.xml', true)
+    Files := Platform.DirectoryFindFiles(Dir, '.xml', true)
   except
     Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseXMLFiles')
   end;
 
-  for i := 0 to Length(Files)-1 do
+  for i := 0 to Length(Files) - 1 do
   begin
     if Files[i].IsDirectory then
     begin
-      BrowseXMLFiles( Dir + Files[i].Name + PathDelim ); //Recursive Call
+      BrowseXMLFiles(Dir + Files[i].Name + PathDelim); // Recursive Call
     end
     else
     begin
-      lSong := TSong.create( Dir + Files[i].Name );
+      lSong := TSong.create(Dir + Files[i].Name);
 
       if lSong.AnalyseXML then
-	SongList.add( lSong )
+	SongList.add(lSong)
       else
       begin
 	Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
-	freeandnil( lSong );
+	freeandnil(lSong);
       end;
 
     end;
   end;
-  SetLength( Files, 0);
+  SetLength(Files, 0);
 
 end;
 
@@ -414,7 +414,7 @@ end;
 
 function TSongs.FindSongFile(Dir, Mask: widestring): widestring;
 var
-  SR:     TSearchRec;   // for parsing song directory
+  SR: TSearchRec;   // for parsing song directory
 begin
   Result := '';
   if FindFirst(Dir + Mask, faDirectory, SR) = 0 then
@@ -483,13 +483,13 @@ var
     Inc(Order);
     CatIndex := Length(Song);
     SetLength(Song, CatIndex+1);
-    Song[CatIndex] := TSong.Create();
-    Song[CatIndex].Artist := '[' + CategoryName + ']';
-    Song[CatIndex].Main := true;
+    Song[CatIndex]          := TSong.Create();
+    Song[CatIndex].Artist   := '[' + CategoryName + ']';
+    Song[CatIndex].Main     := true;
     Song[CatIndex].OrderTyp := 0;
     Song[CatIndex].OrderNum := Order;
-    Song[CatIndex].Cover := CatCovers.GetCover(Ini.Sorting, CategoryName);
-    Song[CatIndex].Visible := true;
+    Song[CatIndex].Cover    := CatCovers.GetCover(Ini.Sorting, CategoryName);
+    Song[CatIndex].Visible  := true;
 
     // set number of songs in previous category
     PrevCatBtnIndex := CatIndex - CatNumber - 1;
@@ -500,21 +500,21 @@ var
  end;
 
 begin
-  CatNumShow := -1;
+  CatNumShow  := -1;
 
   SortSongs();
 
   CurCategory := '';
-  Order := 0;
-  CatNumber := 0;
+  Order       := 0;
+  CatNumber   := 0;
 
   // Note: do NOT set Letter to ' ', otherwise no category-button will be
   // created for songs beginning with ' ' if songs of this category exist.
   // TODO: trim song-properties so ' ' will not occur as first chararcter. 
-  Letter := #0;
+  Letter      := #0;
 
   // clear song-list
-  for SongIndex := 0 to Songs.SongList.Count-1 do
+  for SongIndex := 0 to Songs.SongList.Count - 1 do
   begin
     // free category buttons
     // Note: do NOT delete songs, they are just references to Songs.SongList entries
@@ -524,7 +524,7 @@ begin
   end;
   SetLength(Song, 0);
 
-  for SongIndex := 0 to Songs.SongList.Count-1 do
+  for SongIndex := 0 to Songs.SongList.Count - 1 do
   begin
     CurSong := TSong(Songs.SongList[SongIndex]);
     // if tabs are on, add section buttons for each new section
@@ -537,11 +537,11 @@ begin
 
         // TODO: remove this block if it is not needed anymore
         {
-        if CurSection = 'Singstar Part 2' then CoverName := 'Singstar';
-        if CurSection = 'Singstar German' then CoverName := 'Singstar';
-        if CurSection = 'Singstar Spanish' then CoverName := 'Singstar';
-        if CurSection = 'Singstar Italian' then CoverName := 'Singstar';
-        if CurSection = 'Singstar French' then CoverName := 'Singstar';
+        if CurSection = 'Singstar Part 2'     then CoverName := 'Singstar';
+        if CurSection = 'Singstar German'     then CoverName := 'Singstar';
+        if CurSection = 'Singstar Spanish'    then CoverName := 'Singstar';
+        if CurSection = 'Singstar Italian'    then CoverName := 'Singstar';
+        if CurSection = 'Singstar French'     then CoverName := 'Singstar';
         if CurSection = 'Singstar 80s Polish' then CoverName := 'Singstar 80s';
         }
 
@@ -642,15 +642,14 @@ begin
       CurSong.Visible := true
     else if (Ini.Tabs = 1) then
       CurSong.Visible := false;
-
-    {
+{
     if (Ini.Tabs = 1) and (Order = 1) then
     begin
       //open first tab
       CurSong.Visible := true;
     end;
     CurSong.Visible := true;
-    }
+}
   end;
 
   // set CatNumber of last category
@@ -668,7 +667,7 @@ end;
 
 procedure TCatSongs.ShowCategory(Index: integer);
 var
-  S:    integer; // song
+  S: integer; // song
 begin
   CatNumShow := Index;
   for S := 0 to high(CatSongs.Song) do
@@ -680,13 +679,13 @@ begin
       CatSongs.Song[S].Visible := false;
 }
 //  KMS: This should be the same, but who knows :-)
-    CatSongs.Song[S].Visible := ( (CatSongs.Song[S].OrderNum = Index) and (not CatSongs.Song[S].Main) );
+    CatSongs.Song[S].Visible := ((CatSongs.Song[S].OrderNum = Index) and (not CatSongs.Song[S].Main));
   end;
 end;
 
 procedure TCatSongs.HideCategory(Index: integer); // hides all songs in category
 var
-  S:    integer; // song
+  S: integer; // song
 begin
   for S := 0 to high(CatSongs.Song) do
   begin
@@ -697,7 +696,7 @@ end;
 
 procedure TCatSongs.ClickCategoryButton(Index: integer);
 var
-  Num:    integer;
+  Num: integer;
 begin
   Num := CatSongs.Song[Index].OrderNum;
   if Num <> CatNumShow then
@@ -713,7 +712,7 @@ end;
 //Hide Categorys when in Category Hack
 procedure TCatSongs.ShowCategoryList;
 var
-  S:    integer;
+  S: integer;
 begin
   // Hide All Songs Show All Cats
   for S := 0 to high(CatSongs.Song) do
@@ -723,8 +722,8 @@ begin
 end;
 //Hide Categorys when in Category Hack End
 
-//Wrong song selected when tabs on bug
-function TCatSongs.FindNextVisible(SearchFrom:integer): integer;//Find next Visible Song
+// Wrong song selected when tabs on bug
+function TCatSongs.FindNextVisible(SearchFrom:integer): integer;// Find next Visible Song
 var
   I: integer;
 begin
@@ -735,11 +734,11 @@ begin
     Inc (I);
     if (I>high(CatSongs.Song)) then
       I := low(CatSongs.Song);
-    if (I = SearchFrom) then //Make One Round and no song found->quit
+    if (I = SearchFrom) then // Make One Round and no song found->quit
       break;
   end;
 end;
-//Wrong song selected when tabs on bug End
+// Wrong song selected when tabs on bug End
 
 (**
  * Returns the number of visible songs.
@@ -765,44 +764,46 @@ var
   SongIndex: integer;
 begin
   Result := 0;
-  for SongIndex := 0 to Index-1 do
+  for SongIndex := 0 to Index - 1 do
   begin
     if (CatSongs.Song[SongIndex].Visible) then
       Inc(Result);
   end;
 end;
 
-function TCatSongs.SetFilter(FilterStr: string; const fType: Byte): Cardinal;
+function TCatSongs.SetFilter(FilterStr: string; const fType: byte): cardinal;
 var
-  I, J: integer;
-  cString: string;
+  I, J:      integer;
+  cString:   string;
   SearchStr: array of string;
 begin
-  {fType: 0: All
-          1: Title
-          2: Artist}
+{
+  fType: 0: All
+         1: Title
+         2: Artist
+}
   FilterStr := Trim(FilterStr);
   if FilterStr<>'' then
   begin
     Result := 0;
-    //Create Search Array
+    // Create Search Array
     SetLength(SearchStr, 1);
-    I := Pos (' ', FilterStr);
+    I := Pos(' ', FilterStr);
     while (I <> 0) do
     begin
-      SetLength (SearchStr, Length(SearchStr) + 1);
-      cString := Copy(FilterStr, 1, I-1);
+      SetLength(SearchStr, Length(SearchStr) + 1);
+      cString := Copy(FilterStr, 1, I - 1);
       if (cString <> ' ') and (cString <> '') then
-        SearchStr[High(SearchStr)-1] := cString;
+        SearchStr[High(SearchStr) - 1] := cString;
       Delete (FilterStr, 1, I);
 
       I := Pos (' ', FilterStr);
     end;
-    //Copy last Word
+    // Copy last Word
     if (FilterStr <> ' ') and (FilterStr <> '') then
       SearchStr[High(SearchStr)] := FilterStr;
 
-    for I:=0 to High(Song) do
+    for I := 0 to High(Song) do
     begin
       if not Song[i].Main then
       begin
@@ -811,8 +812,8 @@ begin
           1: cString := Song[I].Title;
           2: cString := Song[I].Artist;
         end;
-        Song[i].Visible:=True;
-        //Look for every Searched Word
+        Song[i].Visible:=true;
+        // Look for every Searched Word
         for J := 0 to High(SearchStr) do
         begin
           Song[i].Visible := Song[i].Visible and AnsiContainsText(cString, SearchStr[J])
@@ -821,13 +822,13 @@ begin
           Inc(Result);
       end
       else
-        Song[i].Visible:=False;
+        Song[i].Visible:=false;
     end;
     CatNumShow := -2;
   end
   else
   begin
-    for i:=0 to High(Song) do
+    for i := 0 to High(Song) do
     begin
       Song[i].Visible := (Ini.Tabs=1) = Song[i].Main;
       CatNumShow := -1;
-- 
cgit v1.2.3


From 7cf14a865954a7208f76421a396ea33c3cc87ab9 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 25 Apr 2009 18:18:53 +0000
Subject: correcting typos from cosmetics

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 9d44a086..a7231cb3 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -73,9 +73,9 @@ type
   end;
 
   TScore = record
-    Name:      widestring;
-    Score:     integer;
-    Length:    string;
+    Name:   widestring;
+    Score:  integer;
+    Length: string;
   end;
 
   {$IFDEF USE_PSEUDO_THREAD}
@@ -107,7 +107,7 @@ type
     procedure BrowseXMLFiles(Dir: widestring);
     procedure Sort(Order: integer);
     function  FindSongFile(Dir, Mask: widestring): widestring;
-    property  Processing  boolean read fProcessing;
+    property  Processing: boolean read fProcessing;
   end;
 
 
-- 
cgit v1.2.3


From 757ad7e4f0668334e33df82e0bb3bad6a8933bff Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 29 Jun 2009 15:26:33 +0000
Subject: cosmetics

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1840 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/USongs.pas | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index a7231cb3..c4871f18 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -535,16 +535,6 @@ begin
       begin
         CurCategory := CurSong.Edition;
 
-        // TODO: remove this block if it is not needed anymore
-        {
-        if CurSection = 'Singstar Part 2'     then CoverName := 'Singstar';
-        if CurSection = 'Singstar German'     then CoverName := 'Singstar';
-        if CurSection = 'Singstar Spanish'    then CoverName := 'Singstar';
-        if CurSection = 'Singstar Italian'    then CoverName := 'Singstar';
-        if CurSection = 'Singstar French'     then CoverName := 'Singstar';
-        if CurSection = 'Singstar 80s Polish' then CoverName := 'Singstar 80s';
-        }
-
         // add Category Button
         AddCategoryButton(CurCategory);
       end
-- 
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/base/USongs.pas | 419 +++++++++++++++++++++++++++-------------------------
 1 file changed, 221 insertions(+), 198 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index c4871f18..49b84425 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -40,32 +40,35 @@ interface
 {$ENDIF}
 
 uses
+  SysUtils,
+  Classes,
   {$IFDEF MSWINDOWS}
     Windows,
     DirWatch,
   {$ELSE}
     {$IFNDEF DARWIN}
-      syscall,
+    syscall,
     {$ENDIF}
     baseunix,
     UnixType,
   {$ENDIF}
-  SysUtils,
-  Classes,
   UPlatform,
   ULog,
   UTexture,
   UCommon,
-  {$IFDEF DARWIN}
-    cthreads,
-  {$ENDIF}
   {$IFDEF USE_PSEUDO_THREAD}
-    PseudoThread,
+  PseudoThread,
   {$ENDIF}
+  UPath,
   USong,
   UCatCovers;
 
 type
+  TSongFilter = (
+    fltAll,
+    fltTitle,
+    fltArtist
+  );
 
   TBPM = record
     BPM:       real;
@@ -73,11 +76,13 @@ type
   end;
 
   TScore = record
-    Name:   widestring;
+    Name:   UTF8String;
     Score:  integer;
     Length: string;
   end;
 
+  TPathDynArray = array of IPath;
+
   {$IFDEF USE_PSEUDO_THREAD}
   TSongs = class(TPseudoThread)
   {$ELSE}
@@ -102,11 +107,11 @@ type
 
 
     procedure LoadSongList;     // load all songs
-    procedure BrowseDir(Dir: widestring); // should return number of songs in the future
-    procedure BrowseTXTFiles(Dir: widestring);
-    procedure BrowseXMLFiles(Dir: widestring);
+    procedure FindFilesByExtension(const Dir: IPath; const Ext: IPath; Recursive: Boolean; var Files: TPathDynArray);
+    procedure BrowseDir(Dir: IPath); // should return number of songs in the future
+    procedure BrowseTXTFiles(Dir: IPath);
+    procedure BrowseXMLFiles(Dir: IPath);
     procedure Sort(Order: integer);
-    function  FindSongFile(Dir, Mask: widestring): widestring;
     property  Processing: boolean read fProcessing;
   end;
 
@@ -128,7 +133,7 @@ type
     function VisibleSongs: integer;                         // returns number of visible songs (for tabs)
     function VisibleIndex(Index: integer): integer;         // returns visible song index (skips invisible)
 
-    function SetFilter(FilterStr: string; const fType: byte): cardinal;
+    function SetFilter(FilterStr: UTF8String; Filter: TSongFilter): cardinal;
   end;
 
 var
@@ -156,9 +161,12 @@ uses
   UCovers,
   UFiles,
   UGraphic,
+  UMain,
   UIni,
-  UPath,
-  UNote;
+  UPathUtils,
+  UNote,
+  UFilesystem,
+  UUnicodeUtils;
 
 constructor TSongs.Create();
 begin
@@ -232,7 +240,7 @@ begin
 
     // browse directories
     for I := 0 to SongPaths.Count-1 do
-      BrowseDir(SongPaths[I]);
+      BrowseDir(SongPaths[I] as IPath);
 
     if assigned(CatSongs) then
       CatSongs.Refresh;
@@ -264,84 +272,92 @@ begin
   Resume();
 end;
 
-procedure TSongs.BrowseDir(Dir: widestring);
+procedure TSongs.BrowseDir(Dir: IPath);
 begin
   BrowseTXTFiles(Dir);
   BrowseXMLFiles(Dir);
 end;
 
-procedure TSongs.BrowseTXTFiles(Dir: widestring);
+procedure TSongs.FindFilesByExtension(const Dir: IPath; const Ext: IPath; Recursive: Boolean; var Files: TPathDynArray);
 var
-  i:     integer;
-  Files: TDirectoryEntryArray;
-  lSong: TSong;
+  Iter: IFileIterator;
+  FileInfo: TFileInfo;
+  FileName: IPath;
 begin
-
-  try
-    Files := Platform.DirectoryFindFiles(Dir, '.txt', true)
-  except
-    Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseTXTFiles')
-  end;
-
-  for i := 0 to Length(Files) - 1 do
+  // search for all files and directories
+  Iter := FileSystem.FileFind(Dir.Append('*'), faAnyFile);
+  while (Iter.HasNext) do
   begin
-    if Files[i].IsDirectory then
+    FileInfo := Iter.Next;
+    FileName := FileInfo.Name;
+    if ((FileInfo.Attr and faDirectory) <> 0) then
     begin
-      BrowseTXTFiles(Dir + Files[i].Name + PathDelim);  //Recursive Call
+      if Recursive and (not FileName.Equals('.')) and (not FileName.Equals('..')) then
+        FindFilesByExtension(Dir.Append(FileName), Ext, true, Files);
     end
     else
     begin
-      lSong := TSong.create(Dir + Files[i].Name);
-
-      if lSong.Analyse then
-        SongList.add(lSong)
-      else
+      if (Ext.Equals(FileName.GetExtension(), true)) then
       begin
-        Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
-        freeandnil(lSong);
+        SetLength(Files, Length(Files)+1);
+        Files[High(Files)] := Dir.Append(FileName);
       end;
-
     end;
   end;
-  SetLength(Files, 0);
-
 end;
 
-procedure TSongs.BrowseXMLFiles(Dir: widestring);
+procedure TSongs.BrowseTXTFiles(Dir: IPath);
 var
-  i:     integer;
-  Files: TDirectoryEntryArray;
-  lSong: TSong;
+  I: integer;
+  Files: TPathDynArray;
+  Song: TSong;
+  Extension: IPath;
 begin
+  SetLength(Files, 0);
+  Extension := Path('.txt');
+  FindFilesByExtension(Dir, Extension, true, Files);
 
-  try
-    Files := Platform.DirectoryFindFiles(Dir, '.xml', true)
-  except
-    Log.LogError('Couldn''t deal with directory/file: ' + Dir + ' in TSongs.BrowseXMLFiles')
-  end;
-
-  for i := 0 to Length(Files) - 1 do
+  for I := 0 to High(Files) do
   begin
-    if Files[i].IsDirectory then
-    begin
-      BrowseXMLFiles(Dir + Files[i].Name + PathDelim); // Recursive Call
-    end
+    Song := TSong.Create(Files[I]);
+
+    if Song.Analyse then
+      SongList.Add(Song)
     else
     begin
-      lSong := TSong.create(Dir + Files[i].Name);
+      Log.LogError('AnalyseFile failed for "' + Files[I].ToNative + '".');
+      FreeAndNil(Song);
+    end;
+  end;
 
-      if lSong.AnalyseXML then
-	SongList.add(lSong)
-      else
-      begin
-	Log.LogError('AnalyseFile failed for "' + Files[i].Name + '".');
-	freeandnil(lSong);
-      end;
+  SetLength(Files, 0);
+end;
+
+procedure TSongs.BrowseXMLFiles(Dir: IPath);
+var
+  I: integer;
+  Files: TPathDynArray;
+  Song: TSong;
+  Extension: IPath;
+begin
+  SetLength(Files, 0);
+  Extension := Path('.xml');
+  FindFilesByExtension(Dir, Extension, true, Files);
+
+  for I := 0 to High(Files) do
+  begin
+    Song := TSong.Create(Files[I]);
 
+    if Song.AnalyseXML then
+      SongList.Add(Song)
+    else
+    begin
+      Log.LogError('AnalyseFile failed for "' + Files[I].ToNative + '".');
+      FreeAndNil(Song);
     end;
   end;
-  SetLength(Files, 0);
 
+  SetLength(Files, 0);
 end;
 
 (*
@@ -350,32 +366,32 @@ end;
 
 function CompareByEdition(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Edition, TSong(Song2).Edition);
+  Result := UTF8CompareText(TSong(Song1).Edition, TSong(Song2).Edition);
 end;
 
 function CompareByGenre(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Genre, TSong(Song2).Genre);
+  Result := UTF8CompareText(TSong(Song1).Genre, TSong(Song2).Genre);
 end;
 
 function CompareByTitle(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Title, TSong(Song2).Title);
+  Result := UTF8CompareText(TSong(Song1).Title, TSong(Song2).Title);
 end;
 
 function CompareByArtist(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Artist, TSong(Song2).Artist);
+  Result := UTF8CompareText(TSong(Song1).Artist, TSong(Song2).Artist);
 end;
 
 function CompareByFolder(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Folder, TSong(Song2).Folder);
+  Result := UTF8CompareText(TSong(Song1).Folder, TSong(Song2).Folder);
 end;
 
 function CompareByLanguage(Song1, Song2: Pointer): integer;
 begin
-  Result := CompareText(TSong(Song1).Language, TSong(Song2).Language);
+  Result := UTF8CompareText(TSong(Song1).Language, TSong(Song2).Language);
 end;
 
 procedure TSongs.Sort(Order: integer);
@@ -412,18 +428,6 @@ begin
   MergeSort(SongList, CompareFunc);
 end;
 
-function TSongs.FindSongFile(Dir, Mask: widestring): widestring;
-var
-  SR: TSearchRec;   // for parsing song directory
-begin
-  Result := '';
-  if FindFirst(Dir + Mask, faDirectory, SR) = 0 then
-  begin
-    Result := SR.Name;
-  end; // if
-  FindClose(SR);
-end;
-
 procedure TCatSongs.SortSongs();
 begin
   case Ini.Sorting of
@@ -469,14 +473,14 @@ procedure TCatSongs.Refresh;
 var
   SongIndex:   integer;
   CurSong:     TSong;
-  CatIndex:    integer; // index of current song in Song
-  Letter:      char;    // current letter for sorting using letter
-  CurCategory: string;  // current edition for sorting using edition, genre etc.
-  Order:       integer; // number used for ordernum
-  LetterTmp:   char;
-  CatNumber:   integer; // Number of Song in Category
-
-  procedure AddCategoryButton(const CategoryName: string);
+  CatIndex:    integer;    // index of current song in Song
+  Letter:      UCS4Char;   // current letter for sorting using letter
+  CurCategory: UTF8String; // current edition for sorting using edition, genre etc.
+  Order:       integer;    // number used for ordernum
+  LetterTmp:   UCS4Char;
+  CatNumber:   integer;    // Number of Song in Category
+
+  procedure AddCategoryButton(const CategoryName: UTF8String);
   var
     PrevCatBtnIndex: integer;
   begin
@@ -511,7 +515,7 @@ begin
   // Note: do NOT set Letter to ' ', otherwise no category-button will be
   // created for songs beginning with ' ' if songs of this category exist.
   // TODO: trim song-properties so ' ' will not occur as first chararcter. 
-  Letter      := #0;
+  Letter      := 0;
 
   // clear song-list
   for SongIndex := 0 to Songs.SongList.Count - 1 do
@@ -530,91 +534,110 @@ begin
     // if tabs are on, add section buttons for each new section
     if (Ini.Tabs = 1) then
     begin
-      if (Ini.Sorting = sEdition) and
-         (CompareText(CurCategory, CurSong.Edition) <> 0) then
-      begin
-        CurCategory := CurSong.Edition;
-
-        // add Category Button
-        AddCategoryButton(CurCategory);
-      end
-
-      else if (Ini.Sorting = sGenre) and
-              (CompareText(CurCategory, CurSong.Genre) <> 0) then
-      begin
-        CurCategory := CurSong.Genre;
-        // add Genre Button
-        AddCategoryButton(CurCategory);
-      end
-
-      else if (Ini.Sorting = sLanguage) and
-              (CompareText(CurCategory, CurSong.Language) <> 0) then
-      begin
-        CurCategory := CurSong.Language;
-        // add Language Button
-        AddCategoryButton(CurCategory);
-      end
+      case (Ini.Sorting) of
+        sEdition: begin
+          if (CompareText(CurCategory, CurSong.Edition) <> 0) then
+          begin
+            CurCategory := CurSong.Edition;
+
+            // add Category Button
+            AddCategoryButton(CurCategory);
+          end;
+        end;
 
-      else if (Ini.Sorting = sTitle) and
-              (Length(CurSong.Title) >= 1) and
-              (Letter <> UpperCase(CurSong.Title)[1]) then
-      begin
-        Letter := Uppercase(CurSong.Title)[1];
-        // add a letter Category Button
-        AddCategoryButton(Letter);
-      end
+        sGenre: begin
+          if (CompareText(CurCategory, CurSong.Genre) <> 0) then
+          begin
+            CurCategory := CurSong.Genre;
+            // add Genre Button
+            AddCategoryButton(CurCategory);
+          end;
+        end;
 
-      else if (Ini.Sorting = sArtist) and
-              (Length(CurSong.Artist) >= 1) and
-              (Letter <> UpperCase(CurSong.Artist)[1]) then
-      begin
-        Letter := UpperCase(CurSong.Artist)[1];
-        // add a letter Category Button
-        AddCategoryButton(Letter);
-      end
+        sLanguage: begin
+          if (CompareText(CurCategory, CurSong.Language) <> 0) then
+          begin
+            CurCategory := CurSong.Language;
+            // add Language Button
+            AddCategoryButton(CurCategory);
+          end
+        end;
 
-      else if (Ini.Sorting = sFolder) and
-              (CompareText(CurCategory, CurSong.Folder) <> 0) then
-      begin
-        CurCategory := CurSong.Folder;
-        // add folder tab
-        AddCategoryButton(CurCategory);
-      end
+        sTitle: begin
+          if (Length(CurSong.Title) >= 1) then
+          begin
+            LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Title)[0]);
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-      else if (Ini.Sorting = sTitle2) and
-              (Length(CurSong.Title) >= 1) then
-      begin
-        // pack all numbers into a category named '#'
-        if (CurSong.Title[1] >= '0') and (CurSong.Title[1] <= '9') then
-          LetterTmp := '#'
-        else
-          LetterTmp := UpperCase(CurSong.Title)[1];
+        sArtist: begin
+          if (Length(CurSong.Artist) >= 1) then
+          begin
+            LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Artist)[0]);
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-        if (Letter <> LetterTmp) then
-        begin
-          Letter := LetterTmp;
-          // add a letter Category Button
-          AddCategoryButton(Letter);
+        sFolder: begin
+          if (UTF8CompareText(CurCategory, CurSong.Folder) <> 0) then
+          begin
+            CurCategory := CurSong.Folder;
+            // add folder tab
+            AddCategoryButton(CurCategory);
+          end;
         end;
-      end
 
-      else if (Ini.Sorting = sArtist2) and
-              (Length(CurSong.Artist)>=1) then
-      begin
-        // pack all numbers into a category named '#'
-        if (CurSong.Artist[1] >= '0') and (CurSong.Artist[1] <= '9') then
-          LetterTmp := '#'
-        else
-          LetterTmp := UpperCase(CurSong.Artist)[1];
+        sTitle2: begin
+          if (Length(CurSong.Title) >= 1) then
+          begin
+            LetterTmp := UTF8ToUCS4String(CurSong.Title)[0];
+            // pack all numbers into a category named '#'
+            if (LetterTmp in [Ord('0') .. Ord('9')]) then
+              LetterTmp := Ord('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
+
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-        if (Letter <> LetterTmp) then
-        begin
-          Letter := LetterTmp;
-          // add a letter Category Button
-          AddCategoryButton(Letter);
+        sArtist2: begin
+          if (Length(CurSong.Artist) >= 1) then
+          begin
+            LetterTmp := UTF8ToUCS4String(CurSong.Artist)[0];
+            // pack all numbers into a category named '#'
+            if (LetterTmp in [Ord('0') .. Ord('9')]) then
+              LetterTmp := Ord('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
+
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
         end;
-      end;
-    end;
+        
+      end; // case (Ini.Sorting)
+    end; // if (Ini.Tabs = 1)
 
     CatIndex := Length(Song);
     SetLength(Song, CatIndex+1);
@@ -761,58 +784,58 @@ begin
   end;
 end;
 
-function TCatSongs.SetFilter(FilterStr: string; const fType: byte): cardinal;
+function TCatSongs.SetFilter(FilterStr: UTF8String; Filter: TSongFilter): cardinal;
 var
   I, J:      integer;
-  cString:   string;
-  SearchStr: array of string;
+  TmpString: UTF8String;
+  WordArray: array of UTF8String;
 begin
-{
-  fType: 0: All
-         1: Title
-         2: Artist
-}
   FilterStr := Trim(FilterStr);
-  if FilterStr<>'' then
+  if (FilterStr <> '') then
   begin
     Result := 0;
-    // Create Search Array
-    SetLength(SearchStr, 1);
+
+    // initialize word array
+    SetLength(WordArray, 1);
+
+    // Copy words to SearchStr
     I := Pos(' ', FilterStr);
     while (I <> 0) do
     begin
-      SetLength(SearchStr, Length(SearchStr) + 1);
-      cString := Copy(FilterStr, 1, I - 1);
-      if (cString <> ' ') and (cString <> '') then
-        SearchStr[High(SearchStr) - 1] := cString;
-      Delete (FilterStr, 1, I);
+      WordArray[High(WordArray)] := Copy(FilterStr, 1, I-1);
+      SetLength(WordArray, Length(WordArray) + 1);
 
-      I := Pos (' ', FilterStr);
+      FilterStr := TrimLeft(Copy(FilterStr, I+1, Length(FilterStr)-I));
+      I := Pos(' ', FilterStr);
     end;
-    // Copy last Word
-    if (FilterStr <> ' ') and (FilterStr <> '') then
-      SearchStr[High(SearchStr)] := FilterStr;
+
+    // Copy last word
+    WordArray[High(WordArray)] := FilterStr;
 
     for I := 0 to High(Song) do
     begin
       if not Song[i].Main then
       begin
-        case fType of
-          0: cString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;
-          1: cString := Song[I].Title;
-          2: cString := Song[I].Artist;
+        case Filter of
+          fltAll:
+            TmpString := Song[I].Artist + ' ' + Song[i].Title + ' ' + Song[i].Folder;
+          fltTitle:
+            TmpString := Song[I].Title;
+          fltArtist:
+            TmpString := Song[I].Artist;
         end;
-        Song[i].Visible:=true;
-        // Look for every Searched Word
-        for J := 0 to High(SearchStr) do
+        Song[i].Visible := true;
+        // Look for every searched word
+        for J := 0 to High(WordArray) do
         begin
-          Song[i].Visible := Song[i].Visible and AnsiContainsText(cString, SearchStr[J])
+          Song[i].Visible := Song[i].Visible and
+                             UTF8ContainsText(TmpString, WordArray[J])
         end;
         if Song[i].Visible then
           Inc(Result);
       end
       else
-        Song[i].Visible:=false;
+        Song[i].Visible := false;
     end;
     CatNumShow := -2;
   end
@@ -820,7 +843,7 @@ begin
   begin
     for i := 0 to High(Song) do
     begin
-      Song[i].Visible := (Ini.Tabs=1) = Song[i].Main;
+      Song[i].Visible := (Ini.Tabs = 1) = Song[i].Main;
       CatNumShow := -1;
     end;
     Result := 0;
-- 
cgit v1.2.3


From df0a8e7c62a4006ea7ac66ad7c0745a48a32ef24 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 17 Nov 2009 16:21:03 +0000
Subject: implemented suggestions by Canni from Assembla ticket #85 artist
 sorting replaced by artist2 title sorting replaced by title2 new sorting
 artist2 (suggestions for a better name?!)   all songs by the same artist are
 put into the same category named by the artist

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1945 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/USongs.pas | 68 +++++++++++++++++++++--------------------------------
 1 file changed, 27 insertions(+), 41 deletions(-)

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 49b84425..d3018bcf 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -410,8 +410,6 @@ begin
       CompareFunc := CompareByArtist;
     sFolder: // by folder
       CompareFunc := CompareByFolder;
-    sTitle2: // by title2
-      CompareFunc := CompareByTitle;
     sArtist2: // by artist2
       CompareFunc := CompareByArtist;
     sLanguage: // by Language
@@ -458,12 +456,8 @@ begin
         Songs.Sort(sTitle);
         Songs.Sort(sArtist);
       end;
-    sTitle2: begin
-        Songs.Sort(sArtist2);
-        Songs.Sort(sTitle2);
-      end;
     sArtist2: begin
-        Songs.Sort(sTitle2);
+        Songs.Sort(sTitle);
         Songs.Sort(sArtist2);
       end;
   end; // case
@@ -567,6 +561,15 @@ begin
           if (Length(CurSong.Title) >= 1) then
           begin
             LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Title)[0]);
+            { all numbers and some punctuation chars are put into a
+              category named '#'
+              we can't put the other punctuation chars into this category
+              because they are not in order, so there will be two different
+              categories named '#' } 
+            if (LetterTmp in [Ord('!') .. Ord('?')]) then
+              LetterTmp := Ord('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
             if (Letter <> LetterTmp) then
             begin
               Letter := LetterTmp;
@@ -580,6 +583,16 @@ begin
           if (Length(CurSong.Artist) >= 1) then
           begin
             LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Artist)[0]);
+            { all numbers and some punctuation chars are put into a
+              category named '#'
+              we can't put the other punctuation chars into this category
+              because they are not in order, so there will be two different
+              categories named '#' } 
+            if (LetterTmp in [Ord('!') .. Ord('?')]) then
+              LetterTmp := Ord('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
+              
             if (Letter <> LetterTmp) then
             begin
               Letter := LetterTmp;
@@ -598,44 +611,17 @@ begin
           end;
         end;
 
-        sTitle2: begin
-          if (Length(CurSong.Title) >= 1) then
-          begin
-            LetterTmp := UTF8ToUCS4String(CurSong.Title)[0];
-            // pack all numbers into a category named '#'
-            if (LetterTmp in [Ord('0') .. Ord('9')]) then
-              LetterTmp := Ord('#')
-            else
-              LetterTmp := UCS4UpperCase(LetterTmp);
-
-            if (Letter <> LetterTmp) then
-            begin
-              Letter := LetterTmp;
-              // add a letter Category Button
-              AddCategoryButton(UCS4ToUTF8String(Letter));
-            end;
-          end;
-        end;
-
         sArtist2: begin
-          if (Length(CurSong.Artist) >= 1) then
+          { this new sorting puts all songs by the same artist into
+            a single category }
+          if (UTF8CompareText(CurCategory, CurSong.Artist) <> 0) then
           begin
-            LetterTmp := UTF8ToUCS4String(CurSong.Artist)[0];
-            // pack all numbers into a category named '#'
-            if (LetterTmp in [Ord('0') .. Ord('9')]) then
-              LetterTmp := Ord('#')
-            else
-              LetterTmp := UCS4UpperCase(LetterTmp);
-
-            if (Letter <> LetterTmp) then
-            begin
-              Letter := LetterTmp;
-              // add a letter Category Button
-              AddCategoryButton(UCS4ToUTF8String(Letter));
-            end;
+            CurCategory := CurSong.Artist;
+            // add folder tab
+            AddCategoryButton(CurCategory);
           end;
         end;
-        
+
       end; // case (Ini.Sorting)
     end; // if (Ini.Tabs = 1)
 
-- 
cgit v1.2.3


From 64e2aab2ea368ed666ad1afd7105e06917eeadb7 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 18 Nov 2009 15:34:06 +0000
Subject: fixed TCatSongs.FindNextVisible

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index d3018bcf..baeec13a 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -727,14 +727,18 @@ var
   I: integer;
 begin
   Result := -1;
-  I := SearchFrom + 1;
-  while not CatSongs.Song[I].Visible do
+  I := SearchFrom;
+  while (Result = -1) do
   begin
     Inc (I);
-    if (I>high(CatSongs.Song)) then
-      I := low(CatSongs.Song);
+
+    if (I > High(CatSongs.Song)) then
+      I := Low(CatSongs.Song);
     if (I = SearchFrom) then // Make One Round and no song found->quit
-      break;
+      Break;
+
+    if (CatSongs.Song[I].Visible) then
+      Result := I;
   end;
 end;
 // Wrong song selected when tabs on bug End
-- 
cgit v1.2.3


From dc3c42586733e84bc5d92c037f837f5a83e96bd9 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 21 Apr 2010 23:58:40 +0000
Subject: - cleanup - made TSortingType an enum

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index baeec13a..0056d75b 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -61,6 +61,7 @@ uses
   {$ENDIF}
   UPath,
   USong,
+  UIni,
   UCatCovers;
 
 type
@@ -111,7 +112,7 @@ type
     procedure BrowseDir(Dir: IPath); // should return number of songs in the future
     procedure BrowseTXTFiles(Dir: IPath);
     procedure BrowseXMLFiles(Dir: IPath);
-    procedure Sort(Order: integer);
+    procedure Sort(Order: TSortingType);
     property  Processing: boolean read fProcessing;
   end;
 
@@ -162,7 +163,6 @@ uses
   UFiles,
   UGraphic,
   UMain,
-  UIni,
   UPathUtils,
   UNote,
   UFilesystem,
@@ -394,7 +394,7 @@ begin
   Result := UTF8CompareText(TSong(Song1).Language, TSong(Song2).Language);
 end;
 
-procedure TSongs.Sort(Order: integer);
+procedure TSongs.Sort(Order: TSortingType);
 var
   CompareFunc: TListSortCompare;
 begin
@@ -428,7 +428,7 @@ end;
 
 procedure TCatSongs.SortSongs();
 begin
-  case Ini.Sorting of
+  case TSortingType(Ini.Sorting) of
     sEdition: begin
         Songs.Sort(sTitle);
         Songs.Sort(sArtist);
@@ -528,7 +528,7 @@ begin
     // if tabs are on, add section buttons for each new section
     if (Ini.Tabs = 1) then
     begin
-      case (Ini.Sorting) of
+      case (TSortingType(Ini.Sorting)) of
         sEdition: begin
           if (CompareText(CurCategory, CurSong.Edition) <> 0) then
           begin
-- 
cgit v1.2.3


From 776e4ffb42b0cc5f32c2dcc54745a3537e3bcc15 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 22 Apr 2010 00:43:55 +0000
Subject: fixed regression of last commit - now all catcover accesses are
 type-safe

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

(limited to 'src/base/USongs.pas')

diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index 0056d75b..cfc32a99 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -486,7 +486,7 @@ var
     Song[CatIndex].Main     := true;
     Song[CatIndex].OrderTyp := 0;
     Song[CatIndex].OrderNum := Order;
-    Song[CatIndex].Cover    := CatCovers.GetCover(Ini.Sorting, CategoryName);
+    Song[CatIndex].Cover    := CatCovers.GetCover(TSortingType(Ini.Sorting), CategoryName);
     Song[CatIndex].Visible  := true;
 
     // set number of songs in previous category
-- 
cgit v1.2.3