[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 <jb () kdenlive ! org>
Date: 2016-12-04 17:06:01
Message-ID: E1cDaEj-0001YW-4t () code ! kde ! org
[Download RAW message or body]
Git commit 4f35b9b33022ef0984c81a1f9a514fb053cf51ca by Jean-Baptiste Mardelle.
Committed on 04/12/2016 at 17:05.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +0 -1 src/bin/abstractprojectitem.cpp
M +27 -17 src/bin/bin.cpp
M +2 -0 src/bin/bin.h
M +9 -3 src/bin/projectclip.cpp
M +1 -1 src/dialogs/clipcreationdialog.cpp
M +5 -5 src/dialogs/renderwidget.cpp
M +0 -1 src/doc/documentvalidator.cpp
M +1 -1 src/doc/kdenlivedoc.cpp
M +0 -1 src/effectstack/widgets/animationwidget.cpp
M +9 -12 src/mainwindow.cpp
M +0 -1 src/mltcontroller/bincontroller.cpp
M +0 -2 src/mltcontroller/clippropertiescontroller.cpp
M +0 -2 src/mltcontroller/effectscontroller.cpp
M +0 -1 src/mltcontroller/producerqueue.cpp
M +1 -1 src/project/projectmanager.cpp
M +0 -2 src/stopmotion/stopmotion.cpp
M +0 -2 src/timeline/abstractclipitem.cpp
M +0 -2 src/timeline/clipitem.cpp
M +17 -9 src/timeline/customtrackview.cpp
M +0 -4 src/timeline/timeline.cpp
M +0 -1 src/timeline/track.cpp
https://commits.kde.org/kdenlive/4f35b9b33022ef0984c81a1f9a514fb053cf51ca
diff --cc src/bin/bin.h
index 8cd8bcb,f1978be..4e7f497
--- a/src/bin/bin.h
+++ b/src/bin/bin.h
@@@ -645,9 -645,11 +645,11 @@@ public slots
void slotEffectDropped(QString id, QDomElement);
/** @brief Request current frame from project monitor. */
void slotGetCurrentProjectImage(bool request);
- void slotExpandUrl(ItemInfo info, QUrl url, QUndoCommand *command);
+ void slotExpandUrl(const ItemInfo &info, const QUrl &url, QUndoCommand \
*command); void abortAudioThumbs();
+ /** @brief Abort all ongoing operations to prepare close. */
+ void abortOperations();
- void doDisplayMessage(const QString &text, KMessageWidget::MessageType type, \
QList <QAction*> actions = QList <QAction*>()); + void doDisplayMessage(const \
QString &text, KMessageWidget::MessageType type, const QList<QAction *> &actions = \
QList <QAction*>()); /** @brief Reset all clip usage to 0 */
void resetUsageCount();
/** @brief Select a clip in the Bin from its id. */
diff --cc src/bin/projectclip.cpp
index 2a8d03d,e23efe8..3c6eac6
--- a/src/bin/projectclip.cpp
+++ b/src/bin/projectclip.cpp
@@@ -592,10 -596,11 +596,11 @@@ void ProjectClip::setProperties(const Q
QMap <QString, QString> passProperties;
bool refreshAnalysis = false;
bool reload = false;
+ bool refreshOnly = true;
// Some properties also need to be passed to track producers
QStringList timelineProperties;
- if (properties.contains(QLatin1String("templatetext"))) {
- m_description = properties.value(QLatin1String("templatetext"));
+ if (properties.contains(QStringLiteral("templatetext"))) {
+ m_description = properties.value(QStringLiteral("templatetext"));
bin()->emitItemUpdated(this);
refreshPanel = true;
}
diff --cc src/dialogs/renderwidget.cpp
index 36d4ead,44e029b..b167b65
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@@ -1152,17 -1111,17 +1149,19 @@@ void RenderWidget::slotExport(bool scri
double guideStart = \
m_view.guide_start->itemData(m_view.guide_start->currentIndex()).toDouble();
double guideEnd = \
m_view.guide_end->itemData(m_view.guide_end->currentIndex()).toDouble();
render_process_args << "in=" + QString::number((int) \
GenTime(guideStart).frames(fps)) << "out=" + QString::number((int) \
GenTime(guideEnd).frames(fps)); + } else {
+ render_process_args << "in=" + QString::number(zoneIn) << "out=" + \
QString::number(zoneOut); }
- if (!overlayargs.isEmpty())
+ if (!overlayargs.isEmpty()) {
render_process_args << "preargs=" + overlayargs.join(QStringLiteral(" \
")); + }
- if (scriptExport)
+ if (scriptExport) {
render_process_args << QStringLiteral("$MELT");
- else
+ } else {
render_process_args << KdenliveSettings::rendererpath();
+ }
render_process_args << m_profile.path << item->data(0, \
RenderRole).toString(); if (!scriptExport && m_view.play_after->isChecked()) {
@@@ -2612,11 -2456,11 +2611,12 @@@ void RenderWidget::slotSwitchAspectRati
void RenderWidget::slotUpdateAudioLabel(int ix)
{
- if (ix == Qt::PartiallyChecked)
+ if (ix == Qt::PartiallyChecked) {
m_view.export_audio->setText(i18n("Export audio (automatic)"));
- else
+ } else {
m_view.export_audio->setText(i18n("Export audio"));
+ }
+ m_view.stemAudioExport->setEnabled(ix != Qt::Unchecked);
}
bool RenderWidget::automaticAudioExport() const
diff --cc src/mltcontroller/bincontroller.cpp
index 640c809,7d3eec0..c1fd3df
--- a/src/mltcontroller/bincontroller.cpp
+++ b/src/mltcontroller/bincontroller.cpp
@@@ -180,8 -181,8 +180,7 @@@ QMap<double,QString> BinController::tak
Mlt::Properties guidesProperties;
Mlt::Properties playlistProps(m_binPlaylist->get_properties());
guidesProperties.pass_values(playlistProps, "kdenlive:guide.");
-
-
- qDebug()<<"***********\nFOUND GUIDES: \
"<<guidesProperties.count()<<"\n**********"; + \
qCDebug(KDENLIVE_LOG)<<"***********\nFOUND GUIDES: \
"<<guidesProperties.count()<<"\n**********"; QMap <double,QString> guidesData;
for (int i = 0; i < guidesProperties.count(); i++) {
double time = locale.toDouble(guidesProperties.get_name(i));
diff --cc src/mltcontroller/producerqueue.cpp
index d852d4b,e6e43eb..dd6964c
--- a/src/mltcontroller/producerqueue.cpp
+++ b/src/mltcontroller/producerqueue.cpp
@@@ -499,8 -500,7 +499,7 @@@ void ProducerQueue::processFileProperti
if (frameNumber > 0) producer->seek(frameNumber);
duration = duration > 0 ? duration : producer->get_playtime();
- //qDebug() << "/////// PRODUCER: " << url.path() << " IS: " << \
producer->get_playtime(); + //qCDebug(KDENLIVE_LOG) << "/////// PRODUCER: " \
<< url.path() << " IS: " << producer->get_playtime();
-
if (type == SlideShow) {
int ttl = \
EffectsList::property(info.xml,QStringLiteral("ttl")).toInt();
QString anim = \
EffectsList::property(info.xml,QStringLiteral("animation"));
diff --cc src/project/projectmanager.cpp
index e57e9ac,2ff6d84..958a1f5
--- a/src/project/projectmanager.cpp
+++ b/src/project/projectmanager.cpp
@@@ -255,15 -255,15 +255,15 @@@ bool ProjectManager::closeCurrentDocume
m_autoSaveTimer.stop();
if (m_project) {
pCore->producerQueue()->abortOperations();
- pCore->bin()->abortAudioThumbs();
+ pCore->bin()->abortOperations();
- pCore->window()->slotTimelineClipSelected(NULL, false);
- pCore->monitorManager()->clipMonitor()->slotOpenClip(NULL);
+ pCore->window()->slotTimelineClipSelected(Q_NULLPTR, false);
+ pCore->monitorManager()->clipMonitor()->slotOpenClip(Q_NULLPTR);
pCore->window()->m_effectStack->clear();
- pCore->window()->m_effectStack->transitionConfig()->slotTransitionItemSelected(NULL, \
0, QPoint(), false); + \
pCore->window()->m_effectStack->transitionConfig()->slotTransitionItemSelected(Q_NULLPTR, \
0, QPoint(), false); delete m_trackView;
- m_trackView = NULL;
+ m_trackView = Q_NULLPTR;
delete m_project;
- m_project = NULL;
+ m_project = Q_NULLPTR;
}
pCore->monitorManager()->setDocument(m_project);
}
diff --cc src/timeline/customtrackview.cpp
index 0d14483,67b1052..5fa236b
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@@ -4414,15 -4419,21 +4418,21 @@@ void CustomTrackView::groupClips(bool g
for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(itemList.at(i));
- if (forceLock || !clip->isItemLocked()) clipInfos.append(clip->info());
+ if (!processedClips.contains(clip) && (forceLock || \
!clip->isItemLocked())) { + clipInfos.append(clip->info());
+ processedClips << clip;
+ }
} else if (itemList.at(i)->type() == TransitionWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(itemList.at(i));
- if (forceLock || !clip->isItemLocked()) \
transitionInfos.append(clip->info()); + if \
(!processedClips.contains(clip) && (forceLock || !clip->isItemLocked())) { + \
transitionInfos.append(clip->info()); + processedClips << clip;
+ }
}
}
- if (clipInfos.count() > 0) {
+ if (!clipInfos.isEmpty()) {
// break previous groups
- QUndoCommand *metaCommand = NULL;
+ QUndoCommand *metaCommand = Q_NULLPTR;
if (group && !command && !existingGroups.isEmpty()) {
metaCommand = new QUndoCommand();
metaCommand->setText(i18n("Group clips"));
diff --cc src/timeline/timeline.cpp
index c4af688,827e3b1..08217db
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@@ -1051,10 -1049,9 +1049,8 @@@ void Timeline::loadGuides(const QMap <d
}
}
-void Timeline::getEffects(Mlt::Service &service, ClipItem *clip, int track)
-{
- int effectNb = clip == NULL ? 0 : clip->effectsCount();
+void Timeline::getEffects(Mlt::Service &service, ClipItem *clip, int track) {
+ int effectNb = clip == Q_NULLPTR ? 0 : clip->effectsCount();
- QLocale locale;
- locale.setNumberOptions(QLocale::OmitGroupSeparator);
for (int ix = 0; ix < service.filter_count(); ++ix) {
QScopedPointer<Mlt::Filter> effect(service.filter(ix));
QDomElement clipeffect = getEffectByTag(effect->get("tag"), \
effect->get("kdenlive_id"));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic