Autoformatting

This commit is contained in:
Jiiniasu committed 2016-12-18 18:06:25 +01:00
1 parent ae656ba727
commit e888197cdc
4 files changed
+140 -70

No files matched your search

+126 -63
View File
@@ -63,110 +63,173 @@ namespace Vocaluxe.Base
public struct SConfigDebug public struct SConfigDebug
{ {
[DefaultValue(EDebugLevel.TR_CONFIG_OFF)] public EDebugLevel DebugLevel; [DefaultValue(EDebugLevel.TR_CONFIG_OFF)]
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn SaveModifiedSongs; public EDebugLevel DebugLevel;
[DefaultValue(EOffOn.TR_CONFIG_OFF)]
public EOffOn SaveModifiedSongs;
} }
public struct SConfigGraphics public struct SConfigGraphics
{ {
#if WIN #if WIN
[DefaultValue(ERenderer.TR_CONFIG_DIRECT3D)] public ERenderer Renderer; [DefaultValue(ERenderer.TR_CONFIG_DIRECT3D)]
public ERenderer Renderer;
#else #else
[DefaultValue(ERenderer.TR_CONFIG_OPENGL)] public ERenderer Renderer; [DefaultValue(ERenderer.TR_CONFIG_OPENGL)] public ERenderer Renderer;
#endif #endif
[DefaultValue(ETextureQuality.TR_CONFIG_TEXTURE_MEDIUM)] public ETextureQuality TextureQuality; [DefaultValue(ETextureQuality.TR_CONFIG_TEXTURE_MEDIUM)]
[XmlRanged(32, 1024), DefaultValue(256)] public int CoverSize; public ETextureQuality TextureQuality;
[XmlRanged(32, 1024), DefaultValue(256)]
public int CoverSize;
[DefaultValue(1024)] public int ScreenW; [DefaultValue(1024)]
[DefaultValue(576)] public int ScreenH; public int ScreenW;
[DefaultValue(EGeneralAlignment.Middle)] public EGeneralAlignment ScreenAlignment; [DefaultValue(576)]
[DefaultValue(0)] public int BorderLeft; public int ScreenH;
[DefaultValue(0)] public int BorderRight; [DefaultValue(EGeneralAlignment.Middle)]
[DefaultValue(0)] public int BorderTop; public EGeneralAlignment ScreenAlignment;
[DefaultValue(0)] public int BorderBottom; [DefaultValue(0)]
[DefaultValue(EAntiAliasingModes.X0)] public EAntiAliasingModes AAMode; public int BorderLeft;
[DefaultValue(60f)] public float MaxFPS; [DefaultValue(0)]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VSync; public int BorderRight;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn FullScreen; [DefaultValue(0)]
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn Stretch; public int BorderTop;
[DefaultValue(0.4f), XmlRanged(0, 3)] public float FadeTime; [DefaultValue(0)]
public int BorderBottom;
[DefaultValue(EAntiAliasingModes.X0)]
public EAntiAliasingModes AAMode;
[DefaultValue(60f)]
public float MaxFPS;
[DefaultValue(EOffOn.TR_CONFIG_ON)]
public EOffOn VSync;
[DefaultValue(EOffOn.TR_CONFIG_ON)]
public EOffOn FullScreen;
[DefaultValue(EOffOn.TR_CONFIG_OFF)]
public EOffOn Stretch;
[DefaultValue(0.4f), XmlRanged(0, 3)]
public float FadeTime;
} }
public struct SConfigTheme public struct SConfigTheme
{ {
[XmlElement("Name"), DefaultValue("Ambient")] public string Theme; [XmlElement("Name"), DefaultValue("Ambient")]
[DefaultValue("Blue")] public string Skin; public string Theme;
[XmlElement("Cover"), DefaultValue("Ambient Blue")] public string CoverTheme; [DefaultValue("Blue")]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawNoteLines; public string Skin;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawToneHelper; [XmlElement("Cover"), DefaultValue("Ambient Blue")]
[DefaultValue(ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED)] public ETimerLook TimerLook; public string CoverTheme;
[DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)] public EPlayerInfo PlayerInfo; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)] public EFadePlayerInfo FadePlayerInfo; public EOffOn DrawNoteLines;
[DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)] public ECoverLoading CoverLoading; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[DefaultValue(ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE)] public ELyricStyle LyricStyle; public EOffOn DrawToneHelper;
[DefaultValue(ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED)]
public ETimerLook TimerLook;
[DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)]
public EPlayerInfo PlayerInfo;
[DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)]
public EFadePlayerInfo FadePlayerInfo;
[DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)]
public ECoverLoading CoverLoading;
[DefaultValue(ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE)]
public ELyricStyle LyricStyle;
} }
public struct SConfigSound public struct SConfigSound
{ {
[DefaultValue(EPlaybackLib.GstreamerSharp)] public EPlaybackLib PlayBackLib; [DefaultValue(EPlaybackLib.GstreamerSharp)]
[DefaultValue(ERecordLib.PortAudio)] public ERecordLib RecordLib; public EPlaybackLib PlayBackLib;
[DefaultValue(EBufferSize.B2048)] public EBufferSize AudioBufferSize; [DefaultValue(ERecordLib.PortAudio)]
[XmlRanged(-500, 500)] public int AudioLatency; public ERecordLib RecordLib;
[DefaultValue(EBufferSize.B2048)]
public EBufferSize AudioBufferSize;
[XmlRanged(-500, 500)]
public int AudioLatency;
// ReSharper disable MemberHidesStaticFromOuterClass // ReSharper disable MemberHidesStaticFromOuterClass
[DefaultValue(EBackgroundMusicOffOn.TR_CONFIG_ON)] public EBackgroundMusicOffOn BackgroundMusic; [DefaultValue(EBackgroundMusicOffOn.TR_CONFIG_ON)]
[XmlRanged(0, 100), DefaultValue(30)] public int BackgroundMusicVolume; public EBackgroundMusicOffOn BackgroundMusic;
[DefaultValue(EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC)] public EBackgroundMusicSource BackgroundMusicSource; [XmlRanged(0, 100), DefaultValue(30)]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn BackgroundMusicUseStart; public int BackgroundMusicVolume;
[XmlRanged(0, 100), DefaultValue(50)] public int PreviewMusicVolume; [DefaultValue(EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC)]
[XmlRanged(0, 100), DefaultValue(80)] public int GameMusicVolume; public EBackgroundMusicSource BackgroundMusicSource;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn KaraokeEffect; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[XmlRanged(0, 1), DefaultValue(1.0f)] public float KaraokeEffectLevel; public EOffOn BackgroundMusicUseStart;
[XmlRanged(0, 100), DefaultValue(50)]
public int PreviewMusicVolume;
[XmlRanged(0, 100), DefaultValue(80)]
public int GameMusicVolume;
[DefaultValue(EOffOn.TR_CONFIG_OFF)]
public EOffOn KaraokeEffect;
[XmlRanged(0, 1), DefaultValue(1.0f)]
public float KaraokeEffectLevel;
// ReSharper restore MemberHidesStaticFromOuterClass // ReSharper restore MemberHidesStaticFromOuterClass
} }
public struct SConfigGame public struct SConfigGame
{ {
[DefaultValue(CSettings.FallbackLanguage)] public string Language; [DefaultValue(CSettings.FallbackLanguage)]
public string Language;
public string[] SongFolder; public string[] SongFolder;
// ReSharper disable MemberHidesStaticFromOuterClass // ReSharper disable MemberHidesStaticFromOuterClass
[DefaultValue(ESongMenu.TR_CONFIG_TILE_BOARD)] public ESongMenu SongMenu; [DefaultValue(ESongMenu.TR_CONFIG_TILE_BOARD)]
public ESongMenu SongMenu;
// ReSharper restore MemberHidesStaticFromOuterClass // ReSharper restore MemberHidesStaticFromOuterClass
[DefaultValue(ESongSorting.TR_CONFIG_ARTIST)] public ESongSorting SongSorting; [DefaultValue(ESongSorting.TR_CONFIG_ARTIST)]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn IgnoreArticles; public ESongSorting SongSorting;
[DefaultValue(10)] public float ScoreAnimationTime; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[DefaultValue(ETimerMode.TR_CONFIG_TIMERMODE_REMAINING)] public ETimerMode TimerMode; public EOffOn IgnoreArticles;
[XmlAltName("NumPlayer"), DefaultValue(2)] public int NumPlayers; [DefaultValue(10)]
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn Tabs; public float ScoreAnimationTime;
[DefaultValue(ELyricsPosition.TR_CONFIG_LYRICSPOSITION_BOTTOM)] public ELyricsPosition LyricsPosition; [DefaultValue(ETimerMode.TR_CONFIG_TIMERMODE_REMAINING)]
[DefaultValue(0.1f)] public float MinLineBreakTime; //Minimum time to show the text before it is (to be) sung (if possible) public ETimerMode TimerMode;
[XmlArrayItem("Player"), XmlArray] public string[] Players; [XmlAltName("NumPlayer"), DefaultValue(2)]
[DefaultValue(EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)] public EHighscoreStyle HighscoreStyle; public int NumPlayers;
[DefaultValue(EOffOn.TR_CONFIG_OFF)]
public EOffOn Tabs;
[DefaultValue(ELyricsPosition.TR_CONFIG_LYRICSPOSITION_BOTTOM)]
public ELyricsPosition LyricsPosition;
[DefaultValue(0.1f)]
public float MinLineBreakTime; //Minimum time to show the text before it is (to be) sung (if possible)
[XmlArrayItem("Player"), XmlArray]
public string[] Players;
[DefaultValue(EHighscoreStyle.TR_CONFIG_HIGHSCORE_LIST_BEST)]
public EHighscoreStyle HighscoreStyle;
} }
public struct SConfigVideo public struct SConfigVideo
{ {
[DefaultValue(EVideoDecoder.FFmpeg)] public EVideoDecoder VideoDecoder; [DefaultValue(EVideoDecoder.FFmpeg)]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VideoBackgrounds; public EVideoDecoder VideoDecoder;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VideoPreview; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VideosInSongs; public EOffOn VideoBackgrounds;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn VideosToBackground; [DefaultValue(EOffOn.TR_CONFIG_ON)]
[DefaultValue(EWebcamLib.AForgeNet)] public EWebcamLib WebcamLib; public EOffOn VideoPreview;
[DefaultValue(EOffOn.TR_CONFIG_ON)]
public EOffOn VideosInSongs;
[DefaultValue(EOffOn.TR_CONFIG_OFF)]
public EOffOn VideosToBackground;
[DefaultValue(EWebcamLib.AForgeNet)]
public EWebcamLib WebcamLib;
public SWebcamConfig? WebcamConfig; public SWebcamConfig? WebcamConfig;
} }
public struct SConfigRecord public struct SConfigRecord
{ {
public SMicConfig[] MicConfig; public SMicConfig[] MicConfig;
[DefaultValue(200)] public int MicDelay; //[ms] [DefaultValue(200)]
public int MicDelay; //[ms]
} }
public struct SConfigServer public struct SConfigServer
{ {
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn ServerActive; [DefaultValue(EOffOn.TR_CONFIG_OFF)]
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn ServerEncryption; public EOffOn ServerActive;
[DefaultValue(3000)] public int ServerPort; [DefaultValue(EOffOn.TR_CONFIG_OFF)]
[DefaultValue(70)] public int SongCountCoverThreshold; public EOffOn ServerEncryption;
[DefaultValue(3000)]
public int ServerPort;
[DefaultValue(70)]
public int SongCountCoverThreshold;
} }
#pragma warning restore 649 #pragma warning restore 649
// ReSharper restore UnassignedField.Global // ReSharper restore UnassignedField.Global
+2 -1
View File
@@ -27,7 +27,8 @@ namespace VocaluxeLib.Menu
[XmlType("ParticleEffect")] [XmlType("ParticleEffect")]
public struct SThemeParticleEffect public struct SThemeParticleEffect
{ {
[XmlAttribute(AttributeName = "Name")] public string Name; [XmlAttribute(AttributeName = "Name")]
public string Name;
public string Skin; public string Skin;
public SRectF Rect; public SRectF Rect;
+2 -1
View File
@@ -26,7 +26,8 @@ namespace VocaluxeLib.Menu
[XmlType("Static")] [XmlType("Static")]
public struct SThemeStatic public struct SThemeStatic
{ {
[XmlAttribute(AttributeName = "Name")] public string Name; [XmlAttribute(AttributeName = "Name")]
public string Name;
public string Skin; public string Skin;
public SThemeColor Color; public SThemeColor Color;
public SRectF Rect; public SRectF Rect;
+10 -5
View File
@@ -25,19 +25,24 @@ namespace VocaluxeLib.Menu
[XmlType("Text")] [XmlType("Text")]
public struct SThemeText public struct SThemeText
{ {
[XmlAttribute(AttributeName = "Name")] public string Name; [XmlAttribute(AttributeName = "Name")]
public string Name;
public float X; public float X;
public float Y; public float Y;
public float Z; public float Z;
[XmlElement("H")] public float FontHeight; [XmlElement("H")]
[XmlElement("MaxW")] public float MaxWidth; public float FontHeight;
[XmlElement("MaxW")]
public float MaxWidth;
public SThemeColor Color; public SThemeColor Color;
public SThemeColor SelColor; //for Buttons public SThemeColor SelColor; //for Buttons
public EAlignment Align; public EAlignment Align;
public EHAlignment ResizeAlign; public EHAlignment ResizeAlign;
[XmlElement("Style")] public EStyle FontStyle; [XmlElement("Style")]
[XmlElement("Font")] public string FontFamily; public EStyle FontStyle;
[XmlElement("Font")]
public string FontFamily;
public string Text; public string Text;
public SReflection? Reflection; public SReflection? Reflection;
} }