From: <j-...@us...> - 2009-03-13 11:31:05
|
Revision: 3150 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3150&view=rev Author: j-b-m Date: 2009-03-13 11:30:45 +0000 (Fri, 13 Mar 2009) Log Message: ----------- backport commit from Dan Dennedy: add Align option to Composite transition and default Distort off Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-03-13 10:51:12 UTC (rev 3149) +++ trunk/kdenlive/src/initeffects.cpp 2009-03-13 11:30:45 UTC (rev 3150) @@ -649,7 +649,8 @@ } 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, "Distort", "distort", "bool", "0", "0", "1")); + paramList.append(quickParameterFill(ret, "Align", "aligned", "bool", "1", "0", "1")); tname.appendChild(ret.createTextNode("Composite")); ktrans.setAttribute("id", "composite"); /*QDomDocument ret1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-15 14:56:04
|
Revision: 3157 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3157&view=rev Author: j-b-m Date: 2009-03-15 14:55:51 +0000 (Sun, 15 Mar 2009) Log Message: ----------- add Fill, Deinterlace, Progressive, Operation, and Luma parameters to the Composite transition [PATCH from Dan Dennedy] Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-03-15 01:59:00 UTC (rev 3156) +++ trunk/kdenlive/src/initeffects.cpp 2009-03-15 14:55:51 UTC (rev 3157) @@ -610,36 +610,36 @@ //kDebug() << ret.toString(); } else { - if (name == "luma") { + // Check for Kdenlive installed luma files + QStringList imagenamelist; + QStringList imagefiles; + QStringList filters; + filters << "*.pgm" << "*.png"; - 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); + 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(","))); @@ -649,9 +649,17 @@ } 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, "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, "Align", "aligned", "bool", "1", "0", "1")); + paramList.append(quickParameterFill(ret, "Luma ImageFile", "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", "0", "0", "1")); + paramList.append(quickParameterFill(ret, "Force Deinterlace Overlay", "deinterlace", "bool", "0", "0", "1")); tname.appendChild(ret.createTextNode("Composite")); + ktrans.setAttribute("id", "composite"); /*QDomDocument ret1; QDomElement ktrans1 = ret1.createElement("ktransition"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-03-15 15:00:58
|
Revision: 3158 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3158&view=rev Author: j-b-m Date: 2009-03-15 15:00:40 +0000 (Sun, 15 Mar 2009) Log Message: ----------- ImageFile is inconsistent with the rest of the UI - it should be spaced [PATCH by Dan Dennedy] Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-03-15 14:55:51 UTC (rev 3157) +++ trunk/kdenlive/src/initeffects.cpp 2009-03-15 15:00:40 UTC (rev 3158) @@ -642,7 +642,7 @@ 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); @@ -653,7 +653,7 @@ 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 ImageFile", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(","))); + 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", "0", "0", "1")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ra...@us...> - 2009-04-05 01:29:10
|
Revision: 3216 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3216&view=rev Author: rayll Date: 2009-04-05 01:29:01 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Only close files if they are actually open Signed-off-by: Ray Lehtiniemi <ra...@ma...> Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-04-05 01:28:13 UTC (rev 3215) +++ trunk/kdenlive/src/initeffects.cpp 2009-04-05 01:29:01 UTC (rev 3216) @@ -133,8 +133,8 @@ 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"); @@ -148,8 +148,8 @@ 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ra...@us...> - 2009-04-10 14:43:15
|
Revision: 3272 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3272&view=rev Author: rayll Date: 2009-04-10 14:43:13 +0000 (Fri, 10 Apr 2009) Log Message: ----------- [valgrind] fix memleak Signed-off-by: Ray Lehtiniemi <ra...@ma...> Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-04-10 08:42:26 UTC (rev 3271) +++ trunk/kdenlive/src/initeffects.cpp 2009-04-10 14:43:13 UTC (rev 3272) @@ -547,6 +547,8 @@ ret.appendChild(eff); } } + delete metadata; + metadata = 0; /* QString outstr; QTextStream str(&outstr); ret.save(str, 2); @@ -622,6 +624,8 @@ ktrans.appendChild(tname); } + delete metadata; + metadata = 0; //kDebug() << ret.toString(); } else { // Check for Kdenlive installed luma files, add empty string at start for no luma This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ra...@us...> - 2009-04-10 15:05:56
|
Revision: 3280 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3280&view=rev Author: rayll Date: 2009-04-10 15:05:55 +0000 (Fri, 10 Apr 2009) Log Message: ----------- [PATCH 5/6] qstrdup requires array delete Signed-off-by: Ray Lehtiniemi <ra...@ma...> Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-04-10 15:05:39 UTC (rev 3279) +++ trunk/kdenlive/src/initeffects.cpp 2009-04-10 15:05:55 UTC (rev 3280) @@ -414,7 +414,7 @@ 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>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-04-11 07:03:43
|
Revision: 3285 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3285&view=rev Author: ddennedy Date: 2009-04-11 07:03:34 +0000 (Sat, 11 Apr 2009) Log Message: ----------- default Composite transition to use progressive rendering (bug 730) Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-04-10 17:16:57 UTC (rev 3284) +++ trunk/kdenlive/src/initeffects.cpp 2009-04-11 07:03:34 UTC (rev 3285) @@ -674,7 +674,7 @@ 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", "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")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-04-15 07:44:22
|
Revision: 3311 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3311&view=rev Author: j-b-m Date: 2009-04-15 07:44:21 +0000 (Wed, 15 Apr 2009) Log Message: ----------- Add deinterlace options to wipe transition (same as composite transition) Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-04-15 07:42:57 UTC (rev 3310) +++ trunk/kdenlive/src/initeffects.cpp 2009-04-15 07:44:21 UTC (rev 3311) @@ -678,7 +678,6 @@ 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")); - ktrans.setAttribute("id", "composite"); /*QDomDocument ret1; QDomElement ktrans1 = ret1.createElement("ktransition"); @@ -731,7 +730,7 @@ */ } - QString wipetrans = "<ktransition tag=\"composite\" id=\"wipe\"><name>Wipe</name><description>Slide image from one side to another</description><parameter tag=\"geometry\" type=\"wipe\" default=\"-100%,0%:100%x100%;-1=0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name> </parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter></ktransition>"; + QString wipetrans = "<ktransition tag=\"composite\" id=\"wipe\"><name>Wipe</name><description>Slide image from one side to another</description><parameter tag=\"geometry\" type=\"wipe\" default=\"-100%,0%:100%x100%;-1=0%,0%:100%x100%\" name=\"geometry\"><name>Direction</name> </parameter><parameter tag=\"aligned\" default=\"0\" type=\"bool\" name=\"aligned\" ><name>Align</name></parameter><parameter tag=\"progressive\" default=\"1\" type=\"bool\" name=\"progressive\" ><name>Force Progressive Rendering</name></parameter><parameter tag=\"deinterlace\" default=\"0\" type=\"bool\" name=\"deinterlace\" ><name>Force Deinterlace Overlay</name></parameter></ktransition>"; QDomDocument ret; ret.setContent(wipetrans); transitions->append(ret.documentElement()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-08 11:48:47
|
Revision: 3365 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3365&view=rev Author: j-b-m Date: 2009-05-08 11:48:44 +0000 (Fri, 08 May 2009) Log Message: ----------- small cleanup Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-05-05 03:57:12 UTC (rev 3364) +++ trunk/kdenlive/src/initeffects.cpp 2009-05-08 11:48:44 UTC (rev 3365) @@ -187,7 +187,7 @@ kDebug() << "// INIT EFFECT SEARCH" << endl; - QStringList direc = KGlobal::dirs()->findDirs("data", "kdenlive/effects"); + QStringList direc = KGlobal::dirs()->findDirs("appdata", "effects"); QDir directory; for (more = direc.begin() ; more != direc.end() ; ++more) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-24 22:27:37
|
Revision: 3411 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3411&view=rev Author: j-b-m Date: 2009-05-24 22:27:23 +0000 (Sun, 24 May 2009) Log Message: ----------- Fix LADSPA path on 64bit system, patch by Zarko Pintar Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-05-24 21:22:10 UTC (rev 3410) +++ trunk/kdenlive/src/initeffects.cpp 2009-05-24 22:27:23 UTC (rev 3411) @@ -184,6 +184,8 @@ KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib/ladspa"); KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/lib/ladspa"); KGlobal::dirs()->addResourceDir("ladspa_plugin", "/opt/local/lib/ladspa"); + KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib64/ladspa"); + KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib64/ladspa"); kDebug() << "// INIT EFFECT SEARCH" << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-07-03 06:08:49
|
Revision: 3724 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3724&view=rev Author: ddennedy Date: 2009-07-03 06:08:33 +0000 (Fri, 03 Jul 2009) Log Message: ----------- Fix path to MLT luma wipe files. Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2009-07-02 11:24:04 UTC (rev 3723) +++ trunk/kdenlive/src/initeffects.cpp 2009-07-03 06:08:33 UTC (rev 3724) @@ -81,13 +81,16 @@ } // Check for MLT lumas - QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash); - folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION")); - QDir lumafolder(folder); + KUrl folder(mlt_environment("MLT_DATA")); + folder.addPath("lumas"); + folder.addPath(mlt_environment("MLT_NORMALISATION")); + QDir lumafolder(folder.path()); QStringList filesnames = lumafolder.entryList(filters, QDir::Files); foreach(const QString &fname, filesnames) { imagenamelist.append(fname); - imagefiles.append(folder + fname); + KUrl path(folder); + path.addPath(fname); + imagefiles.append(path.toLocalFile()); } QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma"); QDomNodeList params = lumaTransition.elementsByTagName("parameter"); @@ -657,13 +660,16 @@ } // Check for MLT lumas - QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash); - folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION")); - QDir lumafolder(folder); + KUrl folder(mlt_environment("MLT_DATA")); + folder.addPath("lumas"); + folder.addPath(mlt_environment("MLT_NORMALISATION")); + QDir lumafolder(folder.path()); QStringList filesnames = lumafolder.entryList(filters, QDir::Files); foreach(const QString &fname, filesnames) { imagenamelist.append(fname); - imagefiles.append(folder + fname); + KUrl path(folder); + path.addPath(fname); + imagefiles.append(path.toLocalFile()); } if (name == "luma") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-02-01 09:12:17
|
Revision: 4265 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4265&view=rev Author: ddennedy Date: 2010-02-01 09:12:11 +0000 (Mon, 01 Feb 2010) Log Message: ----------- Enable the Fill option in Composite by default. Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2010-02-01 08:53:57 UTC (rev 4264) +++ trunk/kdenlive/src/initeffects.cpp 2010-02-01 09:12:11 UTC (rev 4265) @@ -689,7 +689,7 @@ 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, "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, "Fill", "fill", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "0", "0", "1")); paramList.append(quickParameterFill(ret, "Wipe File", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(","))); paramList.append(quickParameterFill(ret, "Wipe Softness", "softness", "double", "0", "0", "100", "", "", "100")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-05-01 06:10:30
|
Revision: 4407 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4407&view=rev Author: ddennedy Date: 2010-05-01 06:10:24 +0000 (Sat, 01 May 2010) Log Message: ----------- Fix initialization of AffineComposite Transition geometry (1539) Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2010-04-29 18:26:57 UTC (rev 4406) +++ trunk/kdenlive/src/initeffects.cpp 2010-05-01 06:10:24 UTC (rev 4407) @@ -723,7 +723,7 @@ paramList.append(quickParameterFill(ret, "Fix Shear Z", "fix_shear_z", "double", "0", "0", "360")); paramList.append(quickParameterFill(ret, "Mirror", "mirror_off", "bool", "0", "0", "1")); paramList.append(quickParameterFill(ret, "Repeat", "repeat_off", "bool", "0", "0", "1")); - paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0;0;100;100;100", "0;0;100;100;100", "0;0;100;100;100")); + paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%")); tname.appendChild(ret.createTextNode("Composite")); } else if (name == "region") { tname.appendChild(ret.createTextNode("Region")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-06-18 03:23:14
|
Revision: 4522 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4522&view=rev Author: ddennedy Date: 2010-06-18 03:23:08 +0000 (Fri, 18 Jun 2010) Log Message: ----------- The mirror and repeat options do not work with Kdenlive's usage of MLT affine transition. Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2010-06-18 03:21:29 UTC (rev 4521) +++ trunk/kdenlive/src/initeffects.cpp 2010-06-18 03:23:08 UTC (rev 4522) @@ -751,8 +751,6 @@ paramList.append(quickParameterFill(ret, i18n("Fix Shear Y"), "fix_shear_y", "double", "0", "0", "360")); paramList.append(quickParameterFill(ret, i18n("Fix Shear X"), "fix_shear_x", "double", "0", "0", "360")); paramList.append(quickParameterFill(ret, i18n("Fix Shear Z"), "fix_shear_z", "double", "0", "0", "360")); - paramList.append(quickParameterFill(ret, i18n("Mirror"), "mirror_off", "bool", "0", "0", "1")); - paramList.append(quickParameterFill(ret, i18n("Repeat"), "repeat_off", "bool", "0", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "", "", "", "", "", "false")); } else if (name == "mix") { tname.appendChild(ret.createTextNode(i18n("Mix"))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2011-01-02 20:59:42
|
Revision: 5244 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5244&view=rev Author: ttill Date: 2011-01-02 20:59:35 +0000 (Sun, 02 Jan 2011) Log Message: ----------- fix memleak Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-01-02 20:05:38 UTC (rev 5243) +++ trunk/kdenlive/src/initeffects.cpp 2011-01-02 20:59:35 UTC (rev 5244) @@ -340,8 +340,10 @@ Mlt::Properties *metadata = repository->metadata(filter_type, tag.toUtf8().data()); if (metadata && metadata->is_valid()) { double version = atof(metadata->get("version")); - if (documentElement.attribute("version").toDouble() > version) + if (documentElement.attribute("version").toDouble() > version) { + delete metadata; return; + } } delete metadata; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-01-04 20:43:03
|
Revision: 5265 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5265&view=rev Author: j-b-m Date: 2011-01-04 20:42:57 +0000 (Tue, 04 Jan 2011) Log Message: ----------- Fix startup crash Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-01-04 20:12:23 UTC (rev 5264) +++ trunk/kdenlive/src/initeffects.cpp 2011-01-04 20:42:57 UTC (rev 5265) @@ -339,7 +339,7 @@ // a specific version of the filter is required Mlt::Properties *metadata = repository->metadata(filter_type, tag.toUtf8().data()); if (metadata && metadata->is_valid()) { - double version = atof(metadata->get("version")); + double version = metadata->get_double("version"); if (documentElement.attribute("version").toDouble() > version) { delete metadata; return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-01-08 16:48:23
|
Revision: 5301 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5301&view=rev Author: j-b-m Date: 2011-01-08 16:48:17 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Fix translation of composite transition parameters Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-01-08 13:47:05 UTC (rev 5300) +++ trunk/kdenlive/src/initeffects.cpp 2011-01-08 16:48:17 UTC (rev 5301) @@ -761,7 +761,7 @@ tname.appendChild(ret.createTextNode(i18n("Composite"))); desc.appendChild(ret.createTextNode(i18n("A key-framable alpha-channel compositor for two frames."))); paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); - paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "operator", "list", "over", "", "", "over,and,or,xor", "over,and,or,xor")); + paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "operator", "list", "over", "", "", "over,and,or,xor", i18n("Over,And,Or,Xor"))); paramList.append(quickParameterFill(ret, i18n("Align"), "aligned", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Fill"), "fill", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Distort"), "distort", "bool", "0", "0", "1")); @@ -793,7 +793,7 @@ desc.appendChild(ret.createTextNode(i18n("Use alpha channel of another clip to create a transition."))); paramList.append(quickParameterFill(ret, i18n("Transparency clip"), "resource", "url", "", "", "", "", "", "")); paramList.append(quickParameterFill(ret, i18n("Geometry"), "composite.geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100")); - paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "composite.operator", "list", "over", "", "", "over,and,or,xor", "over,and,or,xor")); + paramList.append(quickParameterFill(ret, i18n("Alpha Channel Operation"), "composite.operator", "list", "over", "", "", "over,and,or,xor", i18n("Over,And,Or,Xor"))); paramList.append(quickParameterFill(ret, i18n("Align"), "composite.aligned", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Fill"), "composite.fill", "bool", "1", "0", "1")); paramList.append(quickParameterFill(ret, i18n("Distort"), "composite.distort", "bool", "0", "0", "1")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2011-01-25 06:18:06
|
Revision: 5351 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5351&view=rev Author: ddennedy Date: 2011-01-25 06:18:00 +0000 (Tue, 25 Jan 2011) Log Message: ----------- Enable opacity in the geometry widget of Affine transition. Opacity in affine works in the latest version of MLT. Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-01-24 08:47:38 UTC (rev 5350) +++ trunk/kdenlive/src/initeffects.cpp 2011-01-25 06:18:00 UTC (rev 5351) @@ -784,7 +784,7 @@ paramList.append(quickParameterFill(ret, i18n("Fix Shear Y"), "fix_shear_y", "double", "0", "0", "360")); paramList.append(quickParameterFill(ret, i18n("Fix Shear X"), "fix_shear_x", "double", "0", "0", "360")); paramList.append(quickParameterFill(ret, i18n("Fix Shear Z"), "fix_shear_z", "double", "0", "0", "360")); - paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "", "", "", "", "", "false")); + paramList.append(quickParameterFill(ret, i18n("Geometry"), "geometry", "geometry", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "0,0,100%,100%,100%", "", "", "", "", "", "true")); } else if (name == "mix") { tname.appendChild(ret.createTextNode(i18n("Mix"))); } else if (name == "region") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-05-15 07:13:22
|
Revision: 5589 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5589&view=rev Author: j-b-m Date: 2011-05-15 07:13:16 +0000 (Sun, 15 May 2011) Log Message: ----------- Fix LADSPA effects listed under video: http://kdenlive.org/mantis/view.php?id=2123 Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-05-12 02:16:22 UTC (rev 5588) +++ trunk/kdenlive/src/initeffects.cpp 2011-05-15 07:13:16 UTC (rev 5589) @@ -264,15 +264,19 @@ effectInfo = MainWindow::videoEffects.at(i); effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); } - // Add remaining filters to the list of video effects. + // Add remaining filters foreach(const QString & filtername, filtersList) { QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername); if (!doc.isNull()) effectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); } MainWindow::videoEffects.clearList(); - foreach(const QDomElement & effect, effectsMap) - MainWindow::videoEffects.append(effect); + foreach(const QDomElement & effect, effectsMap) { + if (effect.attribute("type") == "audio") + MainWindow::audioEffects.append(effect); + else + MainWindow::videoEffects.append(effect); + } return repository; } @@ -580,8 +584,10 @@ if (metadata && metadata->is_valid()) { if (metadata->get("title") && metadata->get("identifier")) { QDomElement eff = ret.createElement("effect"); - eff.setAttribute("tag", metadata->get("identifier")); - eff.setAttribute("id", metadata->get("identifier")); + QString id = metadata->get("identifier"); + eff.setAttribute("tag", id); + eff.setAttribute("id", id); + if (id.startsWith("ladspa")) eff.setAttribute("type", "audio"); QDomElement name = ret.createElement("name"); name.appendChild(ret.createTextNode(metadata->get("title"))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-05-21 17:07:36
|
Revision: 5603 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5603&view=rev Author: j-b-m Date: 2011-05-21 17:07:30 +0000 (Sat, 21 May 2011) Log Message: ----------- Fix effect's creation Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-05-20 07:45:09 UTC (rev 5602) +++ trunk/kdenlive/src/initeffects.cpp 2011-05-21 17:07:30 UTC (rev 5603) @@ -238,47 +238,59 @@ */ QDomElement effectInfo; QMap<QString, QDomElement> effectsMap; + QMap<QString, QDomElement> videoEffectsMap; + QMap<QString, QDomElement> audioEffectsMap; + + // Create transitions for (int i = 0; i < MainWindow::transitions.count(); ++i) { effectInfo = MainWindow::transitions.at(i); effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); } MainWindow::transitions.clearList(); foreach(const QDomElement & effect, effectsMap) - MainWindow::transitions.append(effect); + MainWindow::transitions.append(effect); effectsMap.clear(); + + // Create custom effects for (int i = 0; i < MainWindow::customEffects.count(); ++i) { effectInfo = MainWindow::customEffects.at(i); effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); } MainWindow::customEffects.clearList(); foreach(const QDomElement & effect, effectsMap) - MainWindow::customEffects.append(effect); + MainWindow::customEffects.append(effect); effectsMap.clear(); + + // Create effects from MLT + foreach(const QString & filtername, filtersList) { + QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername); + if (!doc.isNull()) { + //kDebug()<<"ADDING: "<<doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(); + if (doc.documentElement().attribute("type") == "audio") { + audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); + } + else + videoEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); + } + } + + // Create audio effects for (int i = 0; i < MainWindow::audioEffects.count(); ++i) { effectInfo = MainWindow::audioEffects.at(i); - effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); + audioEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); } MainWindow::audioEffects.clearList(); - foreach(const QDomElement & effect, effectsMap) - MainWindow::audioEffects.append(effect); - effectsMap.clear(); + foreach(const QDomElement & effect, audioEffectsMap) + MainWindow::audioEffects.append(effect); + + // Create video effects for (int i = 0; i < MainWindow::videoEffects.count(); ++i) { effectInfo = MainWindow::videoEffects.at(i); - effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); + videoEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); } - // Add remaining filters - foreach(const QString & filtername, filtersList) { - QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername); - if (!doc.isNull()) - effectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); - } MainWindow::videoEffects.clearList(); - foreach(const QDomElement & effect, effectsMap) { - if (effect.attribute("type") == "audio") - MainWindow::audioEffects.append(effect); - else - MainWindow::videoEffects.append(effect); - } + foreach(const QDomElement & effect, videoEffectsMap) + MainWindow::videoEffects.append(effect); return repository; } @@ -354,16 +366,8 @@ delete metadata; } - bool ladspaOk = true; - if (tag == "ladspa") { - //WARNING: old LADSPA xml effects are deprecated, so hide them - /*QString library = documentElement.attribute("library", QString()); - if (KStandardDirs::locate("ladspa_plugin", library).isEmpty()) ladspaOk = false;*/ - ladspaOk = false; - } - // Parse effect information. - if ((filtersList.contains(tag) || producersList.contains(tag)) && ladspaOk) { + if ((filtersList.contains(tag) || producersList.contains(tag))) { QString type = documentElement.attribute("type", QString()); if (type == "audio") audioEffectList->append(documentElement); @@ -621,22 +625,24 @@ if (paramdesc.get("maximum")) params.setAttribute("max", paramdesc.get("maximum")); if (paramdesc.get("minimum")) params.setAttribute("min", paramdesc.get("minimum")); - if (QString(paramdesc.get("type")) == "integer") + + QString paramType = paramdesc.get("type"); + + if (paramType == "integer") params.setAttribute("type", "constant"); - if (QString(paramdesc.get("type")) == "float") { + else if (paramType == "float") { params.setAttribute("type", "constant"); // param type is float, set default decimals to 3 params.setAttribute("decimals", "3"); } - if (QString(paramdesc.get("type")) == "boolean") + else if (paramType == "boolean") params.setAttribute("type", "bool"); - if (!QString(paramdesc.get("format")).isEmpty() && QString(paramdesc.get("type")) != "geometry") { + else if (paramType == "geometry") { params.setAttribute("type", "geometry"); - params.setAttribute("format", paramdesc.get("format")); } - if (!QString(paramdesc.get("format")).isEmpty() && QString(paramdesc.get("type")) == "geometry") { - params.setAttribute("type", "geometry"); - //params.setAttribute("format", paramdesc.get("format")); + else { + params.setAttribute("type", paramType); + if (!QString(paramdesc.get("format")).isEmpty()) params.setAttribute("format", paramdesc.get("format")); } if (paramdesc.get("default")) params.setAttribute("default", paramdesc.get("default")); if (paramdesc.get("value")) { @@ -645,7 +651,6 @@ params.setAttribute("value", paramdesc.get("default")); } - QDomElement pname = ret.createElement("name"); pname.appendChild(ret.createTextNode(paramdesc.get("title"))); params.appendChild(pname); @@ -657,7 +662,7 @@ } delete metadata; metadata = 0; - /* QString outstr; + /*QString outstr; QTextStream str(&outstr); ret.save(str, 2); kDebug() << outstr;*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-06-02 12:38:03
|
Revision: 5631 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5631&view=rev Author: j-b-m Date: 2011-06-02 12:37:57 +0000 (Thu, 02 Jun 2011) Log Message: ----------- Workaround MLT's empty metadata for some transitions Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-06-02 12:27:46 UTC (rev 5630) +++ trunk/kdenlive/src/initeffects.cpp 2011-06-02 12:37:57 UTC (rev 5631) @@ -703,6 +703,10 @@ path.addPath(fname); imagefiles.append(path.toLocalFile()); } + + //WARNING: this is a hack to get around temporary invalid metadata in MLT, 2nd of june 2011 JBM + QStringList customTransitions; + customTransitions << "composite" << "luma" << "affine" << "mix" << "region"; foreach(const QString & name, names) { QDomDocument ret; @@ -715,7 +719,7 @@ ktrans.appendChild(tname); ktrans.appendChild(desc); Mlt::Properties *metadata = repository->metadata(transition_type, name.toUtf8().data()); - if (metadata && metadata->is_valid()) { + if (!customTransitions.contains(name) && metadata && metadata->is_valid()) { // If possible, set name and description. if (metadata->get("title") && metadata->get("identifier")) tname.appendChild(ret.createTextNode(metadata->get("title"))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-06-09 14:15:28
|
Revision: 5692 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5692&view=rev Author: j-b-m Date: 2011-06-09 14:15:18 +0000 (Thu, 09 Jun 2011) Log Message: ----------- Workaround empty .yml metadata in MLT effects Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-06-09 12:57:25 UTC (rev 5691) +++ trunk/kdenlive/src/initeffects.cpp 2011-06-09 14:15:18 UTC (rev 5692) @@ -196,24 +196,6 @@ KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/lib64/ladspa"); KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib64/ladspa");*/ - // Set the directories to look into for effects. - QStringList direc = KGlobal::dirs()->findDirs("appdata", "effects"); - - // Iterate through effects directories to parse all XML files. - for (more = direc.begin(); more != direc.end(); ++more) { - QDir directory(*more); - QStringList filter; - filter << "*.xml"; - fileList = directory.entryList(filter, QDir::Files); - for (it = fileList.begin(); it != fileList.end(); ++it) { - itemName = KUrl(*more + *it).path(); - parseEffectFile(&MainWindow::customEffects, - &MainWindow::audioEffects, - &MainWindow::videoEffects, - itemName, filtersList, producersList, repository); - } - } - // Remove blacklisted effects from the filters list. QFile file2(KStandardDirs::locate("appdata", "blacklisted_effects.txt")); if (file2.open(QIODevice::ReadOnly)) { @@ -251,21 +233,11 @@ MainWindow::transitions.append(effect); effectsMap.clear(); - // Create custom effects - for (int i = 0; i < MainWindow::customEffects.count(); ++i) { - effectInfo = MainWindow::customEffects.at(i); - effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); - } - MainWindow::customEffects.clearList(); - foreach(const QDomElement & effect, effectsMap) - MainWindow::customEffects.append(effect); - effectsMap.clear(); - // Create effects from MLT foreach(const QString & filtername, filtersList) { QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername); - if (!doc.isNull()) { - //kDebug()<<"ADDING: "<<doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(); + //WARNING: TEMPORARY FIX for empty MLT effects descriptions - disable effects without parameters - jbm 09-06-2011 + if (!doc.isNull() && doc.elementsByTagName("parameter").count() > 0) { if (doc.documentElement().attribute("type") == "audio") { audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); } @@ -274,6 +246,33 @@ } } + // Set the directories to look into for effects. + QStringList direc = KGlobal::dirs()->findDirs("appdata", "effects"); + // Iterate through effects directories to parse all XML files. + for (more = direc.begin(); more != direc.end(); ++more) { + QDir directory(*more); + QStringList filter; + filter << "*.xml"; + fileList = directory.entryList(filter, QDir::Files); + for (it = fileList.begin(); it != fileList.end(); ++it) { + itemName = KUrl(*more + *it).path(); + parseEffectFile(&MainWindow::customEffects, + &MainWindow::audioEffects, + &MainWindow::videoEffects, + itemName, filtersList, producersList, repository); + } + } + + // Create custom effects + for (int i = 0; i < MainWindow::customEffects.count(); ++i) { + effectInfo = MainWindow::customEffects.at(i); + effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo); + } + MainWindow::customEffects.clearList(); + foreach(const QDomElement & effect, effectsMap) + MainWindow::customEffects.append(effect); + effectsMap.clear(); + // Create audio effects for (int i = 0; i < MainWindow::audioEffects.count(); ++i) { effectInfo = MainWindow::audioEffects.at(i); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-06-09 14:36:03
|
Revision: 5693 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5693&view=rev Author: j-b-m Date: 2011-06-09 14:35:57 +0000 (Thu, 09 Jun 2011) Log Message: ----------- Hide MLT's automatically generated SOX effects since they are not usable (no valid parameter info) Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-06-09 14:15:18 UTC (rev 5692) +++ trunk/kdenlive/src/initeffects.cpp 2011-06-09 14:35:57 UTC (rev 5693) @@ -239,7 +239,14 @@ //WARNING: TEMPORARY FIX for empty MLT effects descriptions - disable effects without parameters - jbm 09-06-2011 if (!doc.isNull() && doc.elementsByTagName("parameter").count() > 0) { if (doc.documentElement().attribute("type") == "audio") { - audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); + if (doc.elementsByTagName("description").count() > 0) { + QString desc = doc.documentElement().elementsByTagName("description").item(0).toElement().text(); + //WARNING: TEMPORARY FIX for unusable MLT SOX parameters description + if (desc.startsWith("Process audio using a SoX")) { + // Remove MLT's SOX generated effects since the parameters properties are unusable for us + } + else audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); + } } else videoEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-06-10 21:32:47
|
Revision: 5695 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5695&view=rev Author: j-b-m Date: 2011-06-10 21:32:41 +0000 (Fri, 10 Jun 2011) Log Message: ----------- Fix missing effects, as described in: http://www.kdenlive.org/mantis/view.php?id=2152#c6801 Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-06-10 10:12:43 UTC (rev 5694) +++ trunk/kdenlive/src/initeffects.cpp 2011-06-10 21:32:41 UTC (rev 5695) @@ -197,14 +197,15 @@ KGlobal::dirs()->addResourceDir("ladspa_plugin", "/usr/local/lib64/ladspa");*/ // Remove blacklisted effects from the filters list. + QStringList mltFiltersList = filtersList; QFile file2(KStandardDirs::locate("appdata", "blacklisted_effects.txt")); if (file2.open(QIODevice::ReadOnly)) { QTextStream in(&file2); while (!in.atEnd()) { QString black = in.readLine().simplified(); if (!black.isEmpty() && !black.startsWith('#') && - filtersList.contains(black)) - filtersList.removeAll(black); + mltFiltersList.contains(black)) + mltFiltersList.removeAll(black); } file2.close(); } @@ -234,7 +235,7 @@ effectsMap.clear(); // Create effects from MLT - foreach(const QString & filtername, filtersList) { + foreach(const QString & filtername, mltFiltersList) { QDomDocument doc = createDescriptionFromMlt(repository, "filters", filtername); //WARNING: TEMPORARY FIX for empty MLT effects descriptions - disable effects without parameters - jbm 09-06-2011 if (!doc.isNull() && doc.elementsByTagName("parameter").count() > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-09-02 21:36:40
|
Revision: 5854 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5854&view=rev Author: j-b-m Date: 2011-09-02 21:36:33 +0000 (Fri, 02 Sep 2011) Log Message: ----------- cleanup Modified Paths: -------------- trunk/kdenlive/src/initeffects.cpp Modified: trunk/kdenlive/src/initeffects.cpp =================================================================== --- trunk/kdenlive/src/initeffects.cpp 2011-09-01 22:38:03 UTC (rev 5853) +++ trunk/kdenlive/src/initeffects.cpp 2011-09-02 21:36:33 UTC (rev 5854) @@ -337,7 +337,7 @@ QFile file(name); doc.setContent(&file, false); file.close(); - QDomElement documentElement = doc.documentElement(); + QDomElement documentElement; QDomNodeList effects = doc.elementsByTagName("effect"); if (effects.count() == 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |