Merge branch 'playlist-filter' of github.com:derivator/Vocaluxe into develop

This commit is contained in:
Florian Küpper committed 2017-09-11 12:36:01 +02:00
commit 5c6267d397
9 files changed
+34 -9

No files matched your search

+2 -1
View File
@@ -250,7 +250,7 @@ namespace VocaluxeLib
void AddPartySongSung(int songID);
void ResetSongSung(int catIndex = -1);
void SortSongs(ESongSorting sorting, EOffOn tabs, EOffOn ignoreArticles, String searchString, EDuetOptions duetOptions);
void SortSongs(ESongSorting sorting, EOffOn tabs, EOffOn ignoreArticles, String searchString, EDuetOptions duetOptions, int playlistID);
void NextCategory();
void PrevCategory();
@@ -324,6 +324,7 @@ namespace VocaluxeLib
int GetSongCount(int playlistID);
CPlaylistSong GetSong(int playlistID, int songIndex);
bool ContainsSong(int playlistID, int songIndex);
}
public interface IPreviewPlayer
@@ -67,6 +67,7 @@ namespace VocaluxeLib.PartyModes
_ScreenSongOptions.Sorting.SearchString = String.Empty;
_ScreenSongOptions.Sorting.SearchActive = false;
_ScreenSongOptions.Sorting.DuetOptions = EDuetOptions.All;
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
}
public override bool Init()
+1
View File
@@ -34,6 +34,7 @@ namespace VocaluxeLib.PartyModes
public EOffOn IgnoreArticles;
public string SearchString;
public bool SearchActive;
public int FilterPlaylistID; //show only songs that are in this playlist, -1 for all songs
public EDuetOptions DuetOptions;
}