- Include frei0r.hueshift0r XML GUI

- re-enable transcode menu for images (1)
- cleanup
(1): http://kdenlive.org/mantis/view.php?id=1579

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

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 7abf1f719b21039425b545816e056db326a63c4d..6c372813d93dc366c18af97f0f1fb5de3f67b29a 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -1,6 +1,4 @@
 # crashing effects
-frei0r.squareblur
-frei0r.distort0r
 frei0r.water
 frei0r.facedetect
 
@@ -12,6 +10,8 @@ frei0r.invert0r
 frei0r.twolay0r
 
 # effects with XML UI
+frei0r.squareblur
+frei0r.distort0r
 frei0r.balanc0r
 frei0r.colordistance
 frei0r.scale0tilt
@@ -29,6 +29,7 @@ frei0r.c0rners
 frei0r.defish0r
 frei0r.pixeliz0r
 frei0r.glow
+frei0r.hueshift0r
 
 #effects that have simplekeyframes
 vignette

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index e18b2ca0ee5c47228de04b7ddd67245adf8a2732..83bd14b5845eff5a0bddf9a48938c10a5e1b90e5 100644 (file)
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -63,6 +63,7 @@ frei0r_c0rners.xml
 frei0r_defish0r.xml
 frei0r_glow.xml
 frei0r_pixeliz0r.xml
+frei0r_hueshift0r.xml
 gain.xml
 fade_from_black.xml
 fade_to_black.xml

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 58e4819ef424de3f5fbb1ce953a4fa665bb61edd..c88815744a048ff82b5afa46dd65ebbb4a080998 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -518,7 +518,7 @@ void ProjectList::slotClipSelected()
 
 void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
 {
-    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW || clip->clipType() == IMAGE) {
+    if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) {
         m_transcodeAction->setEnabled(false);
         return;
     }

diff --git a/src/projectlist.h b/src/projectlist.h
index 6b38f01a7b8d02446dd0857e73625f7b9a3278b1..02753668dac41c3f57d96497364704accfd454f1 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -218,6 +218,7 @@ private:
     QStringList getGroup() const;
     void regenerateTemplate(ProjectItem *clip);
     void editClipSelection(QList<QTreeWidgetItem *> list);
+    /** @brief Enables and disables transcode actions based on the selected clip's type. */
     void adjustTranscodeActions(ProjectItem *clip) const;
     /** @brief Sets the buttons enabled/disabled according to selected item. */
     void updateButtons() const;
@@ -227,7 +228,10 @@ private slots:
     void slotAddSlideshowClip();
     void slotAddTitleClip();
     void slotAddTitleTemplateClip();
-    void slotContextMenu(const QPoint &pos, QTreeWidgetItem *);
+    /** @brief Shows the context menu after enabling and disabling actions based on the item's type.
+    * @param pos The position where the menu should pop up
+    * @param item The item for which the checks should be done */
+    void slotContextMenu(const QPoint &pos, QTreeWidgetItem *item);
     /** @brief Creates an AddFolderCommand. */
     void slotAddFolder();
     /** @brief This is triggered when a clip description has been modified. */

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 69bec29bdab0058797a9a104d65213b57ca1365f..2a2f45dfb8c15e72f637d577293ee4f879754727 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -137,12 +137,10 @@ void Render::closeMlt()
                 resource = mlt_properties_get(properties, "mlt_service");
             }
 
-            int trackNb = tractor.count();
-            while (trackNb > 0) {
-                Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+            for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+                Mlt::Producer trackProducer(tractor.track(trackNb));
                 Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
                 if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
-                trackNb--;
             }
         }
         mlt_service_unlock(service.get_service());
@@ -282,12 +280,10 @@ int Render::resetProfile(const QString profileName)
         Mlt::Service service(m_mltProducer->get_service());
         if (service.type() == tractor_type) {
             Mlt::Tractor tractor(service);
-            int trackNb = tractor.count();
-            while (trackNb > 0) {
-                Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+            for (int trackNb = tractor.count() -1; trackNb >= 0; --trackNb) {
+                Mlt::Producer trackProducer(tractor.track(trackNb));
                 Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
                 trackPlaylist.clear();
-                trackNb--;
             }
         }
 
@@ -977,12 +973,10 @@ int Render::setSceneList(QString playlist, int position)
                 resource = mlt_properties_get(properties, "mlt_service");
             }
 
-            int trackNb = tractor.count();
-            while (trackNb > 0) {
-                Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+            for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+                Mlt::Producer trackProducer(tractor.track(trackNb));
                 Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
                 if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
-                trackNb--;
             }
             delete field;
         }
@@ -1965,14 +1959,12 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
             resource = mlt_properties_get(properties, "mlt_service");
         }
     } else {
-        int trackNb = tractor.count();
-        while (trackNb > 1) {
-            Mlt::Producer trackProducer(tractor.track(trackNb - 1));
+        for(int trackNb = tractor.count() - 1; trackNb >= 1; --trackNb) {
+            Mlt::Producer trackProducer(tractor.track(trackNb));
             Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
 
-
             //int clipNb = trackPlaylist.count();
-            insertPos = trackClipStartList.value(trackNb - 1);
+            insertPos = trackClipStartList.value(trackNb);
             if (insertPos != -1) {
                 insertPos += offset;
 
@@ -2004,7 +1996,6 @@ void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int>
                 }
                 trackPlaylist.consolidate_blanks(0);
             }
-            trackNb--;
         }
         // now move transitions
         mlt_service serv = m_mltProducer->parent().get_service();