Update V1.8.2

Author: fiverecords

AppSettings.h

@@ -440,6 +440,37 @@ class TrackMap
         return entries.count(TrackMapEntry::makeKey(artist, title, dur)) > 0;
     }
 
+    /// Find by artist+title, ignoring duration.  Used as a last-resort fallback
+    /// when the caller's duration doesn't match the entry's saved duration.
+    const TrackMapEntry* findIgnoringDuration(const juce::String& artist,
+                                              const juce::String& title) const
+    {
+        auto base = TrackMapEntry::makeKey(artist, title, 0);  // key without duration
+        // Exact match (entry saved without duration)
+        auto it = entries.find(base);
+        if (it != entries.end()) return &it->second;
+        // Prefix match (entry saved with some duration: "base|NNN")
+        auto prefix = base + "|";
+        for (auto& [k, v] : entries)
+            if (k.size() > prefix.size() && k.substr(0, prefix.size()) == prefix)
+                return &v;
+        return nullptr;
+    }
+
+    /// Mutable version of findIgnoringDuration
+    TrackMapEntry* findIgnoringDuration(const juce::String& artist,
+                                        const juce::String& title)
+    {
+        auto base = TrackMapEntry::makeKey(artist, title, 0);
+        auto it = entries.find(base);
+        if (it != entries.end()) return &it->second;
+        auto prefix = base + "|";
+        for (auto& [k, v] : entries)
+            if (k.size() > prefix.size() && k.substr(0, prefix.size()) == prefix)
+                return &v;
+        return nullptr;
+    }
+
     //------------------------------------------------------------------
     // Mutation
     //------------------------------------------------------------------

Main.cpp

@@ -11,7 +11,7 @@ class SuperTimecodeConverterApplication : public juce::JUCEApplication
     SuperTimecodeConverterApplication() {}
 
     const juce::String getApplicationName() override    { return "Super Timecode Converter"; }
-    const juce::String getApplicationVersion() override { return "1.8.1"; }
+    const juce::String getApplicationVersion() override { return "1.8.2"; }
     bool moreThanOneInstanceAllowed() override           { return false; }
 
     void initialise(const juce::String&) override

MainComponent.cpp

@@ -6042,6 +6042,10 @@ void MainComponent::updateBpmMultButtonStates()
     {
         auto* entry = settings.trackMap.find(trackInfo.artist, trackInfo.title,
                                               trackInfo.durationSec);
+        if (!entry && trackInfo.durationSec > 0)
+            entry = settings.trackMap.find(trackInfo.artist, trackInfo.title, 0);
+        if (!entry)
+            entry = settings.trackMap.findIgnoringDuration(trackInfo.artist, trackInfo.title);
         if (entry != nullptr) map = entry->bpmMultiplier;
     }
 
@@ -6088,6 +6092,10 @@ void MainComponent::saveBpmMultToTrackMap(int clickedMult)
     if (info.title.isEmpty()) return;
 
     auto* entry = settings.trackMap.find(info.artist, info.title, info.durationSec);
+    if (!entry && info.durationSec > 0)
+        entry = settings.trackMap.find(info.artist, info.title, 0);
+    if (!entry)
+        entry = settings.trackMap.findIgnoringDuration(info.artist, info.title);
     int currentMapValue = (entry != nullptr) ? entry->bpmMultiplier : 0;
 
     // Double-click on 1x: clear saved value. Otherwise: save (no toggle).
@@ -6111,6 +6119,37 @@ void MainComponent::saveBpmMultToTrackMap(int clickedMult)
         newEntry.title   = info.title;
         newEntry.durationSec = info.durationSec;
         newEntry.bpmMultiplier = newValue;
+
+        // Auto-populate cue points from rekordbox if available
+        if (info.trackId != 0)
+        {
+            auto meta = sharedDbClient.getCachedMetadataByTrackId(info.trackId);
+            if (meta.isValid() && !meta.cueList.empty())
+            {
+                for (auto& rc : meta.cueList)
+                {
+                    if (rc.positionMs == 0) continue;
+                    CuePoint cp;
+                    cp.positionMs = rc.positionMs;
+                    auto letter = rc.hotCueLetter();
+                    if (letter.isNotEmpty())
+                        cp.name = letter;
+                    if (rc.comment.isNotEmpty())
+                        cp.name += cp.name.isNotEmpty()
+                            ? " " + rc.comment : rc.comment;
+                    if (cp.name.isEmpty())
+                    {
+                        if (rc.type == TrackMetadata::RekordboxCue::MemoryPoint)
+                            cp.name = "MEM";
+                        else if (rc.type == TrackMetadata::RekordboxCue::Loop)
+                            cp.name = "LOOP";
+                    }
+                    newEntry.cuePoints.push_back(std::move(cp));
+                }
+                newEntry.sortCuePoints();
+            }
+        }
+
         settings.trackMap.addOrUpdate(newEntry);
     }
     else

ProDJLinkView.h

@@ -308,6 +308,10 @@ class ProDJLinkViewComponent : public juce::Component,
 
         int dur = (int)ds.trackLenSec;
         auto* entry = trackMap.find(ds.artist, ds.title, dur);
+        if (!entry && dur > 0)
+            entry = trackMap.find(ds.artist, ds.title, 0);
+        if (!entry)
+            entry = trackMap.findIgnoringDuration(ds.artist, ds.title);
         int currentMapValue = (entry != nullptr) ? entry->bpmMultiplier : 0;
 
         // Double-click on 1x: clear saved value. Otherwise: save (no toggle).
@@ -330,6 +334,37 @@ class ProDJLinkViewComponent : public juce::Component,
             newEntry.title   = ds.title;
             newEntry.durationSec = dur;
             newEntry.bpmMultiplier = newValue;
+
+            // Auto-populate cue points from rekordbox if available
+            if (ds.trackId != 0)
+            {
+                auto meta = dbClient.getCachedMetadataByTrackId(ds.trackId);
+                if (meta.isValid() && !meta.cueList.empty())
+                {
+                    for (auto& rc : meta.cueList)
+                    {
+                        if (rc.positionMs == 0) continue;
+                        CuePoint cp;
+                        cp.positionMs = rc.positionMs;
+                        auto letter = rc.hotCueLetter();
+                        if (letter.isNotEmpty())
+                            cp.name = letter;
+                        if (rc.comment.isNotEmpty())
+                            cp.name += cp.name.isNotEmpty()
+                                ? " " + rc.comment : rc.comment;
+                        if (cp.name.isEmpty())
+                        {
+                            if (rc.type == TrackMetadata::RekordboxCue::MemoryPoint)
+                                cp.name = "MEM";
+                            else if (rc.type == TrackMetadata::RekordboxCue::Loop)
+                                cp.name = "LOOP";
+                        }
+                        newEntry.cuePoints.push_back(std::move(cp));
+                    }
+                    newEntry.sortCuePoints();
+                }
+            }
+
             trackMap.addOrUpdate(newEntry);
         }
         else
@@ -459,10 +494,13 @@ class ProDJLinkViewComponent : public juce::Component,
             ds.trackMapped = false;
             ds.offset = "00:00:00:00";
             ds.offsetTimecode = {};
-            if (ds.title.isNotEmpty()
-                && !ds.title.startsWith("Track #"))
+            if (ds.title.isNotEmpty())
             {
                 tmEntry = trackMap.find(ds.artist, ds.title, (int)ds.trackLenSec);
+                if (!tmEntry && ds.trackLenSec > 0)
+                    tmEntry = trackMap.find(ds.artist, ds.title, 0);
+                if (!tmEntry)
+                    tmEntry = trackMap.findIgnoringDuration(ds.artist, ds.title);
                 if (tmEntry != nullptr)
                 {
                     ds.trackMapped = true;
@@ -568,8 +606,8 @@ class ProDJLinkViewComponent : public juce::Component,
                     if (meta.isValid())
                     {
                         ds.lastMetaVersion = meta.cacheVersion;
-                        ds.artist    = meta.artist;
-                        ds.title     = meta.title;
+                        if (meta.artist.isNotEmpty()) ds.artist = meta.artist;
+                        if (meta.title.isNotEmpty())  ds.title  = meta.title;
                         ds.key       = meta.key;
                         ds.artworkId = meta.artworkId;
                         ds.cueCount  = (int)meta.cueList.size();
@@ -638,8 +676,8 @@ class ProDJLinkViewComponent : public juce::Component,
                         if (metaById.isValid())
                         {
                             ds.lastMetaVersion = metaById.cacheVersion;
-                            ds.artist    = metaById.artist;
-                            ds.title     = metaById.title;
+                            if (metaById.artist.isNotEmpty()) ds.artist = metaById.artist;
+                            if (metaById.title.isNotEmpty())  ds.title  = metaById.title;
                             ds.key       = metaById.key;
                             ds.artworkId = metaById.artworkId;
                             ds.cueCount  = (int)metaById.cueList.size();
@@ -962,6 +1000,10 @@ class ProDJLinkViewComponent : public juce::Component,
                             {
                                 int dur = (int)ds.trackLenSec;
                                 auto* mutableEntry = trackMap.find(ds.artist, ds.title, dur);
+                                if (!mutableEntry && dur > 0)
+                                    mutableEntry = trackMap.find(ds.artist, ds.title, 0);
+                                if (!mutableEntry)
+                                    mutableEntry = trackMap.findIgnoringDuration(ds.artist, ds.title);
                                 if (mutableEntry != nullptr && mutableEntry->cuePoints.empty())
                                 {
                                     for (auto& rc : meta.cueList)
@@ -993,6 +1035,10 @@ class ProDJLinkViewComponent : public juce::Component,
                             // Cues not yet from rekordbox -- fallback to TrackMap
                             int dur = (int)ds.trackLenSec;
                             auto* tmFallback = trackMap.find(ds.artist, ds.title, dur);
+                            if (!tmFallback && dur > 0)
+                                tmFallback = trackMap.find(ds.artist, ds.title, 0);
+                            if (!tmFallback)
+                                tmFallback = trackMap.findIgnoringDuration(ds.artist, ds.title);
                             if (tmFallback && !tmFallback->cuePoints.empty())
                                 ds.detailWaveform.setCuePoints(tmFallback->cuePoints);
                         }

README.md

@@ -129,7 +129,7 @@ STC connects to Denon Engine OS hardware via the StageLinQ protocol, receiving d
 
 ### Track Map
 
-Map tracks by **artist + title + duration** to timecode offsets and show control triggers. When a mapped track is loaded on a CDJ or Denon deck, STC automatically applies the timecode offset and fires the configured triggers. Tracks are identified universally regardless of which USB/SD they are loaded from. The duration acts as a fingerprint to distinguish different versions of the same track (e.g. radio edit vs extended mix).
+Map tracks by **title** (and optionally artist and duration) to timecode offsets and show control triggers. When a mapped track is loaded on a CDJ or Denon deck, STC automatically applies the timecode offset and fires the configured triggers. Tracks are identified universally regardless of which USB/SD they are loaded from. Artist is optional -- tracks without artist metadata (sound effects, jingles, DJ tools) work fully with TrackMap. The duration acts as a fingerprint to distinguish different versions of the same track (e.g. radio edit vs extended mix).
 
 - Per-track timecode offset (HH:MM:SS:FF)
 - Per-track BPM multiplier (/4, /2, 1x, x2, x4) -- applied to MIDI Clock, Ableton Link, and OSC BPM forward
@@ -159,7 +159,7 @@ Per-track timed triggers that fire at specific playhead positions during playbac
 - **Live editing:** cue points added or modified while a track is playing take effect immediately without reloading the track.
 - **Waveform and artwork cache:** waveform preview data and album artwork are saved to disk the first time a track is seen. The cue editor shows both even when the CDJ is not connected, enabling offline cue programming.
 - **Works with both Pioneer and Denon** hardware via Pro DJ Link and StageLinQ.
-- **Auto-populate from rekordbox:** when a track with a TrackMap entry loads on a CDJ, STC automatically imports the DJ's rekordbox hot cues, memory points, and loops as cue points -- with their letters and comments as labels. Only applies if the entry has no manually-configured cue points. Blocked during Show Lock.
+- **Auto-populate from rekordbox:** when a track with a TrackMap entry loads on a CDJ, STC automatically imports the DJ's rekordbox hot cues, memory points, and loops as cue points -- with their letters and comments as labels. Also applies when creating a new entry via BPM multiplier double-click. Only applies if the entry has no manually-configured cue points. Blocked during Show Lock.
 - Cue points are stored in the Track Map (trackmap.json) alongside the track's offset and track-change triggers.
 - Maximizable window with persisted position across sessions.
 - Blocked during Show Lock to prevent accidental changes during a live show.
@@ -185,7 +185,7 @@ Table editor with per-parameter enable/disable, editable addresses and CC/Note/D
 
 ### PDL View
 
-External window showing the full Pro DJ Link network state at 60Hz:
+External window showing the full Pro DJ Link network state at 60Hz. The layout uses priority-based sizing: info text stays readable at any window size, bottom chrome (map/engine/BPM mult rows) hides progressively on small decks, and the detail waveform collapses first when space is tight.
 
 - 4-deck display (2x2 grid or 4x1 horizontal): artwork, track info, BPM (with multiplied value when active), key, cue count, play state, pitch, engine assignments
 - **Preview waveform** with playhead cursor, rekordbox cue markers (colored by DJ assignment), minute markers, beat grid (downbeat lines), and stored loop overlays

StageLinQView.h

@@ -240,6 +240,10 @@ class StageLinQViewComponent : public juce::Component,
             if (ds.title.isNotEmpty())
             {
                 tmEntry = trackMap.find(ds.artist, ds.title, (int)ds.trackLenSec);
+                if (!tmEntry && ds.trackLenSec > 0)
+                    tmEntry = trackMap.find(ds.artist, ds.title, 0);
+                if (!tmEntry)
+                    tmEntry = trackMap.findIgnoringDuration(ds.artist, ds.title);
                 if (tmEntry != nullptr)
                 {
                     ds.trackMapped = true;

TimecodeEngine.h

@@ -555,8 +555,8 @@ class TimecodeEngine
                     auto meta = dbClient->getCachedMetadataLightById(id);
                     if (meta.isValid())
                     {
-                        cachedTrackArtist = meta.artist;
-                        cachedTrackTitle  = meta.title;
+                        if (meta.artist.isNotEmpty()) cachedTrackArtist = meta.artist;
+                        if (meta.title.isNotEmpty())  cachedTrackTitle  = meta.title;
                         if (meta.durationSeconds > 0)
                         {
                             cachedTrackDurationSec = meta.durationSeconds;
@@ -630,8 +630,8 @@ class TimecodeEngine
                 // Ensure artist/title are from dbClient if available
                 if (info.artist.isEmpty() || info.title.startsWith("Track #"))
                 {
-                    info.artist = meta.artist;
-                    info.title  = meta.title;
+                    if (meta.artist.isNotEmpty()) info.artist = meta.artist;
+                    if (meta.title.isNotEmpty())  info.title  = meta.title;
                 }
             }
         }
@@ -1013,9 +1013,9 @@ class TimecodeEngine
                         && cachedTrackTitle.startsWith("Track #"))
                     {
                         auto meta = dbClient->getCachedMetadataLightById(cachedTrackId);
-                        if (meta.isValid())
+                        if (meta.isValid() && meta.title.isNotEmpty())
                         {
-                            cachedTrackArtist = meta.artist;
+                            if (meta.artist.isNotEmpty()) cachedTrackArtist = meta.artist;
                             cachedTrackTitle  = meta.title;
                             if (meta.durationSeconds > 0)
                             {
@@ -1123,8 +1123,7 @@ class TimecodeEngine
                             }
 
                             if (pdlHasTC && trackMapEnabled
-                                && cachedTrackArtist.isNotEmpty() && cachedTrackTitle.isNotEmpty()
-                                && !cachedTrackTitle.startsWith("Track #"))
+                                && cachedTrackTitle.isNotEmpty())
                             {
                                 if (trackMapped)
                                     inputStatusText += " | MAP: " + cachedTrackTitle;
@@ -1384,7 +1383,7 @@ class TimecodeEngine
                             }
 
                             if (slqHasTC && trackMapEnabled
-                                && cachedTrackArtist.isNotEmpty() && cachedTrackTitle.isNotEmpty())
+                                && cachedTrackTitle.isNotEmpty())
                             {
                                 if (trackMapped)
                                     inputStatusText += " | MAP: " + cachedTrackTitle;
@@ -2336,8 +2335,7 @@ class TimecodeEngine
     /// Returns the matched entry pointer (or nullptr if not found/malformed).
     const TrackMapEntry* lookupTrackInMap()
     {
-        if (!trackMapPtr || cachedTrackTitle.isEmpty()
-            || cachedTrackTitle.startsWith("Track #"))
+        if (!trackMapPtr || cachedTrackTitle.isEmpty())
         {
             trackMapped = false;
             return nullptr;
@@ -2353,6 +2351,14 @@ class TimecodeEngine
         // don't lose the TrackMap match (and its armed cue points).
         if (!entry && cachedTrackDurationSec > 0)
             entry = trackMapPtr->find(cachedTrackArtist, cachedTrackTitle, 0);
+
+        // Last resort: ignore duration entirely.  Catches the case where the
+        // entry was saved with a duration that differs from the engine's cached
+        // duration (e.g. PDL View saved with CDJ-reported duration while the
+        // engine's cachedTrackDurationSec was still 0 or stale from an earlier
+        // enrichment pass).
+        if (!entry)
+            entry = trackMapPtr->findIgnoringDuration(cachedTrackArtist, cachedTrackTitle);
         if (entry)
         {
             int h, m, s, f;