* *
***************************************************************************/
-
-#include <QFile>
-#include <qregexp.h>
-#include <QDir>
-#include <QIcon>
-
-#include <KDebug>
-#include <kglobal.h>
-#include <KStandardDirs>
-
#include "initeffects.h"
#include "kdenlivesettings.h"
#include "effectslist.h"
#include "effectstackedit.h"
#include "mainwindow.h"
-initEffectsThumbnailer::initEffectsThumbnailer() {
+#include <KDebug>
+#include <kglobal.h>
+#include <KStandardDirs>
+
+#include <QFile>
+#include <qregexp.h>
+#include <QDir>
+#include <QIcon>
+
+initEffectsThumbnailer::initEffectsThumbnailer() :
+ QThread()
+{
}
-void initEffectsThumbnailer::prepareThumbnailsCall(const QStringList& list) {
+void initEffectsThumbnailer::prepareThumbnailsCall(const QStringList& list)
+{
m_list = list;
start();
kDebug() << "done";
}
-void initEffectsThumbnailer::run() {
+void initEffectsThumbnailer::run()
+{
foreach(const QString &entry, m_list) {
kDebug() << entry;
if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) {
initEffectsThumbnailer initEffects::thumbnailer;
-initEffects::initEffects() {
-
-}
-
-initEffects::~initEffects() {
-}
-
-
// static
-void initEffects::refreshLumas() {
+void initEffects::refreshLumas()
+{
- // Check for Kdenlive installed luma files
- QStringList imagenamelist;
- QStringList imagefiles;
+ // Check for Kdenlive installed luma files, add empty string at start for no luma
+ QStringList imagenamelist = QStringList() << i18n("None");
+ QStringList imagefiles = QStringList() << QString();
QStringList filters;
filters << "*.pgm" << "*.png";
}
//static
-Mlt::Repository *initEffects::parseEffectFiles() {
+Mlt::Repository *initEffects::parseEffectFiles()
+{
QStringList::Iterator more;
QStringList::Iterator it;
QStringList fileList;
QString black = in.readLine().simplified();
if (!black.isEmpty() && !black.startsWith('#')) blackListed.append(black);
}
+ file.close();
}
- file.close();
// Check for blacklisted transitions
blacklist = KStandardDirs::locate("appdata", "blacklisted_transitions.txt");
QString black = in.readLine().simplified();
if (!black.isEmpty() && !black.startsWith('#')) blackListedtransitions.append(black);
}
+ file2.close();
}
- file2.close();
for (int i = 0 ; i < filters->count() ; i++) {
filtersList << filters->get_name(i);
for (int i = 0 ; i < producers->count() ; i++) {
producersList << producers->get_name(i);
}
+ KdenliveSettings::setProducerslist(producersList);
delete filters;
delete producers;
}
// static
-void initEffects::parseCustomEffectsFile() {
+void initEffects::parseCustomEffectsFile()
+{
MainWindow::customEffects.clear();
QString path = KStandardDirs::locateLocal("appdata", "effects/", true);
QDir directory = QDir(path);
filter << "*.xml";
const QStringList fileList = directory.entryList(filter, QDir::Files);
QString itemName;
- foreach(const QString filename, fileList) {
+ foreach(const QString &filename, fileList) {
itemName = KUrl(path + filename).path();
QDomDocument doc;
QFile file(itemName);
}
// static
-void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList) {
+void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *audioEffectList, EffectsList *videoEffectList, QString name, QStringList filtersList, QStringList producersList)
+{
QDomDocument doc;
QFile file(name);
doc.setContent(&file, false);
}
QString groupName;
if (doc.elementsByTagName("effectgroup").item(0).toElement().tagName() == "effectgroup") {
- groupName = documentElement.attribute("name", QString::null);
+ groupName = documentElement.attribute("name", QString());
}
int i = 0;
while (!effects.item(i).isNull()) {
documentElement = effects.item(i).toElement();
- QString tag = documentElement.attribute("tag", QString::null);
+ QString tag = documentElement.attribute("tag", QString());
bool ladspaOk = true;
if (tag == "ladspa") {
- QString library = documentElement.attribute("library", QString::null);
+ QString library = documentElement.attribute("library", QString());
if (KStandardDirs::locate("ladspa_plugin", library).isEmpty()) ladspaOk = false;
}
// Parse effect file
if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) {
- bool isAudioEffect = false;
- QString type = documentElement.attribute("type", QString::null);
+ QString type = documentElement.attribute("type", QString());
if (type == "audio") audioEffectList->append(documentElement);
else if (type == "custom") customEffectList->append(documentElement);
else videoEffectList->append(documentElement);
QDomNode propsnode = documentElement.elementsByTagName("properties").item(0);
if (!propsnode.isNull()) {
QDomElement propselement = propsnode.toElement();
- id = propselement.attribute("id", QString::null);
- effectTag = propselement.attribute("tag", QString::null);
- if (propselement.attribute("type", QString::null) == "audio") type = AUDIOEFFECT;
- else if (propselement.attribute("type", QString::null) == "custom") type = CUSTOMEFFECT;
+ id = propselement.attribute("id", QString());
+ effectTag = propselement.attribute("tag", QString());
+ if (propselement.attribute("type", QString()) == "audio") type = AUDIOEFFECT;
+ else if (propselement.attribute("type", QString()) == "custom") type = CUSTOMEFFECT;
else type = VIDEOEFFECT;
}
}
//static
-char* initEffects::ladspaEffectString(int ladspaId, QStringList params) {
+const char* initEffects::ladspaEffectString(int ladspaId, QStringList params)
+{
if (ladspaId == 1433) //Pitch
return ladspaPitchEffectString(params);
else if (ladspaId == 1216) //Room Reverb
return ladspaEqualizerEffectString(params);
else {
kDebug() << "++++++++++ ASKING FOR UNKNOWN LADSPA EFFECT: " << ladspaId << endl;
- return (char *) "<jackrack></jackrack>";
+ return "<jackrack></jackrack>";
}
}
//static
-void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringList params) {
- char *filterString;
+void initEffects::ladspaEffectFile(const QString & fname, int ladspaId, QStringList params)
+{
+ const char *filterString;
switch (ladspaId) {
case 1433: //Pitch
filterString = ladspaPitchEffectString(params);
stream << filterString;
f.close();
} else kDebug() << "++++++++++ ERROR CANNOT WRITE TO: " << KdenliveSettings::currenttmpfolder() + fname << endl;
- delete filterString;
+ delete [] filterString;
}
const QString jackString = "<?xml version=\"1.0\"?><!DOCTYPE jackrack SYSTEM \"http://purge.bash.sh/~rah/jack_rack_1.2.dtd\"><jackrack><channels>2</channels><samplerate>48000</samplerate><plugin><id>";
-char* initEffects::ladspaDeclipEffectString(QStringList) {
+const char* initEffects::ladspaDeclipEffectString(QStringList)
+{
return qstrdup(QString(jackString + "1195</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall></plugin></jackrack>").toUtf8());
}
/*
-char* initEffects::ladspaVocoderEffectString(QStringList params)
+const char* initEffects::ladspaVocoderEffectString(QStringList params)
{
return qstrdup( QString(jackString + "1441</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>0.000000</value><value>0.000000</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]));
}*/
-char* initEffects::ladspaVinylEffectString(QStringList params) {
+const char* initEffects::ladspaVinylEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1905</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow><controlrow><value>%3</value></controlrow><controlrow><value>%4</value></controlrow><controlrow><value>%5</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).arg(params[4]).toUtf8());
}
-char* initEffects::ladspaPitchEffectString(QStringList params) {
+const char* initEffects::ladspaPitchEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1433</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.0</value><value>1.0</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>4.000000</value><value>4.000000</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
}
-char* initEffects::ladspaRoomReverbEffectString(QStringList params) {
+const char* initEffects::ladspaRoomReverbEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1216</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>0.750000</value><value>0.750000</value></controlrow><controlrow><lock>true</lock><value>-70.000000</value><value>-70.000000</value></controlrow><controlrow><lock>true</lock><value>0.000000</value><value>0.000000</value></controlrow><controlrow><lock>true</lock><value>-17.500000</value><value>-17.500000</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
}
-char* initEffects::ladspaReverbEffectString(QStringList params) {
+const char* initEffects::ladspaReverbEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1423</id><enabled>true</enabled> <wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked> <wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values> <lockall>true</lockall><controlrow><lock>true</lock><value>%1</value> <value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>0.250000</value><value>0.250000</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).toUtf8());
}
-char* initEffects::ladspaEqualizerEffectString(QStringList params) {
+const char* initEffects::ladspaEqualizerEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1901</id><enabled>true</enabled> <wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked> <wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow> <controlrow><value>%3</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
}
-char* initEffects::ladspaLimiterEffectString(QStringList params) {
+const char* initEffects::ladspaLimiterEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1913</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><controlrow><value>%1</value></controlrow><controlrow><value>%2</value></controlrow><controlrow><value>%3</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).toUtf8());
}
-char* initEffects::ladspaPitchShifterEffectString(QStringList params) {
+const char* initEffects::ladspaPitchShifterEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1193</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
}
-char* initEffects::ladspaRateScalerEffectString(QStringList params) {
+const char* initEffects::ladspaRateScalerEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1417</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow></plugin></jackrack>").arg(params[0]).toUtf8());
}
-char* initEffects::ladspaPhaserEffectString(QStringList params) {
+const char* initEffects::ladspaPhaserEffectString(QStringList params)
+{
return qstrdup(QString(jackString + "1217</id><enabled>true</enabled><wet_dry_enabled>false</wet_dry_enabled><wet_dry_locked>true</wet_dry_locked><wet_dry_values><value>1.000000</value><value>1.000000</value></wet_dry_values><lockall>true</lockall><controlrow><lock>true</lock><value>%1</value><value>%1</value></controlrow><controlrow><lock>true</lock><value>%2</value><value>%2</value></controlrow><controlrow><lock>true</lock><value>%3</value><value>%3</value></controlrow><controlrow><lock>true</lock><value>%4</value><value>%4</value></controlrow></plugin></jackrack>").arg(params[0]).arg(params[1]).arg(params[2]).arg(params[3]).toUtf8());
}
-QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& type, const QString& filtername) {
+QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, const QString& /*type*/, const QString& filtername)
+{
QDomDocument ret;
Mlt::Properties *metadata = repository->metadata(filter_type, filtername.toAscii().data());
ret.appendChild(eff);
}
}
+ delete metadata;
+ metadata = 0;
/* QString outstr;
QTextStream str(&outstr);
ret.save(str, 2);
return ret;
}
-void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions, QStringList names) {
+void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions, QStringList names)
+{
// remove transitions that are not implemented
int pos = names.indexOf("mix");
if (pos != -1) names.takeAt(pos);
ktrans.appendChild(tname);
}
+ delete metadata;
+ metadata = 0;
//kDebug() << ret.toString();
} else {
- if (name == "luma") {
-
- tname.appendChild(ret.createTextNode("Luma"));
- desc.appendChild(ret.createTextNode("Applies a luma transition between the current and next frames"));
-
- // Check for Kdenlive installed luma files
- QStringList imagenamelist;
- QStringList imagefiles;
- QStringList filters;
- filters << "*.pgm" << "*.png";
-
- QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas");
- foreach(const QString &folder, customLumas) {
- QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
- foreach(const QString &fname, filesnames) {
- imagenamelist.append(fname);
- imagefiles.append(folder + '/' + fname);
- }
- }
-
- // Check for MLT lumas
- QString folder = mlt_environment("MLT_DATA");
- folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION"));
- QDir lumafolder(folder);
- QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
+ // Check for Kdenlive installed luma files, add empty string at start for no luma
+ QStringList imagenamelist = QStringList() << i18n("None");
+ QStringList imagefiles = QStringList() << QString();
+ QStringList filters;
+ filters << "*.pgm" << "*.png";
+
+ QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas");
+ foreach(const QString &folder, customLumas) {
+ QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
foreach(const QString &fname, filesnames) {
imagenamelist.append(fname);
imagefiles.append(folder + '/' + fname);
}
+ }
+
+ // Check for MLT lumas
+ QString folder = mlt_environment("MLT_DATA");
+ folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION"));
+ QDir lumafolder(folder);
+ QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
+ foreach(const QString &fname, filesnames) {
+ imagenamelist.append(fname);
+ imagefiles.append(folder + '/' + fname);
+ }
+
+ if (name == "luma") {
+
+ tname.appendChild(ret.createTextNode("Luma"));
+ desc.appendChild(ret.createTextNode("Applies a luma transition between the current and next frames"));
paramList.append(quickParameterFill(ret, "Softness", "softness", "double", "0", "0", "100", "", "", "100"));
paramList.append(quickParameterFill(ret, "Invert", "invert", "bool", "0", "0", "1"));
- paramList.append(quickParameterFill(ret, "ImageFile", "resource", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
+ paramList.append(quickParameterFill(ret, "Image File", "resource", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
paramList.append(quickParameterFill(ret, "Reverse Transition", "reverse", "bool", "0", "0", "1"));
//thumbnailer.prepareThumbnailsCall(imagelist);
} else if (name == "composite") {
desc.appendChild(ret.createTextNode("A key-framable alpha-channel compositor for two frames."));
paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100"));
- paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "1", "1", "1"));
+ paramList.append(quickParameterFill(ret, "Alpha Channel Operation", "operator", "list", "over", "", "", "over,and,or,xor", "over,and,or,xor"));
+ paramList.append(quickParameterFill(ret, "Align", "aligned", "bool", "1", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Fill", "fill", "bool", "0", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "0", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Luma Image File", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
+ paramList.append(quickParameterFill(ret, "Luma Softness", "softness", "double", "0", "0", "100", "", "", "100"));
+ paramList.append(quickParameterFill(ret, "Luma Invert", "luma_invert", "bool", "0", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Force Progressive Rendering", "progressive", "bool", "1", "0", "1"));
+ paramList.append(quickParameterFill(ret, "Force Deinterlace Overlay", "deinterlace", "bool", "0", "0", "1"));
tname.appendChild(ret.createTextNode("Composite"));
- QDomDocument ret1;
+
+ ktrans.setAttribute("id", "composite");
+ /*QDomDocument ret1;
QDomElement ktrans1 = ret1.createElement("ktransition");
ret1.appendChild(ktrans1);
ktrans1.setAttribute("tag", name);
QDomElement tname1 = ret.createElement("name");
- tname1.appendChild(ret1.createTextNode("PIP"));
+ tname1.appendChild(ret1.createTextNode("PIP"));*/
} else if (name == "mix") {
tname.appendChild(ret.createTextNode("Mix"));
transitions->append(ret.documentElement());
//kDebug() << "//// //// TRANSITON XML";
- kDebug() << ret.toString();
+ // kDebug() << ret.toString();
/*
<transition fill="1" in="11" a_track="1" out="73" mlt_service="luma" b_track="2" softness="0" resource="/home/marco/Projekte/kdenlive/install_cmake/share/apps/kdenlive/pgm/PAL/square2.pgm" />
ret.setContent(wipetrans);
transitions->append(ret.documentElement());
- QString alphatrans = "<ktransition tag=\"composite\" id=\"alphatransparency\" ><name>Alpha transparency</name><description>Make alpha channel transparent</description><parameter tag=\"geometry\" type=\"fixed\" default=\"0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name></parameter><parameter tag=\"fill\" default=\"0\" type=\"bool\" name=\"fill\" ><name>Rescale</name></parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter></ktransition>";
+
/*QString alphatrans = "<ktransition tag=\"composite\" id=\"alphatransparency\" ><name>Alpha transparency</name><description>Make alpha channel transparent</description><parameter tag=\"geometry\" type=\"fixed\" default=\"0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name></parameter><parameter tag=\"fill\" default=\"0\" type=\"bool\" name=\"fill\" ><name>Rescale</name></parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter></ktransition>";
QDomDocument ret2;
ret2.setContent(alphatrans);
- transitions->append(ret2.documentElement());
+ transitions->append(ret2.documentElement());*/
}
-QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format) {
+QDomElement initEffects::quickParameterFill(QDomDocument & doc, QString name, QString tag, QString type, QString def, QString min, QString max, QString list, QString listdisplaynames, QString factor, QString namedesc, QString format)
+{
QDomElement parameter = doc.createElement("parameter");
parameter.setAttribute("tag", tag);
parameter.setAttribute("default", def);
projects / kdenlive / blobdiff