m_clipIdCounter = 1;
m_folderIdCounter = 1;
connect(&m_fileWatcher, SIGNAL(dirty(const QString &)), this, SLOT(slotClipModified(const QString &)));
+ connect(&m_fileWatcher, SIGNAL(deleted(const QString &)), this, SLOT(slotClipMissing(const QString &)));
+ connect(&m_fileWatcher, SIGNAL(created(const QString &)), this, SLOT(slotClipAvailable(const QString &)));
}
ClipManager::~ClipManager()
{
- kDebug() << "\n\n 2222222222222222222222222 CLOSE CM 22222222222";
qDeleteAll(m_clipList);
+ m_clipList.clear();
+ m_audioThumbsQueue.clear();
+ m_generatingAudioId.clear();
}
void ClipManager::clear()
void ClipManager::addClip(DocClipBase *clip)
{
m_clipList.append(clip);
- if (clip->clipType() == IMAGE || clip->clipType() == AUDIO) {
+ if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) {
// listen for file change
+ //kDebug() << "// LISTEN FOR: " << clip->fileURL().path();
m_fileWatcher.addFile(clip->fileURL().path());
}
const QString id = clip->getId();
if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1;
}
-void ClipManager::slotDeleteClip(const QString &clipId)
+void ClipManager::slotDeleteClips(QStringList ids)
{
- DocClipBase *clip = getClipById(clipId);
- if (clip) {
- AddClipCommand *command = new AddClipCommand(m_doc, clip->toXML(), clipId, false);
- m_doc->commandStack()->push(command);
+ QUndoCommand *delClips = new QUndoCommand();
+ delClips->setText(i18np("Delete clip", "Delete clips", ids.size()));
+
+ for (int i = 0; i < ids.size(); i++) {
+ DocClipBase *clip = getClipById(ids.at(i));
+ if (clip) {
+ new AddClipCommand(m_doc, clip->toXML(), ids.at(i), false, delClips);
+ }
}
+ m_doc->commandStack()->push(delClips);
}
void ClipManager::deleteClip(const QString &clipId)
{
for (int i = 0; i < m_clipList.count(); i++) {
if (m_clipList.at(i)->getId() == clipId) {
- if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO) {
+ if (m_clipList.at(i)->clipType() != COLOR && m_clipList.at(i)->clipType() != SLIDESHOW && !m_clipList.at(i)->fileURL().isEmpty()) {
+ //if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) {
// listen for file change
m_fileWatcher.removeFile(m_clipList.at(i)->fileURL().path());
}
- delete m_clipList.takeAt(i);
+ DocClipBase *clip = m_clipList.takeAt(i);
+ delete clip;
+ clip = NULL;
break;
}
}
return NULL;
}
-DocClipBase *ClipManager::getClipByResource(QString resource)
+const QList <DocClipBase *> ClipManager::getClipByResource(QString resource)
{
+ QList <DocClipBase *> list;
QString clipResource;
for (int i = 0; i < m_clipList.count(); i++) {
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);
+ list.append(m_clipList.at(i));
}
}
- return NULL;
+ return list;
}
void ClipManager::updatePreviewSettings()
}
}
-void ClipManager::resetProducersList(QList <Mlt::Producer *> prods)
+void ClipManager::clearUnusedProducers()
+{
+ for (int i = 0; i < m_clipList.count(); i++) {
+ if (m_clipList.at(i)->numReferences() == 0) m_clipList.at(i)->deleteProducers();
+ }
+}
+
+void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods)
{
for (int i = 0; i < m_clipList.count(); i++) {
if (m_clipList.at(i)->numReferences() > 0) {
- m_clipList.at(i)->deleteProducers();
+ m_clipList.at(i)->clearProducers();
}
}
QString id;
for (int i = 0; i < prods.count(); i++) {
id = prods.at(i)->get("id");
+ kDebug() << "// // // REPLACE CLIP: " << id;
if (id.contains('_')) id = id.section('_', 0, 0);
DocClipBase *clip = getClipById(id);
if (clip) {
clip->setProducer(prods.at(i));
- kDebug() << "// // // REPLACE CLIP: " << id;
}
}
+ emit checkAllClips();
}
void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId)
prod.setAttribute("type", (int) IMAGE);
prod.setAttribute("in", 0);
prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
- } else if (type->name() == "application/x-kdenlivetitle") {
+ } else if (type->is("application/x-kdenlivetitle")) {
// opening a title file
QDomDocument txtdoc("titledocument");
QFile txtfile(file.path());
if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
txtfile.close();
prod.setAttribute("type", (int) TEXT);
- prod.setAttribute("resource", QString());
+ prod.setAttribute("resource", file.path());
prod.setAttribute("xmldata", txtdoc.toString());
- GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0);
prod.setAttribute("transparency", 1);
prod.setAttribute("in", 0);
- int out = (int) outPos.frames(m_doc->fps());
+ int out = txtdoc.documentElement().attribute("out").toInt();
if (out > 0) prod.setAttribute("out", out);
+ else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
} else txtfile.close();
}
new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips);
prod.setAttribute("in", 0);
int out = (int) outPos.frames(m_doc->fps());
if (out > 0) prod.setAttribute("out", out);
+ else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
} else txtfile.close();
}
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
}
+
void ClipManager::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId)
{
QDomDocument doc;
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId)
+void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl path, const QString group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
doc.appendChild(prod);
- prod.setAttribute("resource", imagePath);
prod.setAttribute("name", titleName);
- prod.setAttribute("xmltemplate", path.path());
+ prod.setAttribute("resource", path.path());
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
if (!group.isEmpty()) {
prod.setAttribute("type", (int) TEXT);
prod.setAttribute("transparency", "1");
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+
+ int out = 0;
+ QDomDocument titledoc;
+ QFile txtfile(path.path());
+ if (txtfile.open(QIODevice::ReadOnly) && titledoc.setContent(&txtfile)) {
+ txtfile.close();
+ out = titledoc.documentElement().attribute("out").toInt();
+ } else txtfile.close();
+
+ if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration()) - 1;
+ prod.setAttribute("out", out);
+
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
}
void ClipManager::slotClipModified(const QString &path)
{
- //kDebug()<<"// CLIP: "<<path<<" WAS MODIFIED";
- DocClipBase *clip = getClipByResource(path);
- if (clip == NULL) return;
- emit reloadClip(clip->getId());
-}
\ No newline at end of file
+ // kDebug() << "// CLIP: " << path << " WAS MODIFIED";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) emit reloadClip(clip->getId());
+ }
+}
+
+void ClipManager::slotClipMissing(const QString &path)
+{
+ // kDebug() << "// CLIP: " << path << " WAS MISSING";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) emit missingClip(clip->getId());
+ }
+}
+
+void ClipManager::slotClipAvailable(const QString &path)
+{
+ // kDebug() << "// CLIP: " << path << " WAS ADDED";
+ const QList <DocClipBase *> list = getClipByResource(path);
+ for (int i = 0; i < list.count(); i++) {
+ DocClipBase *clip = list.at(i);
+ if (clip != NULL) emit availableClip(clip->getId());
+ }
+}
+
+int ClipManager::clipsCount() const
+{
+ return m_clipList.count();
+}
+
+
projects / kdenlive / blobdiff