Merge branch 'develop' into player-guid

This commit is contained in:
Florian Küpper committed 2017-11-05 23:32:30 +01:00
commit 86dc259c17
387 files changed
+18124 -16761

No files matched your search

+10 -7
View File
@@ -46,6 +46,8 @@ namespace VocaluxeLib
ESongMenu GetSongMenuType();
EHighscoreStyle GetHighscoreStyle();
EOffOn GetDrawNoteLines();
EOffOn GetDrawToneHelper();
@@ -59,7 +61,6 @@ namespace VocaluxeLib
bool IsMicConfigured(int playerNr);
int GetMaxNumMics();
bool GetLoadOldThemeFiles();
void AddSongMenuListener(OnSongMenuChanged onSongMenuChanged);
void RemoveSongMenuListener(OnSongMenuChanged onSongMenuChanged);
}
@@ -81,6 +82,7 @@ namespace VocaluxeLib
int GetNumNoteLines();
int GetMaxNumPlayer();
int GetMaxNumScreens();
float GetDefaultMedleyFadeInTime();
float GetDefaultMedleyFadeOutTime();
@@ -133,17 +135,17 @@ namespace VocaluxeLib
public interface IDrawing
{
void DrawTexture(CTextureRef texture, SRectF rect);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, bool allMonitors = true);
void DrawTexture(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false, bool allMonitors = true);
void DrawTexture(CTextureRef textureRef, SRectF bounds, EAspect aspect);
void DrawTexture(CTextureRef textureRef, SRectF bounds, EAspect aspect, SColorF color);
void DrawTextureReflection(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
void DrawTextureReflection(CTextureRef texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight, bool allMonitors = true);
CTextureRef AddTexture(string fileName);
CTextureRef EnqueueTexture(string fileName);
void RemoveTexture(ref CTextureRef texture);
void DrawRect(SColorF color, SRectF rect);
void DrawRect(SColorF color, SRectF rect, bool allMonitors = true);
void DrawRectReflection(SColorF color, SRectF rect, float space, float height);
}
@@ -172,7 +174,7 @@ namespace VocaluxeLib
{
RectangleF GetTextBounds(CText text);
void DrawText(string text, CFont font, float x, float y, float z, SColorF color);
void DrawText(string text, CFont font, float x, float y, float z, SColorF color, bool allMonitors = true);
void DrawTextReflection(string text, CFont font, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);
void DrawText(string text, CFont font, float x, float y, float z, SColorF color, float begin, float end);
}
@@ -250,7 +252,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 +326,7 @@ namespace VocaluxeLib
int GetSongCount(int playlistID);
CPlaylistSong GetSong(int playlistID, int songIndex);
bool ContainsSong(int playlistID, int songIndex);
}
public interface IPreviewPlayer