Merge branch 'develop' into feature/642-read-tags
This commit is contained in:
84 files changed
+1000
-131
No files matched your search
@@ -82,6 +82,20 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
|
||||
public abstract int PointsForBeat { get; }
|
||||
|
||||
public bool IsRapNote
|
||||
{
|
||||
get { return IsNoteType(ENoteType.Rap, ENoteType.RapGolden); }
|
||||
}
|
||||
|
||||
public bool IsGoldenNote
|
||||
{
|
||||
get { return IsNoteType(ENoteType.Golden, ENoteType.RapGolden); }
|
||||
}
|
||||
#endregion Properties
|
||||
|
||||
#region Methods
|
||||
public abstract bool IsNoteType(params ENoteType[] noteTypes);
|
||||
#endregion Methods
|
||||
}
|
||||
}
|
||||
@@ -165,6 +165,7 @@ namespace VocaluxeLib.Songs
|
||||
{
|
||||
get { return Notes.VoiceCount > 1; }
|
||||
}
|
||||
public bool IsRap = false;
|
||||
|
||||
public readonly List<string> Editions = new List<string>();
|
||||
public readonly List<string> Genres = new List<string>();
|
||||
|
||||
@@ -576,9 +576,9 @@ namespace VocaluxeLib.Songs
|
||||
break;
|
||||
case ':':
|
||||
case '*':
|
||||
case 'R':
|
||||
case 'G':
|
||||
case 'F':
|
||||
case 'R': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
|
||||
case 'G': // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
|
||||
string[] noteData = line.Split(splitChars, 4);
|
||||
if (noteData.Length < 4)
|
||||
{
|
||||
@@ -628,6 +628,16 @@ namespace VocaluxeLib.Songs
|
||||
noteType = ENoteType.Golden;
|
||||
else if (tag.Equals('F') || tag.Equals('R') || tag.Equals('G')) // Read R (RAP) and G (Golden RAP) notes as Freestyle notes currently. Final implementation needed!
|
||||
noteType = ENoteType.Freestyle;
|
||||
else if (tag.Equals('R'))
|
||||
{
|
||||
noteType = ENoteType.Rap;
|
||||
_Song.IsRap = true;
|
||||
}
|
||||
else if (tag.Equals('G'))
|
||||
{
|
||||
noteType = ENoteType.RapGolden;
|
||||
_Song.IsRap = true;
|
||||
}
|
||||
else
|
||||
noteType = ENoteType.Normal;
|
||||
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
||||
#endregion
|
||||
|
||||
using System.Linq;
|
||||
|
||||
namespace VocaluxeLib.Songs
|
||||
{
|
||||
/// <summary>
|
||||
@@ -37,6 +39,13 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
#endregion Constructors
|
||||
|
||||
#region Methods
|
||||
public override bool IsNoteType(params ENoteType[] noteTypes)
|
||||
{
|
||||
return noteTypes.Contains(Type);
|
||||
}
|
||||
#endregion Method
|
||||
|
||||
#region Properties
|
||||
public ENoteType Type { get; set; }
|
||||
|
||||
@@ -49,8 +58,10 @@ namespace VocaluxeLib.Songs
|
||||
switch (Type)
|
||||
{
|
||||
case ENoteType.Normal:
|
||||
case ENoteType.Rap:
|
||||
return 1;
|
||||
case ENoteType.Golden:
|
||||
case ENoteType.RapGolden:
|
||||
return 2;
|
||||
case ENoteType.Freestyle:
|
||||
return 0;
|
||||
|
||||
@@ -188,6 +188,12 @@ namespace VocaluxeLib.Songs
|
||||
case ENoteType.Freestyle:
|
||||
tag = "F";
|
||||
break;
|
||||
case ENoteType.Rap:
|
||||
tag = "R";
|
||||
break;
|
||||
case ENoteType.RapGolden:
|
||||
tag = "G";
|
||||
break;
|
||||
default:
|
||||
throw new NotImplementedException("Note type " + note.Type);
|
||||
}
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
||||
#endregion
|
||||
|
||||
using System.Linq;
|
||||
|
||||
namespace VocaluxeLib.Songs
|
||||
{
|
||||
/// <summary>
|
||||
@@ -74,6 +76,10 @@ namespace VocaluxeLib.Songs
|
||||
|
||||
Perfect = result;
|
||||
}
|
||||
public override bool IsNoteType(params ENoteType[] noteTypes)
|
||||
{
|
||||
return HitNote != null && noteTypes.Contains(HitNote.Type);
|
||||
}
|
||||
#endregion Methods
|
||||
|
||||
public override int PointsForBeat
|
||||
|
||||
Reference in new issue
Block a user