[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-01-12 21:40:12
Message-ID: E1cRn6S-0003Bc-NA () code ! kde ! org
[Download RAW message or body]

Git commit 54e3d416b63c31aded6de66c3d5d96cf81d9d0ec by Jean-Baptiste Mardelle.
Committed on 12/01/2017 at 21:40.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +17   -0    src/doc/documentvalidator.cpp
M  +1    -0    src/effectstack/graphicsscenerectmove.cpp
M  +3    -3    src/main.cpp
M  +7    -2    src/project/dialogs/slideshowclip.cpp
M  +1    -0    src/timeline/managers/guidemanager.cpp
M  +1    -0    src/timeline/managers/spacermanager.cpp
M  +1    -0    src/timeline/managers/trimmanager.cpp
M  +1    -0    src/timeline/track.cpp

https://commits.kde.org/kdenlive/54e3d416b63c31aded6de66c3d5d96cf81d9d0ec

diff --cc src/project/dialogs/slideshowclip.cpp
index 7a013dd17,fdfcf33d8..32028f0e0
--- a/src/project/dialogs/slideshowclip.cpp
+++ b/src/project/dialogs/slideshowclip.cpp
@@@ -410,11 -403,9 +415,11 @@@ QString SlideshowClip::selectedPath(con
              }
          }
          extension = filter + "%0" + QString::number(precision) + 'd' + ext;
 -	if (firstFrame > 0) extension.append(QStringLiteral("?begin=%1").arg(firstFrame));
 +        if (firstFrame > 0) {
-             extension.append(QStringLiteral("?begin:%1").arg(firstFrame));
++            extension.append(QStringLiteral("?begin=%1").arg(firstFrame));
 +        }
      }
 -    //qDebug() << "// FOUND " << (*list).count() << " items for " << \
url.toLocalFile();  +    //qCDebug(KDENLIVE_LOG) << "// FOUND " << (*list).count() << \
" items for " << url.toLocalFile();  return  folder + extension;
  }
  
diff --cc src/timeline/managers/spacermanager.cpp
index 60a369e20,ebcf75516..3e4820b9f
--- a/src/timeline/managers/spacermanager.cpp
+++ b/src/timeline/managers/spacermanager.cpp
@@@ -25,7 -25,11 +25,8 @@@
  #include <QGraphicsItem>
  #include <QApplication>
  
 -
  SpacerManager::SpacerManager(CustomTrackView *view, DocUndoStack *commandStack) : \
AbstractToolManager(SpacerType, view, commandStack) +     , m_track(0)
      , m_dragMoved(false)
  {
  }
diff --cc src/timeline/managers/trimmanager.cpp
index cfec62fb6,96f2aa6cf..8888a19d2
--- a/src/timeline/managers/trimmanager.cpp
+++ b/src/timeline/managers/trimmanager.cpp
@@@ -24,16 -24,20 +24,17 @@@
  #include "renderer.h"
  
  #include <KLocalizedString>
 -#include <QtConcurrent>
  #include <QStandardPaths>
 -#include <QProcess>
  #include <mlt++/MltPlaylist.h>
  
 -
  TrimManager::TrimManager(CustomTrackView *view, DocUndoStack *commandStack) : \
                AbstractToolManager(TrimType, view, commandStack)
 -    , m_firstClip(NULL)
 -    , m_secondClip(NULL)
 +    , m_firstClip(nullptr)
 +    , m_secondClip(nullptr)
      , m_trimMode(NormalTrim)
      , m_rippleIndex(0)
 -    , m_trimPlaylist(NULL)
 +    , m_trimPlaylist(nullptr)
      , trimChanged(false)
+     , m_render(nullptr)
  {
  }
  


[prev in list] [next in list] [prev in thread] [next in thread]