fixup! feat: store tracklist as tag comment on recording

Author: acolombier

src/encoder/encoderffmpegcore.cpp

@@ -184,17 +184,10 @@ void EncoderFfmpegCore::encodeBuffer(const CSAMPLE* samples, const std::size_t b
     free(l_fNormalizedSamples);
 }
 
-// Originally called from enginebroadcast.cpp to update metadata information
-// when streaming, however, this causes pops
-//
-// Currently this method is used before init() once to save artist, title and album
-//
-void EncoderFfmpegCore::updateMetaData(const QString& artist,
-        const QString& title,
-        const QString& album,
+void EncoderFfmpegCore::updateMetaData(const QString&,
+        const QString&,
+        const QString&,
         std::chrono::seconds) {
-    qDebug() << "ffmpegencodercore: UpdateMetadata: !" << artist << " - " << title <<
-             " - " << album;
 }
 
 int EncoderFfmpegCore::initEncoder(

src/encoder/encoderffmpegcore.h

@@ -19,6 +19,7 @@ extern "C" {
 
 #include <QBuffer>
 #include <QByteArray>
+#include <QFile>
 #include <QLibrary>
 
 #include "encoder/encoder.h"

src/encoder/encodermp3.cpp

@@ -1,24 +1,10 @@
 #include "encoder/encodermp3.h"
 
-#include <id3v2header.h>
 #include <id3v2tag.h>
-#include <lame/lame.h>
-#include <limits.h>
-#include <qbytearrayview.h>
-#include <qglobal.h>
-#include <qobject.h>
-#include <qstringliteral.h>
-#include <tbytevector.h>
-#include <tstring.h>
-
-#include <QByteArray>
-#include <QObject>
-#include <QtDebug>
 
 #include "audio/types.h"
 #include "encoder/encodercallback.h"
 #include "encoder/encodermp3settings.h"
-#include "util/assert.h"
 
 namespace {
 constexpr size_t kHeaderPadding = 10000;
@@ -189,11 +175,11 @@ void EncoderMp3::flush() {
     }
     id3Tag.setComment(trackList);
 
-    auto id3Buffer = id3Tag.render();
+    TagLib::ByteVector id3Buffer = id3Tag.render();
 
     m_pCallback->seek(0);
     // Write the lame/xing header.
-    m_pCallback->write((const unsigned char*)id3Buffer.data(),
+    m_pCallback->write(reinterpret_cast<const unsigned char*>(id3Buffer.data()),
             m_bufferOut,
             static_cast<int>(id3Buffer.size()),
             static_cast<int>(numBytes));

src/preferences/dialog/dlgprefrecorddlg.ui

@@ -14,6 +14,7 @@
    <string>Recording Preferences</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
+
    <item row="0" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBoxRecordingsPath">
      <property name="title">
@@ -68,6 +69,7 @@
         </property>
        </widget>
       </item>
+
       <item row="1" column="0" colspan="3">
        <layout class="QHBoxLayout" name="splittingLayout">
         <property name="topMargin">
@@ -95,6 +97,7 @@
         <item>
          <widget class="QComboBox" name="comboBoxSplitting"/>
         </item>
+        <!--item row="1" column="4" rowspan="4"-->
         <item>
          <spacer name="horizontalSpacer_split">
           <property name="orientation">
@@ -107,13 +110,16 @@
         </item>
        </layout>
       </item>
+
       <item row="2" column="0" colspan="3">
        <widget class="QCheckBox" name="CheckBoxRecordCueFile">
         <property name="text">
          <string>Create a CUE file</string>
         </property>
        </widget>
       </item>
+
+
       <item row="3" column="0" colspan="3">
        <widget class="QCheckBox" name="CheckBoxUseCueFileAnnotation">
         <property name="toolTip">
@@ -126,15 +132,18 @@ information from filepaths (i.e. username)</string>
         </property>
        </widget>
       </item>
+
      </layout>
     </widget>
    </item>
+
    <item row="1" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBoxFileformat">
      <property name="title">
       <string>Output File Format</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
+
       <item row="1" column="0">
        <widget class="QLabel" name="LabelLossless">
         <property name="sizePolicy">
@@ -161,6 +170,7 @@ information from filepaths (i.e. username)</string>
         </property>
        </layout>
       </item>
+
       <item row="2" column="0">
        <widget class="QLabel" name="LabelLossy">
         <property name="text">
@@ -171,13 +181,15 @@ information from filepaths (i.e. username)</string>
       <item row="2" column="1" colspan="2">
        <layout class="QHBoxLayout" name="LossyEncLayout"/>
       </item>
+
       <item row="3" column="0" colspan="3">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
+
       <item row="4" column="0">
        <widget class="QLabel" name="labelOptionGroup">
         <property name="minimumSize">
@@ -194,6 +206,7 @@ information from filepaths (i.e. username)</string>
       <item row="4" column="1" colspan="2">
        <layout class="QHBoxLayout" name="OptionGroupsLayout"/>
       </item>
+
       <item row="5" column="0" colspan="3">
        <widget class="QWidget" name="qualityGroup">
        <layout class="QHBoxLayout" name="qualityHLayout">
@@ -254,6 +267,7 @@ information from filepaths (i.e. username)</string>
        </layout>
        </widget>
       </item>
+
       <item row="6" column="0" colspan="3">
        <widget class="QWidget" name="compressionGroup">
        <layout class="QHBoxLayout" name="compressionHLayout">
@@ -293,9 +307,11 @@ information from filepaths (i.e. username)</string>
        </layout>
        </widget>
       </item>
+
      </layout>
     </widget>
    </item>
+
    <item row="2" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBoxTags">
      <property name="title">
@@ -324,6 +340,7 @@ information from filepaths (i.e. username)</string>
       <item row="0" column="1">
        <widget class="QLineEdit" name="LineEditTitle"/>
       </item>
+
       <item row="1" column="0">
        <widget class="QLabel" name="LabelAuthor">
         <property name="enabled">
@@ -346,6 +363,7 @@ information from filepaths (i.e. username)</string>
       <item row="1" column="1">
        <widget class="QLineEdit" name="LineEditAuthor"/>
       </item>
+
       <item row="2" column="0">
        <widget class="QLabel" name="LabelAlbum">
         <property name="enabled">
@@ -381,6 +399,7 @@ information from filepaths (i.e. username)</string>
      </layout>
     </widget>
    </item>
+
    <item row="7" column="1">
     <spacer>
      <property name="orientation">
@@ -394,6 +413,7 @@ information from filepaths (i.e. username)</string>
      </property>
     </spacer>
    </item>
+
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>