Issue #99: Made MIKMIDITrack's offset property use an instance variab…

…le in addition to using MUsicTrack property.
mixedinkey-opensource · Mar 8, 2016 · f05760c · f05760c
1 parent 44b2b58
commit f05760c
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/Source/MIKMIDITrack.m b/Source/MIKMIDITrack.m
@@ -616,19 +616,31 @@ - (NSInteger)trackNumber
 	return (NSInteger)trackNumber;
 }
 
+@synthesize offset = _offset;
+
 - (MusicTimeStamp)offset
 {
-    MusicTimeStamp offset = 0;
-    UInt32 offsetLength = sizeof(offset);
-    OSStatus err = MusicTrackGetProperty(self.musicTrack, kSequenceTrackProperty_OffsetTime, &offset, &offsetLength);
-    if (err) NSLog(@"MusicTrackGetProperty() failed with error %@ in %s.", @(err), __PRETTY_FUNCTION__);
-    return offset;
+	if (_offset != 0) return _offset;
+
+	if (self.musicTrack) {
+		MusicTimeStamp offset = 0;
+		UInt32 offsetLength = sizeof(offset);
+		OSStatus err = MusicTrackGetProperty(self.musicTrack, kSequenceTrackProperty_OffsetTime, &offset, &offsetLength);
+		if (err) NSLog(@"MusicTrackGetProperty() failed with error %@ in %s.", @(err), __PRETTY_FUNCTION__);
+		return offset;
+	} else {
+		return 0;
+	}
 }
 
 - (void)setOffset:(MusicTimeStamp)offset
 {
-    OSStatus err = MusicTrackSetProperty(self.musicTrack, kSequenceTrackProperty_OffsetTime, &offset, sizeof(offset));
-    if (err) NSLog(@"MusicTrackSetProperty() failed with error %@ in %s.", @(err), __PRETTY_FUNCTION__);
+	_offset = offset;
+
+	if (self.musicTrack) {
+		OSStatus err = MusicTrackSetProperty(self.musicTrack, kSequenceTrackProperty_OffsetTime, &offset, sizeof(offset));
+		if (err) NSLog(@"MusicTrackSetProperty() failed with error %@ in %s.", @(err), __PRETTY_FUNCTION__);
+	}
 }
 
 @synthesize muted = _muted;