cherry pick audio-player e55a860

audio player issue 48

src/MusicalScore/MusicParts/MusicPartManager.ts

@@ -55,7 +55,7 @@ export class MusicPartManager /*implements ISelectionListener*/ {
     }
     public getIterator(start?: Fraction): MusicPartManagerIterator {
         if (!start) {
-          return new MusicPartManagerIterator(this.musicSheet, this.musicSheet.SelectionStart, this.musicSheet.SelectionEnd);
+            return new MusicPartManagerIterator(this.musicSheet, this.musicSheet.SelectionStart, this.musicSheet.SelectionEnd);
         }
         return new MusicPartManagerIterator(this.musicSheet, start, undefined);
     }

src/MusicalScore/MusicParts/MusicPartManagerIterator.ts

@@ -72,8 +72,10 @@ export class MusicPartManagerIterator {
     private frontReached: boolean = false;
     public currentTimeStamp: Fraction = new Fraction(0, 1);
     private currentEnrolledMeasureTimestamp: Fraction = new Fraction(0, 1);
+    private currentRelativeInMeasureTimestamp: Fraction = new Fraction(0, 1);
     private currentVerticalContainerInMeasureTimestamp: Fraction = new Fraction(0, 1);
     private jumpResponsibleRepetition: Repetition = undefined;
+    private currentBpm: number;
     private activeDynamicExpressions: AbstractExpression[] = [];
     private activeTempoExpression: MultiTempoExpression;
 
@@ -101,6 +103,9 @@ export class MusicPartManagerIterator {
         }
         return 0;
     }
+    public get CurrentBpm(): number {
+        return this.currentBpm;
+    }
     public get CurrentVoiceEntries(): VoiceEntry[] {
         return this.currentVoiceEntries;
     }
@@ -113,6 +118,9 @@ export class MusicPartManagerIterator {
     public get CurrentSourceTimestamp(): Fraction {
         return this.currentTimeStamp;
     }
+    public get CurrentRelativeInMeasureTimestamp(): Fraction {
+        return this.currentRelativeInMeasureTimestamp;
+    }
     public get JumpOccurred(): boolean {
         return this.backJumpOccurred || this.forwardJumpOccurred;
     }

src/MusicalScore/MusicSheet.ts

@@ -436,17 +436,17 @@ export class MusicSheet /*implements ISettableMusicSheet, IComparable<MusicSheet
     //    }
     //
     //}
-    //public GetExpressionsStartTempoInBPM(): number {
-    //    if (this.TimestampSortedTempoExpressionsList.length > 0) {
-    //        let me: MultiTempoExpression = this.TimestampSortedTempoExpressionsList[0];
-    //        if (me.InstantaneousTempo) {
-    //            return me.InstantaneousTempo.TempoInBpm;
-    //        } else if (me.ContinuousTempo) {
-    //            return me.ContinuousTempo.StartTempo;
-    //        }
-    //    }
-    //    return this.UserStartTempoInBPM;
-    //}
+    public getExpressionsStartTempoInBPM(): number {
+        if (this.TimestampSortedTempoExpressionsList.length > 0) {
+            const me: MultiTempoExpression = this.TimestampSortedTempoExpressionsList[0];
+            if (me.InstantaneousTempo) {
+                return me.InstantaneousTempo.TempoInBpm;
+            } else if (me.ContinuousTempo) {
+                return me.ContinuousTempo.StartTempo;
+            }
+        }
+        return this.userStartTempoInBPM;
+    }
     public get Errors(): { [n: number]: string[]; } {
         return this.musicSheetErrors.measureErrors;
     }