Image sequences can now start at an arbitrary frame, just select the first one in...

http://kdenlive.org/mantis/view.php?id=2508

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index ce01e8281801206d05a52ef6ca029df2134d6303..3ebba4c6fa5c00fbdd50808d05d28b4f40e27a63 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1831,11 +1831,7 @@ void ProjectList::slotAddSlideshowClip()
         
         QMap <QString, QString> properties;
         properties.insert("name", dia->clipName());
-        int begin = dia->begin();
-        if (begin > 0) 
-            properties.insert("resource", dia->selectedPath() + "?" + QString::number(begin));
-        else
-            properties.insert("resource", dia->selectedPath());
+        properties.insert("resource", dia->selectedPath());
         properties.insert("in", "0");
         properties.insert("out", QString::number(m_doc->getFramePos(dia->clipDuration()) * dia->imageCount()));
         properties.insert("ttl", QString::number(m_doc->getFramePos(dia->clipDuration())));
@@ -1846,7 +1842,6 @@ void ProjectList::slotAddSlideshowClip()
         properties.insert("luma_file", dia->lumaFile());
         properties.insert("softness", QString::number(dia->softness()));
         properties.insert("animation", dia->animation());
-        properties.insert("begin", QString::number(dia->begin()));
         
         m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1));
     }

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index db30cfc0e4ec54b8ff77d1cfd5e6a321246b4d8c..848780b37f035555c684a948b9490d469204b6a3 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -31,7 +31,6 @@
 SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     QDialog(parent),
     m_count(0),
-    m_patternBegin(0),
     m_timecode(tc),
     m_thumbJob(NULL)
 {
@@ -177,12 +176,13 @@ int SlideshowClip::sequenceCount(KUrl file)
 
     // Find number of digits in sequence
     int precision = fullSize - filter.size();
+    int firstFrame = file.fileName().section('.', 0, -2).right(precision).toInt();    
     QString folder = file.directory(KUrl::AppendTrailingSlash);
     // Check how many files we have
     QDir dir(folder);
     QString path;
     int gap = 0;
-    for (int i = 0; gap < 100; i++) {
+    for (int i = firstFrame; gap < 100; i++) {
         path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
         if (dir.exists(path)) {
             count ++;
@@ -219,13 +219,13 @@ void SlideshowClip::parseFolder()
         filter = filter.section('.', 0, -2);
         int fullSize = filter.size();
         while (filter.at(filter.size() - 1).isDigit()) {
-            filter.remove(filter.size() - 1, 1);
+            filter.chop(1);
         }
         int precision = fullSize - filter.size();
-        m_patternBegin = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt();
+        int firstFrame = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt();
         QString path;
         int gap = 0;
-        for (int i = m_patternBegin; gap < 100; i++) {
+        for (int i = firstFrame; gap < 100; i++) {
             path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
             if (dir.exists(path)) {
                 result.append(path);
@@ -300,6 +300,7 @@ QString SlideshowClip::selectedPath()
     else url = m_view.pattern_url->url();
     QString path = selectedPath(url, m_view.method_mime->isChecked(), ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(), &list);
     m_count = list.count();
+    kDebug()<<"// SELECTED PATH: "<<path;
     return path;
 }
 
@@ -327,6 +328,7 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
         QString ext = '.' + filter.section('.', -1);
         filter = filter.section('.', 0, -2);
         int fullSize = filter.size();
+       QString firstFrameData = filter;
 
         while (filter.at(filter.size() - 1).isDigit()) {
             filter.chop(1);
@@ -334,12 +336,13 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
 
         // Find number of digits in sequence
         int precision = fullSize - filter.size();
+       int firstFrame = firstFrameData.right(precision).toInt();
 
         // Check how many files we have
         QDir dir(folder);
         QString path;
         int gap = 0;
-        for (int i = 0; gap < 100; i++) {
+        for (int i = firstFrame; gap < 100; i++) {
             path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
             if (dir.exists(path)) {
                 (*list).append(folder + path);
@@ -348,7 +351,8 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
                 gap++;
             }
         }
-        extension = filter + "%." + QString::number(precision) + "d" + ext;
+        if (firstFrame > 0) extension = filter + "%" + QString::number(firstFrame).rightJustified(precision, '0', false) + "d" + ext;
+        else extension = filter + "%" + QString::number(precision) + "d" + ext;
     }
     kDebug() << "// FOUND " << (*list).count() << " items for " << url.path();
     return  folder + extension;
@@ -467,10 +471,6 @@ QString SlideshowClip::animationToGeometry(const QString &animation, int &ttl)
     return geometry;
 }
 
-int SlideshowClip::begin() const
-{
-   return m_patternBegin;
-}
 
 #include "slideshowclip.moc"
 

diff --git a/src/slideshowclip.h b/src/slideshowclip.h
index 4189987bde1846134f0a5f33bbb4b15ce88c7db1..69fc496fcbcfee1c950aa8b21a6541a62ddcffbd 100644 (file)
--- a/src/slideshowclip.h
+++ b/src/slideshowclip.h
@@ -48,8 +48,6 @@ public:
     QString lumaFile() const;
     int softness() const;
     QString animation() const;
-    /** @brief Return the first number for the sequence begining */
-    int begin() const;
 
     /** @brief Check if there are several files with filename pattern, like: image_001.jpg, image_002.jpg,... */
     static int sequenceCount(KUrl file);
@@ -74,7 +72,6 @@ private slots:
 private:
     Ui::SlideshowClip_UI m_view;
     int m_count;
-    int m_patternBegin;
     Timecode m_timecode;
     KIO::PreviewJob *m_thumbJob;
 };

diff --git a/src/widgets/slideshowclip_ui.ui b/src/widgets/slideshowclip_ui.ui
index 9fec467c080b65d8419618bdd9dd87dbe9d8ffec..54a939f6713f54cd9af96d96a6288e7f4bac793e 100644 (file)
--- a/src/widgets/slideshowclip_ui.ui
+++ b/src/widgets/slideshowclip_ui.ui
@@ -94,7 +94,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
-             <string>Image name</string>
+             <string>First frame</string>
             </property>
            </widget>
           </item>