Merge pull request #10 from AbletonAppDev/fix-ABLLinkForceBeatAtTime-…

…linking Fix ABLLinkForceBeatAtTime liker error
Ableton · Jun 28, 2016 · 146d51e · 146d51e
2 parents 815d9d1 + 42203e8
commit 146d51e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/LinkHut/LinkHut/AudioEngine.m b/LinkHut/LinkHut/AudioEngine.m
@@ -104,7 +104,7 @@ static void renderMetronomeIntoBuffer(
         const UInt64 hostTime = beginHostTime + llround(i * hostTicksPerSample);
         // Only make sound for positive beat magnitudes. Negative beat
         // magnitudes are count-in beats.
-        if (ABLLinkBeatTimeAtHostTime(timeline, hostTime, quantum) >= 0.) {
+        if (ABLLinkBeatAtTime(timeline, hostTime, quantum) >= 0.) {
             // Get the phase of this sample. The phase is a beat value in
             // the range [0, quantum).
             const Float64 phase = ABLLinkPhaseAtTime(timeline, hostTime, quantum);
@@ -239,7 +239,7 @@ - (void)setBpm:(Float64)bpm {
 }
 
 - (Float64)beatTime {
-    return ABLLinkBeatTimeAtHostTime(
+    return ABLLinkBeatAtTime(
       ABLLinkCaptureAppTimeline(_linkData.ablLink),
       mach_absolute_time(),
       self.quantum);

diff --git a/LinkKit/ABLLink.h b/LinkKit/ABLLink.h
@@ -209,24 +209,23 @@ extern "C"
    *  unique to this Link instance, but its phase with respect to
    *  the provided quantum is shared among all session
    *  peers. For non-negative beat values, the following
-   *  property holds: fmod(ABLLinkBeatTimeAtHostTime(tl, ht, q), q) ==
+   *  property holds: fmod(ABLLinkBeatAtTime(tl, ht, q), q) ==
    *  ABLLinkPhaseAtTime(tl, ht, q).
    */
-  double ABLLinkBeatTimeAtHostTime(
+  double ABLLinkBeatAtTime(
     ABLLinkTimelineRef,
     uint64_t hostTimeAtOutput,
     double quantum);
 
   /*! @brief Get the host time at which the sound corresponding to the
    *  given beat time and quantum reaches the device's audio output.
    *
-   *  @discussion: The inverse of ABLLinkBeatTimeAtHostTime, assuming
+   *  @discussion: The inverse of ABLLinkBeatAtTime, assuming
    *  a constant tempo.
    *
-   *  ABLLinkBeatTimeAtHostTime(tl,
-   *    ABLLinkHostTimeAtBeatTime(tl, b, q), q) == b.
+   *  ABLLinkBeatAtTime(tl, ABLLinkTimeAtBeat(tl, b, q), q) == b.
    */
-  uint64_t ABLLinkHostTimeAtBeatTime(
+  uint64_t ABLLinkTimeAtBeat(
     ABLLinkTimelineRef,
     double beatTime,
     double quantum);

diff --git a/LinkKit/ABLLink.mm b/LinkKit/ABLLink.mm
@@ -171,7 +171,7 @@ void ABLLinkSetTempo(
     timeline->impl.setTempo(bpm, micros);
   }
 
-  double ABLLinkBeatTimeAtHostTime(
+  double ABLLinkBeatAtTime(
     ABLLinkTimelineRef timeline,
     const uint64_t hostTime,
     const double quantum)
@@ -189,7 +189,7 @@ void ABLLinkSetTempo(
     return timeline->impl.phaseAtTime(micros, quantum);
   }
 
-  uint64_t ABLLinkHostTimeAtBeatTime(
+  uint64_t ABLLinkTimeAtBeat(
     ABLLinkTimelineRef timeline,
     const double beatTime,
     const double quantum)
@@ -208,7 +208,7 @@ void ABLLinkRequestBeatAtTime(
     timeline->impl.requestBeatAtTime(beatTime, micros, quantum);
   }
 
-  void ABLLinkForceBeatTime(
+  void ABLLinkForceBeatAtTime(
     ABLLinkTimelineRef timeline,
     const double beatTime,
     const std::uint64_t hostTime,