completed audio recording implementation

app/widget/standardcombos/CMakeLists.txt

@@ -21,6 +21,7 @@ set(OLIVE_SOURCES
   widget/standardcombos/interlacedcombobox.h
   widget/standardcombos/pixelaspectratiocombobox.h
   widget/standardcombos/pixelformatcombobox.h
+  widget/standardcombos/sampleformatcombobox.h
   widget/standardcombos/sampleratecombobox.h
   widget/standardcombos/standardcombos.h
   widget/standardcombos/videodividercombobox.h

app/widget/standardcombos/sampleformatcombobox.h

@@ -0,0 +1,64 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef SAMPLEFORMATCOMBOBOX_H
+#define SAMPLEFORMATCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/audioparams.h"
+
+namespace olive {
+
+class SampleFormatComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  SampleFormatComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    // Set up preview formats
+    for (int i=0;i<AudioParams::kFormatCount;i++) {
+      AudioParams::Format smp_fmt = static_cast<AudioParams::Format>(i);
+
+      this->addItem(AudioParams::FormatToString(smp_fmt), smp_fmt);
+    }
+  }
+
+  AudioParams::Format GetSampleFormat() const
+  {
+    return static_cast<AudioParams::Format>(this->currentData().toInt());
+  }
+
+  void SetSampleFormat(AudioParams::Format fmt)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).toInt() == fmt) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+}
+
+#endif // SAMPLEFORMATCOMBOBOX_H

app/widget/standardcombos/standardcombos.h

@@ -26,6 +26,7 @@
 #include "interlacedcombobox.h"
 #include "pixelaspectratiocombobox.h"
 #include "pixelformatcombobox.h"
+#include "sampleformatcombobox.h"
 #include "sampleratecombobox.h"
 #include "videodividercombobox.h"
 

app/widget/timelinewidget/tool/record.cpp

@@ -21,7 +21,7 @@ void RecordTool::MousePress(TimelineViewMouseEvent *event)
     return;
   }
 
-  if (t->type() != Track::kAudio) {
+  if (t && t->type() != Track::kAudio) {
     // We only support audio tracks here
     return;
   }

app/widget/viewer/viewer.cpp

@@ -1183,7 +1183,14 @@ void ViewerWidget::Play(bool in_to_out_only)
                                                 ExportFormat::GetExtension(static_cast<ExportFormat::Format>(Config::Current()[QStringLiteral("AudioRecordingFormat")].toInt())))
                                               );
 
-    if (AudioManager::instance()->StartRecording(recording_filename_, GetConnectedNode()->GetAudioParams())) {
+    AudioParams ap(OLIVE_CONFIG("AudioRecordingSampleRate").toInt(), OLIVE_CONFIG("AudioRecordingChannelLayout").toULongLong(), static_cast<AudioParams::Format>(OLIVE_CONFIG("AudioRecordingSampleFormat").toInt()));
+
+    EncodingParams encode_param;
+    encode_param.EnableAudio(ap, static_cast<ExportCodec::Codec>(OLIVE_CONFIG("AudioRecordingCodec").toInt()));
+    encode_param.SetFilename(recording_filename_);
+    encode_param.set_audio_bit_rate(OLIVE_CONFIG("AudioRecordingBitRate").toInt() * 1000);
+
+    if (AudioManager::instance()->StartRecording(encode_param)) {
       recording_ = true;
       controls_->SetPauseButtonRecordingState(true);
       recording_callback_->EnableRecordingOverlay(TimelineCoordinate(recording_range_.in(), recording_track_));