Remove Alpha Transparency transition as suggested by Dan. Instead we use Composite...

svn path=/trunk/kdenlive/; revision=3153

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 684561297c9e13ff2c802cc86a33d223081025f6..395a1f76dd368f59d1909c69853b05c01cee284a 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -709,10 +709,10 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
     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) {

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 6711a806387ff25929e27a89fbc5b9a9937f4205..9ad4ec6320dc5ac77a20a0ef18c2e70d81944b24 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -233,8 +233,7 @@ void TrackView::parseDocument(QDomDocument doc) {
             QString transitionId;
             if (mlt_service == "composite") {
                 // When adding composite transition, check if it is a wipe transition
-                if (mlt_geometry == "0%,0%:100%x100%") transitionId = "alphatransparency";
-                else if (mlt_geometry.count(';') == 1) {
+                if (mlt_geometry.count(';') == 1) {
                     mlt_geometry.remove(QChar('%'), Qt::CaseInsensitive);
                     mlt_geometry.replace(QChar('x'), QChar(','), Qt::CaseInsensitive);
                     QString start = mlt_geometry.section(';', 0, 0);