format: reformatting files
This commit is contained in:
@@ -20,6 +20,6 @@ add_subdirectory(sequence)
|
||||
add_subdirectory(serializer)
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
node/project/folder/folder.h
|
||||
node/project/folder/folder.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
node/project/folder/folder.h
|
||||
node/project/folder/folder.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
node/project/footage/footage.cpp
|
||||
node/project/footage/footage.h
|
||||
node/project/footage/footagedescription.cpp
|
||||
node/project/footage/footagedescription.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
node/project/footage/footage.cpp
|
||||
node/project/footage/footage.h
|
||||
node/project/footage/footagedescription.cpp
|
||||
node/project/footage/footagedescription.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -242,11 +242,8 @@ void Footage::set_proxy_enabled(bool enabled)
|
||||
}
|
||||
}
|
||||
|
||||
void Footage::SetProxy(const QString &path,
|
||||
ProxyManager::ProxyState state,
|
||||
int video_stream_index,
|
||||
int preset_version,
|
||||
bool enabled)
|
||||
void Footage::SetProxy(const QString &path, ProxyManager::ProxyState state,
|
||||
int video_stream_index, int preset_version, bool enabled)
|
||||
{
|
||||
qDebug() << "Footage::SetProxy:" << filename() << "enabled=" << enabled
|
||||
<< "state=" << ProxyManager::ProxyStateToString(state)
|
||||
@@ -598,11 +595,10 @@ void Footage::SaveCustom(QXmlStreamWriter *writer) const
|
||||
if (!proxy_path_.isEmpty() || proxy_enabled_) {
|
||||
writer->writeStartElement(QStringLiteral("proxy"));
|
||||
writer->writeAttribute(QStringLiteral("enabled"),
|
||||
proxy_enabled_ ? QStringLiteral("1")
|
||||
: QStringLiteral("0"));
|
||||
proxy_enabled_ ? QStringLiteral("1") :
|
||||
QStringLiteral("0"));
|
||||
writer->writeAttribute(QStringLiteral("state"),
|
||||
ProxyManager::ProxyStateToString(
|
||||
proxy_state_));
|
||||
ProxyManager::ProxyStateToString(proxy_state_));
|
||||
writer->writeAttribute(QStringLiteral("stream"),
|
||||
QString::number(proxy_video_stream_index_));
|
||||
writer->writeAttribute(QStringLiteral("preset"),
|
||||
|
||||
@@ -200,11 +200,8 @@ public:
|
||||
return proxy_state_;
|
||||
}
|
||||
|
||||
void SetProxy(const QString &path,
|
||||
ProxyManager::ProxyState state,
|
||||
int video_stream_index,
|
||||
int preset_version,
|
||||
bool enabled);
|
||||
void SetProxy(const QString &path, ProxyManager::ProxyState state,
|
||||
int video_stream_index, int preset_version, bool enabled);
|
||||
|
||||
void ClearProxy();
|
||||
|
||||
|
||||
@@ -78,10 +78,9 @@ bool FootageDescription::Load(const QString &filename)
|
||||
const QStringList split =
|
||||
reader.readElementText().split('/');
|
||||
if (split.size() == 2) {
|
||||
SetSourceStartTime(
|
||||
rational(split.at(0).toInt(),
|
||||
split.at(1).toInt()),
|
||||
source);
|
||||
SetSourceStartTime(rational(split.at(0).toInt(),
|
||||
split.at(1).toInt()),
|
||||
source);
|
||||
}
|
||||
} else if (reader.name() == QStringLiteral("streams")) {
|
||||
{
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
node/project/sequence/sequence.h
|
||||
node/project/sequence/sequence.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
node/project/sequence/sequence.h
|
||||
node/project/sequence/sequence.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -16,25 +16,25 @@
|
||||
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
node/project/serializer/serializer.cpp
|
||||
node/project/serializer/serializer.h
|
||||
node/project/serializer/serializer190219.cpp
|
||||
node/project/serializer/serializer190219.h
|
||||
node/project/serializer/serializer210528.cpp
|
||||
node/project/serializer/serializer210528.h
|
||||
node/project/serializer/serializer210907.cpp
|
||||
node/project/serializer/serializer210907.h
|
||||
node/project/serializer/serializer211228.cpp
|
||||
node/project/serializer/serializer211228.h
|
||||
node/project/serializer/serializer220403.cpp
|
||||
node/project/serializer/serializer220403.h
|
||||
node/project/serializer/serializer230220.cpp
|
||||
node/project/serializer/serializer230220.h
|
||||
${OLIVE_SOURCES}
|
||||
node/project/serializer/serializer.cpp
|
||||
node/project/serializer/serializer.h
|
||||
node/project/serializer/serializer190219.cpp
|
||||
node/project/serializer/serializer190219.h
|
||||
node/project/serializer/serializer210528.cpp
|
||||
node/project/serializer/serializer210528.h
|
||||
node/project/serializer/serializer210907.cpp
|
||||
node/project/serializer/serializer210907.h
|
||||
node/project/serializer/serializer211228.cpp
|
||||
node/project/serializer/serializer211228.h
|
||||
node/project/serializer/serializer220403.cpp
|
||||
node/project/serializer/serializer220403.h
|
||||
node/project/serializer/serializer230220.cpp
|
||||
node/project/serializer/serializer230220.h
|
||||
|
||||
|
||||
node/project/serializer/typeserializer.cpp
|
||||
node/project/serializer/typeserializer.h
|
||||
node/project/serializer/typeserializer.cpp
|
||||
node/project/serializer/typeserializer.h
|
||||
|
||||
PARENT_SCOPE
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -98,7 +98,7 @@ ProjectSerializer::Result ProjectSerializer::Load(Project *project,
|
||||
} else {
|
||||
Result r(kFileError);
|
||||
r.SetDetails(QStringLiteral("Unable to open '%1': %2")
|
||||
.arg(filename, project_file.errorString()));
|
||||
.arg(filename, project_file.errorString()));
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user