Merge branch 'master' into move-serialization
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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()));
|
||||
|
||||
Reference in New Issue
Block a user