Missing file from previous commit + mark document as modified when dragging a clip...

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

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index c43b583d25660d12d6251d4068c5c81139ab50f1..b591d8f00fc92a55578402208d79f2ff83451898 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -185,8 +185,11 @@ DocClipBase *ClipManager::getClipById(QString clipId)
 
 DocClipBase *ClipManager::getClipByResource(QString resource)
 {
+    QString clipResource;
     for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_clipList.at(i)->getProperty("resource") == resource) {
+        clipResource = m_clipList.at(i)->getProperty("resource");
+        if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour");
+        if (clipResource == resource) {
             return m_clipList.at(i);
         }
     }

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 7abfe7c2395b85fa8daf4a7d4bcc5ce3b0d8acf9..2bdb7f512c1af4217fb39ff7097b34ec0f6bc0fc 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1659,6 +1659,7 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
             item->setSelected(true);
         }
+       m_document->setModified(true);
         m_changeSpeedAction->setEnabled(hasVideoClip);
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
         groupSelectedItems(true);

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index be815389f5ce8794f902af2f2d4227ab812f48ef..b11ba095ffcbacbc3fb09e0cad04bc6f979dd16a 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -33,7 +33,7 @@
 
 #include <QCryptographicHash>
 
-DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) :
+DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id, bool placeHolder) :
         QObject(),
         audioFrameChache(),
         m_description(),
@@ -47,6 +47,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin
         m_thumbProd(NULL),
         m_audioThumbCreated(false),
         m_id(id),
+        m_placeHolder(placeHolder),
         m_properties()
 {
     int type = xml.attribute("type").toInt();
@@ -758,5 +759,8 @@ bool DocClipBase::slotGetAudioThumbs()
     return true;
 }
 
-
+bool DocClipBase::isPlaceHolder() const
+{
+    return m_placeHolder;
+}