fixup! feat: store tracklist as tag comment on recording

Author: acolombier

src/encoder/encoder.cpp

@@ -158,22 +158,22 @@ EncoderRecordingSettingsPointer EncoderFactory::getEncoderRecordingSettings(Enco
 
 void Encoder::addToTracklist(const QString& artist,
         const QString& title,
-        std::chrono::seconds timecode) {
-    auto recordedDuration = timecode.count();
+        std::chrono::seconds timestamp) {
+    auto recordedDurationSeconds = timestamp.count();
     m_trackList.append(
             QStringLiteral("%1: %2 - %3")
                     .arg(QString("%1:%2:%3")
-                                    .arg(recordedDuration / (60 * 60),
+                                    .arg(recordedDurationSeconds / (60 * 60),
                                             2,
                                             'f',
                                             0,
                                             '0') // hours
-                                    .arg((recordedDuration / 60) % 60,
+                                    .arg((recordedDurationSeconds / 60) % 60,
                                             2,
                                             'f',
                                             0,
                                             '0') // minutes
-                                    .arg(recordedDuration % 60, 2, 'f', 0, '0'),
+                                    .arg(recordedDurationSeconds % 60, 2, 'f', 0, '0'),
                             artist.trimmed().isEmpty()
                                     ? QObject::tr("(Unknown Artist)")
                                     : artist,

src/encoder/encoder.h

@@ -36,14 +36,16 @@ class Encoder {
     virtual void updateMetaData(const QString& artist,
             const QString& title,
             const QString& album,
-            std::chrono::seconds timecode = {}) = 0;
+            std::chrono::seconds timestamp = {}) = 0;
     // called at the end when encoding is finished
     virtual void flush() = 0;
     // Setup the encoder with the specific settings
     virtual void setEncoderSettings(const EncoderSettings& settings) = 0;
 
   protected:
-    void addToTracklist(const QString& artist, const QString& title, std::chrono::seconds timecode);
+    void addToTracklist(const QString& artist,
+            const QString& title,
+            std::chrono::seconds timestamp);
     QStringList getTrackList() const {
         return m_trackList;
     }

src/encoder/encodermp3.cpp

@@ -3,6 +3,7 @@
 #include <lame/lame.h>
 #include <limits.h>
 #include <qbytearrayview.h>
+#include <qglobal.h>
 #include <qobject.h>
 #include <qstringliteral.h>
 
@@ -149,18 +150,19 @@ void EncoderMp3::flush() {
     // (ID3v2 & Xing frame) dynamically, but `EncoderCallback` doesn't support
     // that so we use the static header padding and truncate the tracklist if
     // too long
-    size_t tracklistMaxSize = kHeaderPadding - numBytes -
+    qsizetype tracklistMaxByteSize = kHeaderPadding - numBytes -
             lame_get_id3v2_tag(m_lameFlags, nullptr, 0);
-    auto trackList = getTrackList().join("\n");
+    QByteArray trackList = getTrackList().join("\n").toLocal8Bit();
     if (!trackList.isEmpty()) {
         // Because of the static header size offset, we need to ensure that the
         // tracklist comment won't make the header overflow on the MP3 frames,
         // we we truncate to the max value
-        auto currentSize = static_cast<size_t>(trackList.size());
-        if (currentSize > tracklistMaxSize - 1) { // -1 since we need a byte for the NULL terminator
-            trackList = trackList.left(tracklistMaxSize - 4) + "...";
+        qsizetype currentByteSize = trackList.size();
+        if (currentByteSize > tracklistMaxByteSize -
+                        1) { // -1 since we need a byte for the NULL terminator
+            trackList = trackList.left(tracklistMaxByteSize - 4) + "...";
         }
-        id3tag_set_comment(m_lameFlags, trackList.toLatin1());
+        id3tag_set_comment(m_lameFlags, trackList);
     }
 
     size_t id3HeaderNumBytes = lame_get_id3v2_tag(m_lameFlags, nullptr, 0);