Fix missing proxies incorrectly detected on document opening, fix audio only clips...

svn path=/trunk/kdenlive/; revision=5739

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 6b2165ed3edb17fe60309f6756d99cdad9e129fc..1f8cc7aadebfaeb29e0012f69cf8d0f9a79bb665 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -4137,7 +4137,11 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload)
             clip = static_cast <ClipItem *>(list.at(i));
             if (clip->clipProducer() == clipId) {
                 ItemInfo info = clip->info();
-                if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer(info.track))) {
+                Mlt::Producer *prod = NULL;
+                if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
+                else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
+                else prod = clip->baseClip()->producer(info.track);
+                if (reload && !m_document->renderer()->mltUpdateClip(info, clip->xml(), prod)) {
                     emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
                 }
                 else clipList.append(clip);

diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp
index 6551ce0b57c91cd0f5ee3cb907f3bcdedaf1cccd..b003b67875cefe970a52bbb196cdc43ae869cddd 100644 (file)
--- a/src/documentchecker.cpp
+++ b/src/documentchecker.cpp
@@ -112,7 +112,7 @@ bool DocumentChecker::hasErrorInClips()
         resource = e.attribute("resource");
         if (e.hasAttribute("proxy")) {
             QString proxyresource = e.attribute("proxy");
-            if (!KIO::NetAccess::exists(KUrl(proxyresource), KIO::NetAccess::SourceSide, 0)) {
+            if (!proxyresource.isEmpty() && proxyresource != "-" && !KIO::NetAccess::exists(KUrl(proxyresource), KIO::NetAccess::SourceSide, 0)) {
                 // Missing clip found
                 missingProxies.append(e);
             }