试图解决编译错误
This commit is contained in:
@@ -219,9 +219,11 @@ void ViewerOutput::set_default_parameters()
|
||||
OLIVE_CONFIG("DefaultSequenceInterlacing").value<VideoParams::Interlacing>(),
|
||||
VideoParams::generate_auto_divider(width, height)
|
||||
));
|
||||
AVChannelLayout layout;
|
||||
av_channel_layout_from_mask(&layout, OLIVE_CONFIG("DefaultSequenceAudioLayout").toULongLong());
|
||||
SetAudioParams(AudioParams(
|
||||
OLIVE_CONFIG("DefaultSequenceAudioFrequency").toInt(),
|
||||
OLIVE_CONFIG("DefaultSequenceAudioLayout").toULongLong(),
|
||||
layout,
|
||||
kDefaultSampleFormat
|
||||
));
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "node/factory.h"
|
||||
#include "node/group/group.h"
|
||||
#include "node/serializeddata.h"
|
||||
|
||||
#include <QtCore>
|
||||
namespace olive {
|
||||
|
||||
ProjectSerializer230220::LoadData ProjectSerializer230220::Load(Project *project, QXmlStreamReader *reader, LoadType load_type, void *reserved) const
|
||||
|
||||
@@ -52,7 +52,7 @@ AudioParams TypeSerializer::LoadAudioParams(QXmlStreamReader *reader)
|
||||
void TypeSerializer::SaveAudioParams(QXmlStreamWriter *writer, const AudioParams &a)
|
||||
{
|
||||
writer->writeTextElement(QStringLiteral("samplerate"), QString::number(a.sample_rate()));
|
||||
writer->writeTextElement(QStringLiteral("channellayout"), QString::number(a.channel_layout()));
|
||||
writer->writeTextElement(QStringLiteral("channellayout"), QString::number(a.channel_layout().u.mask));
|
||||
writer->writeTextElement(QStringLiteral("format"), QString::fromStdString(a.format().to_string()));
|
||||
writer->writeTextElement(QStringLiteral("enabled"), QString::number(a.enabled()));
|
||||
writer->writeTextElement(QStringLiteral("streamindex"), QString::number(a.stream_index()));
|
||||
|
||||
Reference in New Issue
Block a user