s/TimePos/TimePosition/

distrho/DistrhoPlugin.hpp

@@ -443,7 +443,7 @@ public:
       You can call this during other times, but the returned position is not guaranteed to be in sync.
       @note: TimePos is not supported in LADSPA and DSSI plugin formats.
     */
-    const TimePos& d_getTimePos() const noexcept;
+    const TimePosition& d_getTimePosition() const noexcept;
 #endif
 
 #if DISTRHO_PLUGIN_WANT_LATENCY

distrho/src/DistrhoPlugin.cpp

@@ -82,9 +82,9 @@ double Plugin::d_getSampleRate() const noexcept
 }
 
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-const TimePos& Plugin::d_getTimePos() const noexcept
+const TimePosition& Plugin::d_getTimePosition() const noexcept
 {
-    return pData->timePos;
+    return pData->timePosition;
 }
 #endif
 

distrho/src/DistrhoPluginInternal.hpp

@@ -56,7 +56,7 @@ struct Plugin::PrivateData {
 #endif
 
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-    TimePos timePos;
+    TimePosition timePosition;
 #endif
 
     uint32_t bufferSize;
@@ -330,11 +330,11 @@ public:
 #endif
 
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-    void setTimePos(const TimePos& timePos) noexcept
+    void setTimePosition(const TimePosition& timePosition) noexcept
     {
         DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,);
 
-        std::memcpy(&fData->timePos, &timePos, sizeof(TimePos));
+        std::memcpy(&fData->timePosition, &timePosition, sizeof(TimePosition));
     }
 #endif
 

distrho/src/DistrhoPluginJack.cpp

@@ -199,40 +199,40 @@ protected:
 
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
         jack_position_t pos;
-        fTimePos.playing = (jack_transport_query(fClient, &pos) == JackTransportRolling);
+        fTimePosition.playing = (jack_transport_query(fClient, &pos) == JackTransportRolling);
 
         if (pos.unique_1 == pos.unique_2)
         {
             if (pos.valid & JackTransportPosition)
-                fTimePos.frame = pos.frame;
+                fTimePosition.frame = pos.frame;
             else
-                fTimePos.frame = 0;
+                fTimePosition.frame = 0;
 
             if (pos.valid & JackTransportBBT)
             {
-                fTimePos.bbt.valid = true;
+                fTimePosition.bbt.valid = true;
 
-                fTimePos.bbt.bar  = pos.bar;
-                fTimePos.bbt.beat = pos.beat;
-                fTimePos.bbt.tick = pos.tick;
-                fTimePos.bbt.barStartTick = pos.bar_start_tick;
+                fTimePosition.bbt.bar  = pos.bar;
+                fTimePosition.bbt.beat = pos.beat;
+                fTimePosition.bbt.tick = pos.tick;
+                fTimePosition.bbt.barStartTick = pos.bar_start_tick;
 
-                fTimePos.bbt.beatsPerBar = pos.beats_per_bar;
-                fTimePos.bbt.beatType    = pos.beat_type;
+                fTimePosition.bbt.beatsPerBar = pos.beats_per_bar;
+                fTimePosition.bbt.beatType    = pos.beat_type;
 
-                fTimePos.bbt.ticksPerBeat   = pos.ticks_per_beat;
-                fTimePos.bbt.beatsPerMinute = pos.beats_per_minute;
+                fTimePosition.bbt.ticksPerBeat   = pos.ticks_per_beat;
+                fTimePosition.bbt.beatsPerMinute = pos.beats_per_minute;
             }
             else
-                fTimePos.bbt.valid = false;
+                fTimePosition.bbt.valid = false;
         }
         else
         {
-            fTimePos.bbt.valid = false;
-            fTimePos.frame = 0;
+            fTimePosition.bbt.valid = false;
+            fTimePosition.frame = 0;
         }
 
-        fPlugin.setTimePos(fTimePos);
+        fPlugin.setTimePosition(fTimePosition);
 #endif
 
 #if DISTRHO_PLUGIN_IS_SYNTH
@@ -316,7 +316,7 @@ private:
     jack_port_t* fPortMidiIn;
 #endif
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-    TimePos fTimePos;
+    TimePosition fTimePosition;
 #endif
 
     // Temporary data

distrho/src/DistrhoPluginLV2.cpp

@@ -317,13 +317,13 @@ public:
                 if (bar != nullptr)
                 {
                      if (bar->type == fURIDs.atomDouble)
-                        fTimePos.bbt.bar = ((LV2_Atom_Double*)bar)->body + 1.0f;
+                        fTimePosition.bbt.bar = ((LV2_Atom_Double*)bar)->body + 1.0f;
                     else if (bar->type == fURIDs.atomFloat)
-                        fTimePos.bbt.bar = ((LV2_Atom_Float*)bar)->body + 1.0f;
+                        fTimePosition.bbt.bar = ((LV2_Atom_Float*)bar)->body + 1.0f;
                     else if (bar->type == fURIDs.atomInt)
-                        fTimePos.bbt.bar = ((LV2_Atom_Int*)bar)->body + 1;
+                        fTimePosition.bbt.bar = ((LV2_Atom_Int*)bar)->body + 1;
                     else if (bar->type == fURIDs.atomLong)
-                        fTimePos.bbt.bar = ((LV2_Atom_Long*)bar)->body + 1;
+                        fTimePosition.bbt.bar = ((LV2_Atom_Long*)bar)->body + 1;
                 }
 
                 /*if (barBeat != nullptr && barBeat->type == fURIDs.atomFloat)
@@ -333,65 +333,65 @@ public:
                 if (beat != nullptr)
                 {
                      if (beat->type == fURIDs.atomDouble)
-                        fTimePos.bbt.beat = ((LV2_Atom_Double*)beat)->body + 1.0f;
+                        fTimePosition.bbt.beat = ((LV2_Atom_Double*)beat)->body + 1.0f;
                     else if (beat->type == fURIDs.atomFloat)
-                        fTimePos.bbt.beat = ((LV2_Atom_Float*)beat)->body + 1.0f;
+                        fTimePosition.bbt.beat = ((LV2_Atom_Float*)beat)->body + 1.0f;
                     else if (beat->type == fURIDs.atomInt)
-                        fTimePos.bbt.beat = ((LV2_Atom_Int*)beat)->body + 1;
+                        fTimePosition.bbt.beat = ((LV2_Atom_Int*)beat)->body + 1;
                     else if (beat->type == fURIDs.atomLong)
-                        fTimePos.bbt.beat = ((LV2_Atom_Long*)beat)->body + 1;
+                        fTimePosition.bbt.beat = ((LV2_Atom_Long*)beat)->body + 1;
                 }
 
                 if (beatUnit != nullptr)
                 {
                     if (beatUnit->type == fURIDs.atomDouble)
-                        fTimePos.bbt.beatType = ((LV2_Atom_Double*)beatUnit)->body;
+                        fTimePosition.bbt.beatType = ((LV2_Atom_Double*)beatUnit)->body;
                     else if (beatUnit->type == fURIDs.atomFloat)
-                        fTimePos.bbt.beatType = ((LV2_Atom_Float*)beatUnit)->body;
+                        fTimePosition.bbt.beatType = ((LV2_Atom_Float*)beatUnit)->body;
                     else if (beatUnit->type == fURIDs.atomInt)
-                        fTimePos.bbt.beatType = ((LV2_Atom_Int*)beatUnit)->body;
+                        fTimePosition.bbt.beatType = ((LV2_Atom_Int*)beatUnit)->body;
                     else if (beatUnit->type == fURIDs.atomLong)
-                        fTimePos.bbt.beatType = ((LV2_Atom_Long*)beatUnit)->body;
+                        fTimePosition.bbt.beatType = ((LV2_Atom_Long*)beatUnit)->body;
                 }
 
                 if (beatsPerBar != nullptr)
                 {
                     if (beatsPerBar->type == fURIDs.atomDouble)
-                        fTimePos.bbt.beatsPerBar = ((LV2_Atom_Double*)beatsPerBar)->body;
+                        fTimePosition.bbt.beatsPerBar = ((LV2_Atom_Double*)beatsPerBar)->body;
                     else if (beatsPerBar->type == fURIDs.atomFloat)
-                        fTimePos.bbt.beatsPerBar = ((LV2_Atom_Float*)beatsPerBar)->body;
+                        fTimePosition.bbt.beatsPerBar = ((LV2_Atom_Float*)beatsPerBar)->body;
                     else if (beatsPerBar->type == fURIDs.atomInt)
-                        fTimePos.bbt.beatsPerBar = ((LV2_Atom_Int*)beatsPerBar)->body;
+                        fTimePosition.bbt.beatsPerBar = ((LV2_Atom_Int*)beatsPerBar)->body;
                     else if (beatsPerBar->type == fURIDs.atomLong)
-                        fTimePos.bbt.beatsPerBar = ((LV2_Atom_Long*)beatsPerBar)->body;
+                        fTimePosition.bbt.beatsPerBar = ((LV2_Atom_Long*)beatsPerBar)->body;
                 }
 
                 if (beatsPerMinute != nullptr)
                 {
                     if (beatsPerMinute->type == fURIDs.atomDouble)
-                        fTimePos.bbt.beatsPerMinute = ((LV2_Atom_Double*)beatsPerMinute)->body;
+                        fTimePosition.bbt.beatsPerMinute = ((LV2_Atom_Double*)beatsPerMinute)->body;
                     else if (beatsPerMinute->type == fURIDs.atomFloat)
-                        fTimePos.bbt.beatsPerMinute = ((LV2_Atom_Float*)beatsPerMinute)->body;
+                        fTimePosition.bbt.beatsPerMinute = ((LV2_Atom_Float*)beatsPerMinute)->body;
                     else if (beatsPerMinute->type == fURIDs.atomInt)
-                        fTimePos.bbt.beatsPerMinute = ((LV2_Atom_Int*)beatsPerMinute)->body;
+                        fTimePosition.bbt.beatsPerMinute = ((LV2_Atom_Int*)beatsPerMinute)->body;
                     else if (beatsPerMinute->type == fURIDs.atomLong)
-                        fTimePos.bbt.beatsPerMinute = ((LV2_Atom_Long*)beatsPerMinute)->body;
+                        fTimePosition.bbt.beatsPerMinute = ((LV2_Atom_Long*)beatsPerMinute)->body;
                 }
 
                 if (frame != nullptr && frame->type == fURIDs.atomLong)
                 {
-                    fTimePos.frame = ((LV2_Atom_Long*)frame)->body;
+                    fTimePosition.frame = ((LV2_Atom_Long*)frame)->body;
                     needsFrameIncrement = false;
                 }
 
                 if (speed != nullptr && speed->type == fURIDs.atomFloat)
                 {
                     fLastTimeSpeed = ((LV2_Atom_Float*)speed)->body;
-                    fTimePos.playing = (fLastTimeSpeed == 1.0f);
+                    fTimePosition.playing = (fLastTimeSpeed == 1.0f);
                 }
 
-                if ((! fTimePos.bbt.valid) && beatsPerMinute != nullptr && beatsPerBar != nullptr && beatUnit != nullptr)
-                    fTimePos.bbt.valid = true;
+                if ((! fTimePosition.bbt.valid) && beatsPerMinute != nullptr && beatsPerBar != nullptr && beatUnit != nullptr)
+                    fTimePosition.bbt.valid = true;
 
                 continue;
             }
@@ -421,8 +421,8 @@ public:
 
 # if DISTRHO_PLUGIN_WANT_TIMEPOS
         if (needsFrameIncrement && fLastTimeSpeed != 0.0f)
-            fTimePos.frame += fLastTimeSpeed*sampleCount;
-        fPlugin.setTimePos(fTimePos);
+            fTimePosition.frame += fLastTimeSpeed*sampleCount;
+        fPlugin.setTimePosition(fTimePosition);
 # endif
 
 #if DISTRHO_PLUGIN_IS_SYNTH
@@ -686,8 +686,8 @@ private:
     MidiEvent fMidiEvents[kMaxMidiEvents];
 #endif
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-    TimePos fTimePos;
-    float   fLastTimeSpeed;
+    TimePosition fTimePosition;
+    float        fLastTimeSpeed;
 #endif
 
     // LV2 URIDs

distrho/src/DistrhoPluginVST.cpp

@@ -644,21 +644,21 @@ public:
 
         if (const VstTimeInfo* const vstTimeInfo = (const VstTimeInfo*)fAudioMaster(fEffect, audioMasterGetTime, 0, kWantVstTimeFlags, nullptr, 0.0f))
         {
-            fTimePos.playing = (vstTimeInfo->flags & kVstTransportPlaying);
-            fTimePos.frame   = vstTimeInfo->samplePos;
-            fTimePos.bbt.valid = ((vstTimeInfo->flags & kVstTempoValid) != 0 || (vstTimeInfo->flags & kVstTimeSigValid) != 0);
+            fTimePosition.playing = (vstTimeInfo->flags & kVstTransportPlaying);
+            fTimePosition.frame   = vstTimeInfo->samplePos;
+            fTimePosition.bbt.valid = ((vstTimeInfo->flags & kVstTempoValid) != 0 || (vstTimeInfo->flags & kVstTimeSigValid) != 0);
 
             if (vstTimeInfo->flags & kVstTempoValid)
             {
-                fTimePos.bbt.beatsPerMinute = vstTimeInfo->tempo;
+                fTimePosition.bbt.beatsPerMinute = vstTimeInfo->tempo;
             }
             if (vstTimeInfo->flags & kVstTimeSigValid)
             {
-                fTimePos.bbt.beatsPerBar = vstTimeInfo->timeSigNumerator;
-                fTimePos.bbt.beatType    = vstTimeInfo->timeSigDenominator;
+                fTimePosition.bbt.beatsPerBar = vstTimeInfo->timeSigNumerator;
+                fTimePosition.bbt.beatType    = vstTimeInfo->timeSigDenominator;
             }
 
-            fPlugin.setTimePos(fTimePos);
+            fPlugin.setTimePosition(fTimePosition);
         }
 #endif
 
@@ -704,7 +704,7 @@ private:
     MidiEvent fMidiEvents[kMaxMidiEvents];
 #endif
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
-    TimePos fTimePos;
+    TimePosition fTimePosition;
 #endif
 
     // UI stuff