Merge remote-tracking branch 'upstream/develop' into 6-player

Vocaluxe/Base/CGame.cs

@@ -244,6 +244,11 @@ namespace Vocaluxe.Base
             _MidBeatD = -0.5f + GetBeatFromTime(Time, song.BPM, song.Gap + CConfig.MicDelay/1000f);
             _CurrentBeatD = (int)Math.Floor(_MidBeatD);
 
+            for (int p = 0; p < _NumPlayer; p++)
+            {
+                CSound.AnalyzeBuffer(p);
+            }
+
             if (_OldBeatD == _CurrentBeatD)
                 return;
 
@@ -300,7 +305,6 @@ namespace Vocaluxe.Base
                                 }
                             }
 
-                            CSound.AnalyzeBuffer(p);
                             if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
                             {
                                 int Tone = notes[Note].Tone;

Vocaluxe/Base/CSettings.cs

@@ -44,10 +44,10 @@ namespace Vocaluxe.Base
 
         public const int iVersionMajor = 0;
         public const int iVersionMinor = 2;      // milestones
-        public const int iVersionSub = 0;        // steps
+        public const int iVersionSub = 0;        // patches
         public const ERevision VersionRevision = ERevision.Alpha;
 
-        public const int iBuild = 61;             // Increase on every published version! Never Reset!
+        public const int iBuild = 62;             // Increase on every published version! Never Reset!
 
         public const int iDatabaseHighscoreVersion = 1;
         public const int iDatabaseCoverVersion = 1;

Vocaluxe/Base/CSound.cs

@@ -297,26 +297,53 @@ namespace Vocaluxe.Base
 
         public int ToneAbs
         {
-            get { return _ToneAbs; }
+            get 
+            {
+                lock (_AnalysisBufferLock)
+                {
+                    return _ToneAbs; 
+                } 
+            }
         }
 
         public int Tone
         {
-            get { return _Tone; }
-            set { _Tone = value; }
+            get
+            {
+                lock (_AnalysisBufferLock)
+                {
+                    return _Tone;
+                }
+            }
+            set
+            {
+                lock (_AnalysisBufferLock)
+                {
+                    _Tone = value;
+                }
+            }
         }
 
         public float MaxVolume
         {
             get
             {
-                return (float)_MaxVolume;
+                lock (_AnalysisBufferLock)
+                {
+                    return (float)_MaxVolume;
+                }
             }
         }
 
         public bool ToneValid
         {
-            get { return _ToneValid; }
+            get
+            {
+                lock (_AnalysisBufferLock)
+                {
+                    return _ToneValid;
+                }
+            }
         }
 
         public CBuffer()
@@ -415,7 +442,7 @@ namespace Vocaluxe.Base
                             _MaxVolume = Volume;
                     }
 
-                    if (_MaxVolume >= 0.2f)
+                    if (_MaxVolume >= 0.05f)
                     {
                         // analyse the current voice pitch
                         AnalyzeByAutocorrelation();

Vocaluxe/Menu/SingNotes/CSingNotes.cs

@@ -400,7 +400,9 @@ namespace Vocaluxe.Menu.SingNotes
 
                     if (note.EndBeat >= CGame.ActBeatD && note.Hit && note.NoteType == ENoteType.Golden)
                     {
-                        AddFlare(rect, n);
+                        SRectF re = new SRectF(rect);
+                        re.W = (CGame.MidBeatD - note.StartBeat) / beats * w;
+                        AddFlare(re, n);
                     }
 
                     if (note.Perfect && note.EndBeat < CGame.ActBeatD)