From d208f9d7b959a2e73977d7042f9b097b49123c72 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sun, 19 Oct 2014 18:42:38 +0200 Subject: [PATCH] Reformatting Also adds license headers --- Vocaluxe/Base/CBackgroundMusic.cs | 2 +- Vocaluxe/Base/CVideoPlayer.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CBaseSkin.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CBaseTheme.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CPartySkin.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CPartyTheme.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CSkin.cs | 19 +++++++- Vocaluxe/Base/ThemeSystem/CTheme.cs | 19 +++++++- Vocaluxe/Lib/Draw/CDrawBase.cs | 19 +++++++- Vocaluxe/Lib/Draw/CDrawBaseWindows.cs | 17 +++++++ Vocaluxe/Lib/Draw/CTextureBase.cs | 19 +++++++- Vocaluxe/Lib/Sound/Playback/IPlayback.cs | 1 - Vocaluxe/Lib/Sound/Record/CRecordBase.cs | 19 +++++++- .../Sound/Record/PitchTracker/CAnalyzer.cs | 23 +++++++-- .../Record/PitchTracker/CPitchTrackerTest.cs | 19 +++++++- .../Lib/Sound/Record/PitchTracker/CPtAKF.cs | 19 +++++++- .../Lib/Sound/Record/PitchTracker/CPtDyWa.cs | 21 ++++++++- .../Lib/Sound/Record/PitchTracker/CPtSharp.cs | 23 +++++++-- .../Record/PitchTracker/IPitchTracker.cs | 45 +++++++++++++----- VocaluxeLib/CEncoding.cs | 19 +++++++- VocaluxeLib/CFont.cs | 19 +++++++- VocaluxeLib/CVideoStream.cs | 19 +++++++- VocaluxeLib/Menu/CMenuElementBase.cs | 19 +++++++- VocaluxeLib/Menu/CParticleEffect.cs | 19 +++++++- VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 2 +- VocaluxeLib/Menu/SongMenu/ISongMenu.cs | 2 +- VocaluxeLib/Utils/CWavFile.cs | 23 +++++++-- VocaluxeLib/Utils/Player/CSongPlayer.cs | 19 +++++++- VocaluxeLib/Utils/Player/CSoundPlayer.cs | 47 ++++++++++++++----- VocaluxeLib/Xml/CXmlDeserializer.cs | 19 +++++++- VocaluxeLib/Xml/CXmlReaderBase.cs | 19 +++++++- 31 files changed, 525 insertions(+), 61 deletions(-) diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs index f8685ff9..6a854373 100644 --- a/Vocaluxe/Base/CBackgroundMusic.cs +++ b/Vocaluxe/Base/CBackgroundMusic.cs @@ -193,7 +193,7 @@ namespace Vocaluxe.Base if (_PlaysPreview) _PreviewPlayer.Play(); - else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON) + else if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON) { if (_SongPlayer.SongLoaded) //Resume diff --git a/Vocaluxe/Base/CVideoPlayer.cs b/Vocaluxe/Base/CVideoPlayer.cs index 48316638..86e8537b 100644 --- a/Vocaluxe/Base/CVideoPlayer.cs +++ b/Vocaluxe/Base/CVideoPlayer.cs @@ -1,4 +1,21 @@ -using System.Diagnostics; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System.Diagnostics; using Vocaluxe.Base.ThemeSystem; using VocaluxeLib; diff --git a/Vocaluxe/Base/ThemeSystem/CBaseSkin.cs b/Vocaluxe/Base/ThemeSystem/CBaseSkin.cs index aab19f28..11aa0a10 100644 --- a/Vocaluxe/Base/ThemeSystem/CBaseSkin.cs +++ b/Vocaluxe/Base/ThemeSystem/CBaseSkin.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; namespace Vocaluxe.Base.ThemeSystem diff --git a/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs b/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs index 7a7d7609..de4172c1 100644 --- a/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs +++ b/Vocaluxe/Base/ThemeSystem/CBaseTheme.cs @@ -1,4 +1,21 @@ -using System.IO; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System.IO; using System.Linq; using Vocaluxe.Base.Fonts; using VocaluxeLib.Xml; diff --git a/Vocaluxe/Base/ThemeSystem/CPartySkin.cs b/Vocaluxe/Base/ThemeSystem/CPartySkin.cs index 9133c048..f76bb6b7 100644 --- a/Vocaluxe/Base/ThemeSystem/CPartySkin.cs +++ b/Vocaluxe/Base/ThemeSystem/CPartySkin.cs @@ -1,4 +1,21 @@ -using VocaluxeLib; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using VocaluxeLib; using VocaluxeLib.Draw; namespace Vocaluxe.Base.ThemeSystem diff --git a/Vocaluxe/Base/ThemeSystem/CPartyTheme.cs b/Vocaluxe/Base/ThemeSystem/CPartyTheme.cs index 45705469..b97d098c 100644 --- a/Vocaluxe/Base/ThemeSystem/CPartyTheme.cs +++ b/Vocaluxe/Base/ThemeSystem/CPartyTheme.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.IO; using System.Linq; using Vocaluxe.Base.Fonts; diff --git a/Vocaluxe/Base/ThemeSystem/CSkin.cs b/Vocaluxe/Base/ThemeSystem/CSkin.cs index 5cde7d92..7e161f4f 100644 --- a/Vocaluxe/Base/ThemeSystem/CSkin.cs +++ b/Vocaluxe/Base/ThemeSystem/CSkin.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/Vocaluxe/Base/ThemeSystem/CTheme.cs b/Vocaluxe/Base/ThemeSystem/CTheme.cs index 808a0524..be6e6156 100644 --- a/Vocaluxe/Base/ThemeSystem/CTheme.cs +++ b/Vocaluxe/Base/ThemeSystem/CTheme.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/Vocaluxe/Lib/Draw/CDrawBase.cs b/Vocaluxe/Lib/Draw/CDrawBase.cs index 3ce66020..b438b467 100644 --- a/Vocaluxe/Lib/Draw/CDrawBase.cs +++ b/Vocaluxe/Lib/Draw/CDrawBase.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Threading; using Vocaluxe.Base; using VocaluxeLib; diff --git a/Vocaluxe/Lib/Draw/CDrawBaseWindows.cs b/Vocaluxe/Lib/Draw/CDrawBaseWindows.cs index 894106bc..145ce1e7 100644 --- a/Vocaluxe/Lib/Draw/CDrawBaseWindows.cs +++ b/Vocaluxe/Lib/Draw/CDrawBaseWindows.cs @@ -1,3 +1,20 @@ +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + using System; using System.ComponentModel; using System.Diagnostics; diff --git a/Vocaluxe/Lib/Draw/CTextureBase.cs b/Vocaluxe/Lib/Draw/CTextureBase.cs index 385c1227..01c0dc86 100644 --- a/Vocaluxe/Lib/Draw/CTextureBase.cs +++ b/Vocaluxe/Lib/Draw/CTextureBase.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Drawing; namespace Vocaluxe.Lib.Draw diff --git a/Vocaluxe/Lib/Sound/Playback/IPlayback.cs b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs index a022d455..1a414037 100644 --- a/Vocaluxe/Lib/Sound/Playback/IPlayback.cs +++ b/Vocaluxe/Lib/Sound/Playback/IPlayback.cs @@ -19,7 +19,6 @@ using VocaluxeLib; namespace Vocaluxe.Lib.Sound.Playback { - interface IPlayback { bool Init(); diff --git a/Vocaluxe/Lib/Sound/Record/CRecordBase.cs b/Vocaluxe/Lib/Sound/Record/CRecordBase.cs index 62c67da7..dde798fe 100644 --- a/Vocaluxe/Lib/Sound/Record/CRecordBase.cs +++ b/Vocaluxe/Lib/Sound/Record/CRecordBase.cs @@ -1,4 +1,21 @@ -using System.Collections.Generic; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System.Collections.Generic; using System.Collections.ObjectModel; using Vocaluxe.Base; diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs index 2a50540f..546bdf95 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CAnalyzer.cs @@ -1,11 +1,28 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Runtime.InteropServices; namespace Vocaluxe.Lib.Sound.Record.PitchTracker { /// - /// Analyzer from Performous - /// Should be very reliable but needs some proof (artificial tests show some errors) + /// Analyzer from Performous + /// Should be very reliable but needs some proof (artificial tests show some errors) /// class CAnalyzer : CPitchTracker { diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs index 7ba4966b..7c727693 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPitchTrackerTest.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs index c47ff51f..351dac22 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtAKF.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Runtime.InteropServices; namespace Vocaluxe.Lib.Sound.Record.PitchTracker diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs index 2907f1c8..2f21ea0b 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtDyWa.cs @@ -1,10 +1,27 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Runtime.InteropServices; namespace Vocaluxe.Lib.Sound.Record.PitchTracker { /// - /// Pitchtracker (Pt) that uses a dynamic wavelet (DyWa) algorithm + /// Pitchtracker (Pt) that uses a dynamic wavelet (DyWa) algorithm /// class CPtDyWa : CPitchTracker { diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs index 9f73b0f2..53e7a26c 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/CPtSharp.cs @@ -1,10 +1,27 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; namespace Vocaluxe.Lib.Sound.Record.PitchTracker { /// - /// Pitchtracker (Pt) in C# that uses IIR filters for smoothing and an intelligent detection algorithm to reduce calculations - /// DO NOT USE in 32 Bit! Due to floating point errors the filter will raise all values to NAN (TODO: FIX it!) + /// Pitchtracker (Pt) in C# that uses IIR filters for smoothing and an intelligent detection algorithm to reduce calculations + /// DO NOT USE in 32 Bit! Due to floating point errors the filter will raise all values to NAN (TODO: FIX it!) /// class CPtSharp : CPitchTracker { diff --git a/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs b/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs index 94c4876f..15f95bea 100644 --- a/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs +++ b/Vocaluxe/Lib/Sound/Record/PitchTracker/IPitchTracker.cs @@ -1,11 +1,28 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Diagnostics; namespace Vocaluxe.Lib.Sound.Record.PitchTracker { /// - /// Base class/Interface for pitch detectors - /// Most likely some structures or system resources are used, hence it should be disposed if no longer needed + /// Base class/Interface for pitch detectors + /// Most likely some structures or system resources are used, hence it should be disposed if no longer needed /// abstract class CPitchTracker : IDisposable { @@ -26,8 +43,8 @@ namespace Vocaluxe.Lib.Sound.Record.PitchTracker } /// - /// Method to set weights if the algorithm does not provide anything that could simulate a visualizer. - /// Should be called with each valid detection + /// Method to set weights if the algorithm does not provide anything that could simulate a visualizer. + /// Should be called with each valid detection /// /// Current note /// Array of weights (Length = NumHalfTonesDef) @@ -43,30 +60,32 @@ namespace Vocaluxe.Lib.Sound.Record.PitchTracker } /// - /// Gets the number of half tones the algorithm provides weights for. - /// This may not be the number of half tones the algorithm detects! + /// Gets the number of half tones the algorithm provides weights for. + /// This may not be the number of half tones the algorithm detects! /// /// public abstract int GetNumHalfTones(); /// - /// The treshold for detecting silence - /// Value (0-1) for which everything below is considered silence + /// The treshold for detecting silence + /// Value (0-1) for which everything below is considered silence /// public abstract float VolumeTreshold { get; set; } /// - /// Recorded data. Has to be 16 bit short values. + /// Recorded data. Has to be 16 bit short values. /// /// 16bit short values of data public abstract void Input(byte[] data); /// - /// Returns the current note detected + /// Returns the current note detected /// /// Current maximum volume (0-1) - /// Array of NumHalfTones floats that gets filled with the current weights (0-1) where each value indicates how strong that tone is. - /// Only for basic visualization as it may not be accurate. + /// + /// Array of NumHalfTones floats that gets filled with the current weights (0-1) where each value indicates how strong that tone is. + /// Only for basic visualization as it may not be accurate. + /// /// Current note index (0 = C2, 12 = C3, ...) public abstract int GetNote(out float maxVolume, float[] weights); } diff --git a/VocaluxeLib/CEncoding.cs b/VocaluxeLib/CEncoding.cs index 7b763d5b..3afdfe49 100644 --- a/VocaluxeLib/CEncoding.cs +++ b/VocaluxeLib/CEncoding.cs @@ -1,4 +1,21 @@ -using System.Text; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System.Text; namespace VocaluxeLib { diff --git a/VocaluxeLib/CFont.cs b/VocaluxeLib/CFont.cs index 09182763..6ac3f1bf 100644 --- a/VocaluxeLib/CFont.cs +++ b/VocaluxeLib/CFont.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Xml.Serialization; diff --git a/VocaluxeLib/CVideoStream.cs b/VocaluxeLib/CVideoStream.cs index 662aa495..9618aa52 100644 --- a/VocaluxeLib/CVideoStream.cs +++ b/VocaluxeLib/CVideoStream.cs @@ -1,4 +1,21 @@ -using VocaluxeLib.Draw; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using VocaluxeLib.Draw; namespace VocaluxeLib { diff --git a/VocaluxeLib/Menu/CMenuElementBase.cs b/VocaluxeLib/Menu/CMenuElementBase.cs index dc30a38f..d295d3cf 100644 --- a/VocaluxeLib/Menu/CMenuElementBase.cs +++ b/VocaluxeLib/Menu/CMenuElementBase.cs @@ -1,4 +1,21 @@ -namespace VocaluxeLib.Menu +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +namespace VocaluxeLib.Menu { public abstract class CMenuElementBase { diff --git a/VocaluxeLib/Menu/CParticleEffect.cs b/VocaluxeLib/Menu/CParticleEffect.cs index e558785f..5f286f6d 100644 --- a/VocaluxeLib/Menu/CParticleEffect.cs +++ b/VocaluxeLib/Menu/CParticleEffect.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Diagnostics; using System.Xml.Serialization; diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index b7737401..faa39fa8 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -68,7 +68,7 @@ namespace VocaluxeLib.Menu.SingNotes [XmlArray("BarPositions")] public SBarPosition[] BarPos; } - public abstract class CSingNotes : CMenuElementBase, IMenuElement,IThemeable + public abstract class CSingNotes : CMenuElementBase, IMenuElement, IThemeable { private readonly int _PartyModeID; private SThemeSingBar _Theme; diff --git a/VocaluxeLib/Menu/SongMenu/ISongMenu.cs b/VocaluxeLib/Menu/SongMenu/ISongMenu.cs index e6bba9fe..7c688afc 100644 --- a/VocaluxeLib/Menu/SongMenu/ISongMenu.cs +++ b/VocaluxeLib/Menu/SongMenu/ISongMenu.cs @@ -19,7 +19,7 @@ using VocaluxeLib.PartyModes; namespace VocaluxeLib.Menu.SongMenu { - public interface ISongMenu : IMenuElement,IThemeable + public interface ISongMenu : IMenuElement, IThemeable { void Update(SScreenSongOptions songOptions); void OnShow(); diff --git a/VocaluxeLib/Utils/CWavFile.cs b/VocaluxeLib/Utils/CWavFile.cs index 9993ed24..35a83d2e 100644 --- a/VocaluxeLib/Utils/CWavFile.cs +++ b/VocaluxeLib/Utils/CWavFile.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Diagnostics; using System.IO; using System.Text; @@ -121,7 +138,7 @@ namespace VocaluxeLib.Utils } /// - /// Gets an array of numSamples samples per channel for the selected channel(s) + /// Gets an array of numSamples samples per channel for the selected channel(s) /// /// Samples per channel /// Channel for which to get the samples (0=all) @@ -151,7 +168,7 @@ namespace VocaluxeLib.Utils } /// - /// Gets an array of numSamples samples per channel for the selected channel(s) + /// Gets an array of numSamples samples per channel for the selected channel(s) /// /// Samples per channel /// Channel for which to get the samples (0=all) diff --git a/VocaluxeLib/Utils/Player/CSongPlayer.cs b/VocaluxeLib/Utils/Player/CSongPlayer.cs index f978fcd7..92a848a7 100644 --- a/VocaluxeLib/Utils/Player/CSongPlayer.cs +++ b/VocaluxeLib/Utils/Player/CSongPlayer.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.IO; using VocaluxeLib.Draw; using VocaluxeLib.Songs; diff --git a/VocaluxeLib/Utils/Player/CSoundPlayer.cs b/VocaluxeLib/Utils/Player/CSoundPlayer.cs index 4bbbd602..078ae91b 100644 --- a/VocaluxeLib/Utils/Player/CSoundPlayer.cs +++ b/VocaluxeLib/Utils/Player/CSoundPlayer.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -14,10 +31,10 @@ namespace VocaluxeLib.Utils.Player public float Volume { - set + set { _Volume = value; - _ApplyVolume(); + _ApplyVolume(); } get { return _Volume; } } @@ -25,13 +42,15 @@ namespace VocaluxeLib.Utils.Player public float Position { - set { - if(_StreamID == -1) + set + { + if (_StreamID == -1) return; _StartPosition = value; } - get { - if(_StreamID == -1) + get + { + if (_StreamID == -1) return -1; return CBase.Sound.GetPosition(_StreamID); } @@ -50,7 +69,10 @@ namespace VocaluxeLib.Utils.Player public bool RepeatSong; public bool IsPlaying { get; protected set; } - public bool IsFinished { get { return RepeatSong ? false : CBase.Sound.IsFinished(_StreamID); } } + public bool IsFinished + { + get { return RepeatSong ? false : CBase.Sound.IsFinished(_StreamID); } + } public CSoundPlayer(bool loop = false) { @@ -60,7 +82,7 @@ namespace VocaluxeLib.Utils.Player public CSoundPlayer(string file, bool loop = false, float position = 0f, bool autoplay = false) { _StreamID = CBase.Sound.Load(file, false, true); - if(position > 0f) + if (position > 0f) Position = position; Loop = loop; if (autoplay) @@ -96,7 +118,7 @@ namespace VocaluxeLib.Utils.Player if (_StreamID == -1) return; - if(IsPlaying) + if (IsPlaying) CBase.Sound.Fade(_StreamID, 0f, _FadeTime, EStreamAction.Pause); else { @@ -126,7 +148,7 @@ namespace VocaluxeLib.Utils.Player float timeToPlay; float len = CBase.Sound.GetLength(_StreamID); timeToPlay = (len > 0f) ? len - CBase.Sound.GetPosition(_StreamID) : _FadeTime + 1f; - + bool finished = CBase.Sound.IsFinished(_StreamID); if (timeToPlay <= _FadeTime || finished) { @@ -139,7 +161,6 @@ namespace VocaluxeLib.Utils.Player else Stop(); } - } private void _ApplyVolume() @@ -150,4 +171,4 @@ namespace VocaluxeLib.Utils.Player CBase.Sound.SetStreamVolume(_StreamID, Volume); } } -} +} \ No newline at end of file diff --git a/VocaluxeLib/Xml/CXmlDeserializer.cs b/VocaluxeLib/Xml/CXmlDeserializer.cs index b010943e..909305bd 100644 --- a/VocaluxeLib/Xml/CXmlDeserializer.cs +++ b/VocaluxeLib/Xml/CXmlDeserializer.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; diff --git a/VocaluxeLib/Xml/CXmlReaderBase.cs b/VocaluxeLib/Xml/CXmlReaderBase.cs index 152ecfad..739abd2f 100644 --- a/VocaluxeLib/Xml/CXmlReaderBase.cs +++ b/VocaluxeLib/Xml/CXmlReaderBase.cs @@ -1,4 +1,21 @@ -using System; +#region license +// This file is part of Vocaluxe. +// +// Vocaluxe 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 3 of the License, or +// (at your option) any later version. +// +// Vocaluxe 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 Vocaluxe. If not, see . +#endregion + +using System; namespace VocaluxeLib.Xml {