m_clipIdCounter = 1;
m_folderIdCounter = 1;
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(dirty(QString)), this, SLOT(slotClipModified(QString)));
+ connect(&m_fileWatcher, SIGNAL(deleted(QString)), this, SLOT(slotClipMissing(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_fileWatcher, SIGNAL(created(QString)), this, SLOT(slotClipAvailable(QString)));
connect(&m_modifiedTimer, SIGNAL(timeout()), this, SLOT(slotProcessModifiedClips()));
#if KDE_IS_VERSION(4,5,0)
#endif
}
-void ClipManager::requestThumbs(const QString id, QList <int> frames)
+void ClipManager::slotRequestThumbs(const QString id, QList <int> frames)
{
m_thumbsMutex.lock();
foreach (int frame, frames) {
void ClipManager::slotGetAudioThumbs()
{
Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().constData());
- mlt_audio_format audioFormat = mlt_audio_pcm;
+ mlt_audio_format audioFormat = mlt_audio_s16;
while (!m_abortAudioThumb && !m_audioThumbsQueue.isEmpty()) {
m_thumbsMutex.lock();
m_processingAudioThumbId = m_audioThumbsQueue.takeFirst();
if (hash.isEmpty()) continue;
QString audioPath = projectFolder() + "/thumbs/" + hash + ".thumb";
double lengthInFrames = clip->duration().frames(m_doc->fps());
- //FIXME: should this be hardcoded??
- int channels = 2;
- int frequency = 48000;
- int arrayWidth = 20;
+ int frequency = 0;
+ int channels = 0;
+ QString data = clip->getProperty("frequency");
+ if (!data.isEmpty()) frequency = data.toInt();
+ if (frequency <= 0) frequency = 48000;
+ data = clip->getProperty("channels");
+ if (!data.isEmpty()) channels = data.toInt();
+ if (channels <= 0) channels = 2;
+ int arrayWidth = 20;
double frame = 0.0;
+ int maxVolume = 0;
audioByteArray storeIn;
QFile f(audioPath);
if (QFileInfo(audioPath).size() > 0 && f.open(QIODevice::ReadOnly)) {
QByteArray audioArray(arrayWidth, '\x00');
for (int i = 0; i < arrayWidth; i++) {
audioArray[i] = channelarray.at(h2 + h3 + i);
+ if (audioArray.at(i) > maxVolume) maxVolume = audioArray.at(i);
}
h3 += arrayWidth;
storeIn[z][c] = audioArray;
}
h2 += h1;
}
- if (!m_abortAudioThumb) clip->updateAudioThumbnail(storeIn);
+ if (!m_abortAudioThumb) {
+ clip->setProperty("audio_max", QString::number(maxVolume - 64));
+ clip->updateAudioThumbnail(storeIn);
+ }
continue;
}
producer.set("video_index", "-1");
if (KdenliveSettings::normaliseaudiothumbs()) {
- Mlt::Filter m_convert(prof, "volume");
+ /*Mlt::Filter m_convert(prof, "volume");
m_convert.set("gain", "normalise");
- producer.attach(m_convert);
+ producer.attach(m_convert);*/
}
int last_val = 0;
QByteArray audioArray;
audioArray.resize(arrayWidth);
for (int i = 0; i < audioArray.size(); i++) {
- audioArray[i] = ((*(pcm + c + i * samples / audioArray.size())) >> 9) + 127 / 2 ;
+ double pcmval = *(pcm + c + i * samples / audioArray.size());
+ if (pcmval >= 0) {
+ pcmval = sqrt(pcmval) / 2.83 + 64;
+ audioArray[i] = pcmval;
+ if (pcmval > maxVolume) maxVolume = pcmval;
+ }
+ else {
+ pcmval = -sqrt(-pcmval) / 2.83 + 64;
+ audioArray[i] = pcmval;
+ if (-pcmval > maxVolume) maxVolume = -pcmval;
+ }
}
f.write(audioArray);
storeIn[z][c] = audioArray;
f.remove();
} else {
clip->updateAudioThumbnail(storeIn);
+ clip->setProperty("audio_max", QString::number(maxVolume - 64));
}
}
m_processingAudioThumbId.clear();
{
for (int i = 0; i < m_clipList.count(); i++) {
if (m_clipList.at(i)->getId() == clipId) {
- if (m_clipList.at(i)->clipType() != COLOR && m_clipList.at(i)->clipType() != SLIDESHOW && !m_clipList.at(i)->fileURL().isEmpty()) {
+ DocClipBase *clip = m_clipList.takeAt(i);
+ if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->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());
+ m_fileWatcher.removeFile(clip->fileURL().path());
}
- DocClipBase *clip = m_clipList.takeAt(i);
delete clip;
clip = NULL;
break;
copyjob->addMetaData("groupId", data.value("groupId"));
copyjob->addMetaData("comment", data.value("comment"));
copyjob->ui()->setWindow(kapp->activeWindow());
- connect(copyjob, SIGNAL(copyingDone(KIO::Job *, const KUrl &, const KUrl &, time_t, bool, bool)), this, SLOT(slotAddClip(KIO::Job *, const KUrl &, const KUrl &)));
+ connect(copyjob, SIGNAL(copyingDone(KIO::Job*,KUrl,KUrl,time_t,bool,bool)), this, SLOT(slotAddClip(KIO::Job*,KUrl,KUrl)));
continue;
}
}
if (type->name().startsWith("image/")) {
prod.setAttribute("type", (int) IMAGE);
prod.setAttribute("in", 0);
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()));
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1);
// Read EXIF metadata for JPEG
if (type->is("image/jpeg")) {
KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo);
const QHash<QString, KFileMetaInfoItem> metaInfoItems = metaInfo.items();
foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) {
- prod.setAttribute("meta.attr." + metaInfoItem.name().section('#', 1), metaInfoItem.value().toString());
+ QDomElement meta = doc.createElement("metaproperty");
+ meta.setAttribute("name", "meta.attr." + metaInfoItem.name().section('#', 1));
+ QDomText value = doc.createTextNode(metaInfoItem.value().toString());
+ meta.setAttribute("tool", "KDE Metadata");
+ meta.appendChild(value);
+ prod.appendChild(meta);
}
}
} else if (type->is("application/x-kdenlivetitle")) {
}
}
}
- QString titleData = txtdoc.toString();
- prod.setAttribute("xmldata", titleData);
prod.setAttribute("transparency", 1);
prod.setAttribute("in", 0);
- int out = txtdoc.documentElement().attribute("out").toInt();
- if (out > 0)
- prod.setAttribute("out", out);
- else
- prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()));
+ if (!txtdoc.documentElement().hasAttribute("out")) {
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1);
+ txtdoc.documentElement().setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1);
+ }
+ else {
+ int out = txtdoc.documentElement().attribute("out").toInt();
+ if (out >= 0)
+ prod.setAttribute("out", out);
+ else {
+ prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1);
+ txtdoc.documentElement().setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1);
+ }
+ }
+ QString titleData = txtdoc.toString();
+ prod.setAttribute("xmldata", titleData);
} else
txtfile.close();
}
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
prod.setAttribute("in", "0");
- prod.setAttribute("out", m_doc->getFramePos(duration));
+ prod.setAttribute("out", m_doc->getFramePos(duration) - 1);
prod.setAttribute("name", name);
if (!group.isEmpty()) {
prod.setAttribute("groupname", group);
-void ClipManager::slotAddTextClipFile(const QString &titleName, int out, const QString &xml, const QString &group, const QString &groupId)
+void ClipManager::slotAddTextClipFile(const QString &titleName, int duration, const QString &xml, const QString &group, const QString &groupId)
{
QDomDocument doc;
QDomElement prod = doc.createElement("producer");
prod.setAttribute("type", (int) TEXT);
prod.setAttribute("transparency", "1");
prod.setAttribute("in", "0");
- prod.setAttribute("out", out);
+ prod.setAttribute("out", duration - 1);
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
}
prod.setAttribute("transparency", "1");
prod.setAttribute("in", "0");
- int out = 0;
+ int duration = 0;
QDomDocument titledoc;
QFile txtfile(path.path());
if (txtfile.open(QIODevice::ReadOnly) && titledoc.setContent(&txtfile)) {
txtfile.close();
- out = titledoc.documentElement().attribute("out").toInt();
+ if (titledoc.documentElement().hasAttribute("duration")) {
+ duration = titledoc.documentElement().attribute("duration").toInt();
+ }
+ else {
+ // keep some time for backwards compatibility - 26/12/12
+ duration = titledoc.documentElement().attribute("out").toInt();
+ }
} else txtfile.close();
- if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration());
- prod.setAttribute("out", out);
+ if (duration == 0) duration = m_doc->getFramePos(KdenliveSettings::title_duration());
+ prod.setAttribute("out", duration - 1);
AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
m_doc->commandStack()->push(command);
projects / kdenlive / blobdiff