Merge branch 'master' into move-serialization

This commit is contained in:
itsmattkc
2023-02-28 11:29:52 -08:00
6 changed files with 49 additions and 72 deletions
@@ -181,7 +181,7 @@ QVariant ProjectViewModel::data(const QModelIndex &index, int role) const
}
break;
case Qt::ToolTipRole:
return internal_item->ToolTip();
return internal_item->data(Node::TOOLTIP);
}
return QVariant();
+2
View File
@@ -510,6 +510,8 @@ void ViewerWidget::UpdateAudioProcessor()
CloseAudioProcessor();
AudioParams ap = GetConnectedNode()->GetAudioParams();
ap.set_format(ViewerOutput::kDefaultSampleFormat);
AudioParams packed(OLIVE_CONFIG("AudioOutputSampleRate").toInt(),
OLIVE_CONFIG("AudioOutputChannelLayout").toULongLong(),
SampleFormat::from_string(OLIVE_CONFIG("AudioOutputSampleFormat").toString().toStdString()));