#include "abstractclipitem.h"
#include "abstractgroupitem.h"
#include "titledocument.h"
+#include "subprojectitem.h"
#include "kthumb.h"
#include <mlt++/Mlt.h>
QMap<QString, int>::const_iterator i;
int max;
int done = 0;
+ int thumbType = 0; // 0 = timeline thumb, 1 = project clip zone thumb, 2 = clip properties thumb
+
while (!m_requestedThumbs.isEmpty() && !m_abortThumb) {
m_thumbsMutex.lock();
i = m_requestedThumbs.constBegin();
m_processingThumbId = i.key();
QList<int> values = m_requestedThumbs.values(m_processingThumbId);
m_requestedThumbs.remove(m_processingThumbId);
+ if (m_processingThumbId.startsWith("?")) {
+ // if id starts with ?, it means the request comes from a clip property widget
+ thumbType = 2;
+ m_processingThumbId.remove(0, 1);
+ }
+ if (m_processingThumbId.startsWith("#")) {
+ // if id starts with #, it means the request comes from project tree
+ thumbType = 1;
+ m_processingThumbId.remove(0, 1);
+ }
m_thumbsMutex.unlock();
qSort(values);
DocClipBase *clip = getClipById(m_processingThumbId);
if (!clip) continue;
max = m_requestedThumbs.size() + values.count();
+ int pos;
while (!values.isEmpty() && clip->thumbProducer() && !m_abortThumb) {
- clip->thumbProducer()->getThumb(values.takeFirst());
+ pos = values.takeFirst();
+ switch (thumbType) {
+ case 1:
+ clip->thumbProducer()->getGenericThumb(pos, SubProjectItem::itemDefaultHeight(), thumbType);
+ break;
+ case 2:
+ clip->thumbProducer()->getGenericThumb(pos, 180, thumbType);
+ break;
+ default:
+ clip->thumbProducer()->getThumb(pos);
+ }
done++;
if (max > 3) emit displayMessage(i18n("Loading thumbnails"), 100 * done / max);
}
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 = 48000;
+ int channels = 2;
+ QString data = clip->getProperty("frequency");
+ if (!data.isEmpty()) frequency = data.toInt();
+ data = clip->getProperty("channels");
+ if (!data.isEmpty()) channels = data.toInt();
+ 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();
void ClipManager::slotAddClip(KIO::Job *job, const KUrl &, const KUrl &dst)
{
KIO::MetaData meta = job->metaData();
+ QMap <QString, QString> data;
+ data.insert("group", meta.value("group"));
+ data.insert("groupid", meta.value("groupid"));
+ data.insert("comment", meta.value("comment"));
kDebug()<<"Finished copying: "<<dst<<" / "<<meta.value("group")<<" / "<<meta.value("groupid");
- slotAddClipList(KUrl::List () << dst, meta.value("group"), meta.value("groupid"), meta.value("comment"));
+ slotAddClipList(KUrl::List () << dst, data);
}
-void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId, const QString &comment)
+void ClipManager::slotAddClipList(const KUrl::List urls, QMap <QString, QString> data)
{
QUndoCommand *addClips = new QUndoCommand();
// Update list of removable volumes
listRemovableVolumes();
foreach(const KUrl & file, urls) {
if (QFile::exists(file.path())) {//KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
- if (!getClipByResource(file.path()).empty()) {
+ if (!data.contains("bypassDuplicate") && !getClipByResource(file.path()).empty()) {
if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel)
continue;
}
//KIO::filesize_t m_requestedSize;
KIO::CopyJob *copyjob = KIO::copy (file, KUrl(sourcesFolder));
//TODO: for some reason, passing metadata does not work...
- copyjob->addMetaData("group", group);
- copyjob->addMetaData("groupId", groupId);
- copyjob->addMetaData("comment", comment);
+ copyjob->addMetaData("group", data.value("group"));
+ 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 &)));
continue;
prod.setAttribute("resource", file.path());
uint id = m_clipIdCounter++;
prod.setAttribute("id", QString::number(id));
- if (!comment.isEmpty()) prod.setAttribute("description", comment);
- if (!group.isEmpty()) {
- prod.setAttribute("groupname", group);
- prod.setAttribute("groupid", groupId);
+ if (data.contains("comment")) prod.setAttribute("description", data.value("comment"));
+ if (data.contains("group")) {
+ prod.setAttribute("groupname", data.value("group"));
+ prod.setAttribute("groupid", data.value("groupId"));
}
+ if (data.contains("video_index")) prod.setAttribute("video_index", data.value("video_index"));
+ if (data.contains("audio_index")) prod.setAttribute("audio_index", data.value("audio_index"));
+
KMimeType::Ptr type = KMimeType::findByUrl(file);
if (type->name().startsWith("image/")) {
prod.setAttribute("type", (int) IMAGE);
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());
+ prod.setAttribute("meta.attr." + metaInfoItem.name().section('#', 1), metaInfoItem.value().toString());
}
}
} else if (type->is("application/x-kdenlivetitle")) {
}
}
-void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId, const QString &comment)
+void ClipManager::slotAddClipFile(const KUrl &url, QMap <QString, QString> data)
{
- slotAddClipList(KUrl::List(url), group, groupId, comment);
+ slotAddClipList(KUrl::List(url), data);
}
void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)
return volumeMatch;
}
-
+void ClipManager::projectTreeThumbReady(const QString &id, int frame, QImage img, int type)
+{
+ switch (type) {
+ case 2:
+ emit gotClipPropertyThumbnail(id, img);
+ break;
+ default:
+ emit thumbReady(id, frame, img);
+ }
+}
projects / kdenlive / blobdiff