m_modifiedTimer.setInterval(1500);
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 &)));
+
+ // Seems like a dirty signal is emitted anyways when a watched file is created, so don't react twice.
+ //connect(&m_fileWatcher, SIGNAL(created(const QString &)), this, SLOT(slotClipAvailable(const QString &)));
connect(&m_modifiedTimer, SIGNAL(timeout()), this, SLOT(slotProcessModifiedClips()));
#if KDE_IS_VERSION(4,5,0)
producer.seek(z);
mlt_frame = producer.get_frame();
if (mlt_frame && mlt_frame->is_valid()) {
- int samples = mlt_sample_calculator(framesPerSecond, frequency, mlt_frame_get_position(mlt_frame->get_frame()));
+ int samples = mlt_sample_calculator(framesPerSecond, frequency, mlt_frame->get_position());
qint16* pcm = static_cast<qint16*>(mlt_frame->get_audio(audioFormat, frequency, channels, samples));
for (int c = 0; c < channels; c++) {
QByteArray audioArray;
m_doc->commandStack()->push(command);
}
-void ClipManager::slotAddSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration,
- const bool loop, const bool crop, const bool fade,
- const QString &luma_duration, const QString &luma_file, const int softness,
- const QString &animation, const QString &group, const QString &groupId)
+void ClipManager::slotAddSlideshowClipFile(QMap <QString, QString> properties, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
doc.appendChild(prod);
- prod.setAttribute("resource", path);
+ QMap<QString, QString>::const_iterator i = properties.constBegin();
+ while (i != properties.constEnd()) {
+ prod.setAttribute(i.key(), i.value());
+ ++i;
+ }
prod.setAttribute("type", (int) SLIDESHOW);
uint id = m_clipIdCounter++;
- prod.setAttribute("id", QString::number(id));
- prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration) * count);
- prod.setAttribute("ttl", m_doc->getFramePos(duration));
- prod.setAttribute("luma_duration", m_doc->getFramePos(luma_duration));
- prod.setAttribute("name", name);
- prod.setAttribute("loop", loop);
- prod.setAttribute("crop", crop);
- prod.setAttribute("fade", fade);
- prod.setAttribute("softness", QString::number(softness));
- prod.setAttribute("luma_file", luma_file);
- prod.setAttribute("animation", animation);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
prod.setAttribute("groupid", groupId);