Merge remote-tracking branch 'refs/remotes/Vocaluxe/develop' into Multimonitor

Modify CProgressBar to transfer properties to code-generated progressbars that does not exist in the screen xml
This commit is contained in:
Jiiniasu committed 2017-09-23 15:28:25 +02:00
commit 53d22b1082
111 files changed
+3397 -10358

No files matched your search

+2 -2
View File
@@ -61,7 +61,6 @@ namespace VocaluxeLib
bool IsMicConfigured(int playerNr);
int GetMaxNumMics();
bool GetLoadOldThemeFiles();
void AddSongMenuListener(OnSongMenuChanged onSongMenuChanged);
void RemoveSongMenuListener(OnSongMenuChanged onSongMenuChanged);
}
@@ -252,7 +251,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();
@@ -326,6 +325,7 @@ namespace VocaluxeLib
int GetSongCount(int playlistID);
CPlaylistSong GetSong(int playlistID, int songIndex);
bool ContainsSong(int playlistID, int songIndex);
}
public interface IPreviewPlayer