svn path=/trunk/kdenlive/; revision=3265
DocClipBase *ClipManager::getClipByResource(QString resource)
{
DocClipBase *ClipManager::getClipByResource(QString resource)
{
for (int i = 0; i < m_clipList.count(); i++) {
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);
}
}
return m_clipList.at(i);
}
}
m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
item->setSelected(true);
}
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);
m_changeSpeedAction->setEnabled(hasVideoClip);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
groupSelectedItems(true);
#include <QCryptographicHash>
#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(),
QObject(),
audioFrameChache(),
m_description(),
m_thumbProd(NULL),
m_audioThumbCreated(false),
m_id(id),
m_thumbProd(NULL),
m_audioThumbCreated(false),
m_id(id),
+ m_placeHolder(placeHolder),
m_properties()
{
int type = xml.attribute("type").toInt();
m_properties()
{
int type = xml.attribute("type").toInt();
+bool DocClipBase::isPlaceHolder() const
+{
+ return m_placeHolder;
+}