Skip to content
Extraits de code Groupes Projets

Add documents

Fusionnées Kubat a demandé de fusionner vivy-document vers master
4 files
+ 16
26
Comparer les modifications
  • Côte à côte
  • En ligne

Fichiers

+ 8
18
@@ -19,12 +19,10 @@ VivyDocument::loadSubDocument(const QString &name) noexcept
@@ -19,12 +19,10 @@ VivyDocument::loadSubDocument(const QString &name) noexcept
if (detectDocumentType(file, &type)) {
if (detectDocumentType(file, &type)) {
switch (type) {
switch (type) {
case SubDocument::Audio:
case SubDocument::Audio:
audioFile = name;
audioDocument = std::unique_ptr<AudioDocument>(AudioDocument::fromFile(file.absolutePath()));
audioDocument = std::unique_ptr<AudioDocument>(AudioDocument::fromFile(file.absolutePath()));
break;
break;
case SubDocument::Video:
case SubDocument::Video:
videoFile = name;
videoDocument = std::unique_ptr<VideoDocument>(VideoDocument::fromFile(file.absolutePath()));
videoDocument = std::unique_ptr<VideoDocument>(VideoDocument::fromFile(file.absolutePath()));
break;
break;
@@ -52,13 +50,11 @@ VivyDocument::loadSubDocument(const QString &name, VivyDocument::SubDocument asT
@@ -52,13 +50,11 @@ VivyDocument::loadSubDocument(const QString &name, VivyDocument::SubDocument asT
}
}
else if (type == SubDocument::Video && asType == SubDocument::Video) {
else if (type == SubDocument::Video && asType == SubDocument::Video) {
videoFile = name;
videoDocument = std::unique_ptr<VideoDocument>(VideoDocument::fromFile(file.absolutePath()));
videoDocument = std::unique_ptr<VideoDocument>(VideoDocument::fromFile(file.absolutePath()));
}
}
else if ((type == SubDocument::Video && asType == SubDocument::Audio) ||
else if ((type == SubDocument::Video && asType == SubDocument::Audio) ||
(type == SubDocument::Audio && asType == SubDocument::Audio)) {
(type == SubDocument::Audio && asType == SubDocument::Audio)) {
audioFile = name;
audioDocument = std::unique_ptr<AudioDocument>(AudioDocument::fromFile(file.absolutePath()));
audioDocument = std::unique_ptr<AudioDocument>(AudioDocument::fromFile(file.absolutePath()));
}
}
@@ -110,22 +106,16 @@ VivyDocument::rename(const QString &name) noexcept
@@ -110,22 +106,16 @@ VivyDocument::rename(const QString &name) noexcept
return false;
return false;
}
}
QString
AudioDocument *const
VivyDocument::getSubDocument(SubDocument subType) const noexcept
VivyDocument::getAudioSubDocument() const noexcept
{
{
if ((documentType & subType) == 0) {
return audioDocument.get();
QString ret;
}
return ret;
}
switch (subType) {
VideoDocument *const
case SubDocument::Audio:
VivyDocument::getVideoSubDocument() const noexcept
return audioFile;
{
case SubDocument::Video:
return videoDocument.get();
return videoFile;
case SubDocument::ASS:
return assFile;
}
}
}
VivyDocument *
VivyDocument *
Chargement en cours