From c24658bd34221d735f0641c924b890e1a6be7101 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Artaud Date: Sun, 12 Jan 2014 23:24:45 +0100 Subject: [PATCH] Cleaning code style of Definitions. --- src/abstractclipitem.cpp | 8 +- src/abstractclipitem.h | 2 +- src/abstractgroupitem.cpp | 54 +-- src/abstractgroupitem.h | 4 +- src/abstractmonitor.cpp | 2 +- src/abstractmonitor.h | 8 +- src/clipdurationdialog.cpp | 6 +- src/clipitem.cpp | 74 ++-- src/clipitem.h | 4 +- src/clipmanager.cpp | 24 +- src/clipproperties.cpp | 34 +- src/customtrackview.cpp | 640 ++++++++++++++-------------- src/customtrackview.h | 14 +- src/definitions.cpp | 183 ++++++++ src/definitions.h | 282 +++++------- src/docclipbase.cpp | 60 +-- src/docclipbase.h | 6 +- src/documentchecker.cpp | 32 +- src/documentvalidator.cpp | 8 +- src/dvdwizardchapters.cpp | 4 +- src/effectstack/effectstackview2.h | 2 +- src/effectstackedit.h | 2 +- src/folderprojectitem.cpp | 2 +- src/folderprojectitem.h | 2 +- src/headertrack.cpp | 6 +- src/headertrack.h | 2 +- src/kdenlivedoc.cpp | 24 +- src/mainwindow.cpp | 58 +-- src/mainwindow.h | 4 +- src/markerdialog.cpp | 12 +- src/mltdevicecapture.cpp | 2 +- src/monitor.cpp | 20 +- src/monitor.h | 2 +- src/monitormanager.cpp | 18 +- src/monitormanager.h | 6 +- src/projectitem.cpp | 44 +- src/projectitem.h | 10 +- src/projectlist.cpp | 266 ++++++------ src/projectlist.h | 2 +- src/projectlistview.cpp | 30 +- src/projectsettings.cpp | 18 +- src/projecttree/abstractclipjob.cpp | 8 +- src/projecttree/abstractclipjob.h | 10 +- src/projecttree/cutclipjob.cpp | 24 +- src/projecttree/cutclipjob.h | 2 +- src/projecttree/meltjob.cpp | 28 +- src/projecttree/meltjob.h | 4 +- src/projecttree/proxyclipjob.cpp | 28 +- src/projecttree/proxyclipjob.h | 2 +- src/recmonitor.cpp | 2 +- src/recmonitor.h | 2 +- src/renderer.cpp | 20 +- src/renderer.h | 6 +- src/scopes/scopemanager.cpp | 8 +- src/stopmotion/stopmotion.cpp | 8 +- src/stopmotion/stopmotion.h | 2 +- src/subprojectitem.cpp | 2 +- src/subprojectitem.h | 2 +- src/trackdialog.cpp | 2 +- src/tracksconfigdialog.cpp | 8 +- src/trackview.cpp | 10 +- src/transition.cpp | 12 +- src/transition.h | 6 +- src/transitionsettings.cpp | 2 +- src/transitionsettings.h | 2 +- src/widgets/archivewidget.cpp | 12 +- 66 files changed, 1162 insertions(+), 1031 deletions(-) diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 7ef051b2..8179a83f 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -143,7 +143,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit, bool /*emitChang GenTime durationDiff = GenTime(posx, m_fps) - m_info.startPos; if (durationDiff == GenTime()) return; - if (type() == AVWIDGET && hasSizeLimit && (cropStart() + durationDiff < GenTime())) { + if (type() == AVWidget && hasSizeLimit && (cropStart() + durationDiff < GenTime())) { durationDiff = GenTime() - cropStart(); } else if (durationDiff >= cropDuration()) { return; @@ -154,7 +154,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit, bool /*emitChang // set to true if crop from start is negative (possible for color clips, images as they have no size limit) bool negCropStart = false; - if (type() == AVWIDGET) { + if (type() == AVWidget) { m_info.cropStart += durationDiff; if (m_info.cropStart < GenTime()) negCropStart = true; @@ -168,7 +168,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit, bool /*emitChang //kDebug() << "////// WARNING, DIFF IN XPOS: " << pos().x() << " == " << m_info.startPos.frames(m_fps); GenTime diff = m_info.startPos - GenTime(posx, m_fps); - if (type() == AVWIDGET) + if (type() == AVWidget) m_info.cropStart += diff; m_info.cropDuration -= diff; @@ -193,7 +193,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit, bool /*emitChang setRect(0, 0, (m_cropDuration - diff).frames(m_fps) - 0.02, rect().height()); setPos((m_startPos + diff).frames(m_fps), pos().y()); m_startPos += diff; - if (type() == AVWIDGET) m_cropStart += diff; + if (type() == AVWidget) m_cropStart += diff; m_cropDuration = m_cropDuration - diff; break; } diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h index 1420788e..ac734469 100644 --- a/src/abstractclipitem.h +++ b/src/abstractclipitem.h @@ -67,7 +67,7 @@ public: bool isItemLocked() const; void closeAnimation(); - virtual OPERATIONTYPE operationMode(const QPointF &pos) = 0; + virtual OperationType operationMode(const QPointF &pos) = 0; virtual GenTime startPos() const ; virtual void setTrack(int track); virtual GenTime endPos() const ; diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index e91d1f81..15770b8d 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -48,7 +48,7 @@ AbstractGroupItem::AbstractGroupItem(double /* fps */) : int AbstractGroupItem::type() const { - return GROUPWIDGET; + return GroupWidget; } int AbstractGroupItem::track() const @@ -57,7 +57,7 @@ int AbstractGroupItem::track() const int topTrack = -1; QList children = childItems(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { children.append(children.at(i)->childItems()); continue; } @@ -94,20 +94,20 @@ CustomTrackScene* AbstractGroupItem::projectScene() QPainterPath AbstractGroupItem::clipGroupSpacerShape(const QPointF &offset) const { - return spacerGroupShape(AVWIDGET, offset); + return spacerGroupShape(AVWidget, offset); } QPainterPath AbstractGroupItem::clipGroupShape(const QPointF &offset) const { - return groupShape(AVWIDGET, offset); + return groupShape(AVWidget, offset); } QPainterPath AbstractGroupItem::transitionGroupShape(const QPointF &offset) const { - return groupShape(TRANSITIONWIDGET, offset); + return groupShape(TransitionWidget, offset); } -QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, const QPointF &offset) const +QPainterPath AbstractGroupItem::groupShape(GraphicsRectItem type, const QPointF &offset) const { QPainterPath path; QList children = childItems(); @@ -116,7 +116,7 @@ QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, const QPointF QRectF r(children.at(i)->sceneBoundingRect()); r.translate(offset); path.addRect(r); - } else if (children.at(i)->type() == GROUPWIDGET) { + } else if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { if (subchildren.at(j)->type() == (int)type) { @@ -130,7 +130,7 @@ QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, const QPointF return path; } -QPainterPath AbstractGroupItem::spacerGroupShape(GRAPHICSRECTITEM type, const QPointF &offset) const +QPainterPath AbstractGroupItem::spacerGroupShape(GraphicsRectItem type, const QPointF &offset) const { QPainterPath path; QList children = childItems(); @@ -140,7 +140,7 @@ QPainterPath AbstractGroupItem::spacerGroupShape(GRAPHICSRECTITEM type, const QP r.translate(offset); r.setRight(scene()->width()); path.addRect(r); - } else if (children.at(i)->type() == GROUPWIDGET) { + } else if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { if (subchildren.at(j)->type() == (int)type) { @@ -223,29 +223,29 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant QList children = childItems(); for (int i = 0; i < children.count(); ++i) { int currentTrack = 0; - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (children.at(i)->type() == AVWidget || children.at(i)->type() == TransitionWidget) { currentTrack = static_cast (children.at(i))->track(); if (!groupTracks.contains(currentTrack)) groupTracks.append(currentTrack); } - else if (children.at(i)->type() == GROUPWIDGET) { + else if (children.at(i)->type() == GroupWidget) { currentTrack = static_cast (children.at(i))->track(); } else continue; - if (children.at(i)->type() == AVWIDGET) { + if (children.at(i)->type() == AVWidget) { if (topTrack == -1 || currentTrack <= topTrack) { offset = 0; topTrack = currentTrack; } - } else if (children.at(i)->type() == TRANSITIONWIDGET) { + } else if (children.at(i)->type() == TransitionWidget) { if (topTrack == -1 || currentTrack < topTrack) { offset = (int)(trackHeight / 3 * 2 - 1); topTrack = currentTrack; } - } else if (children.at(i)->type() == GROUPWIDGET) { + } else if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); bool clipGroup = false; for (int j = 0; j < subchildren.count(); j++) { - if (subchildren.at(j)->type() == AVWIDGET || subchildren.at(j)->type() == TRANSITIONWIDGET) { + if (subchildren.at(j)->type() == AVWidget || subchildren.at(j)->type() == TransitionWidget) { int subTrack = static_cast (subchildren.at(j))->track(); if (!groupTracks.contains(subTrack)) groupTracks.append(subTrack); clipGroup = true; @@ -297,7 +297,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(this); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { collidingItems.removeAll(subchildren.at(j)); @@ -311,7 +311,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant int offset = 0; for (int i = 0; i < collidingItems.count(); ++i) { QGraphicsItem *collision = collidingItems.at(i); - if (collision->type() == AVWIDGET) { + if (collision->type() == AVWidget) { // Collision if (newPos.y() != pos().y()) { // Track change results in collision, restore original position @@ -343,7 +343,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant collidingItems = scene()->items(clipGroupShape(newPos - pos()), Qt::IntersectsItemShape); collidingItems.removeAll(this); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { collidingItems.removeAll(subchildren.at(j)); @@ -352,7 +352,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant collidingItems.removeAll(children.at(i)); } for (int i = 0; i < collidingItems.count(); ++i) - if (collidingItems.at(i)->type() == AVWIDGET) return pos(); + if (collidingItems.at(i)->type() == AVWidget) return pos(); } } @@ -361,7 +361,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(this); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { collidingItems.removeAll(subchildren.at(j)); @@ -376,7 +376,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant int offset = 0; for (int i = 0; i < collidingItems.count(); ++i) { QGraphicsItem *collision = collidingItems.at(i); - if (collision->type() == TRANSITIONWIDGET) { + if (collision->type() == TransitionWidget) { // Collision if (newPos.y() != pos().y()) { // Track change results in collision, restore original position @@ -410,7 +410,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant collidingItems.removeAll(children.at(i)); } for (int i = 0; i < collidingItems.count(); ++i) - if (collidingItems.at(i)->type() == TRANSITIONWIDGET) return pos(); + if (collidingItems.at(i)->type() == TransitionWidget) return pos(); } } return newPos; @@ -431,7 +431,7 @@ void AbstractGroupItem::dropEvent(QGraphicsSceneDragDropEvent * event) QList selection = scene()->items(dropPos); AbstractClipItem *dropChild = NULL; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { dropChild = (AbstractClipItem *) selection.at(i); break; } @@ -460,7 +460,7 @@ void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event) QList list = scene()->items(event->scenePos()); // only allow group move if we click over an item in the group foreach(const QGraphicsItem *item, list) { - if (item->type() == TRANSITIONWIDGET || item->type() == AVWIDGET) { + if (item->type() == TransitionWidget || item->type() == AVWidget) { QGraphicsItem::mousePressEvent(event); return; } @@ -480,7 +480,7 @@ void AbstractGroupItem::resizeStart(int diff) int itemcount = 0; for (int i = 0; i < children.count(); ++i) { AbstractClipItem *item = static_cast (children.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { items << item; if (info) m_resizeInfos << item->info(); @@ -507,7 +507,7 @@ void AbstractGroupItem::resizeEnd(int diff) int itemcount = 0; for (int i = 0; i < children.count(); ++i) { AbstractClipItem *item = static_cast (children.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { items << item; if (info) m_resizeInfos << item->info(); @@ -540,7 +540,7 @@ GenTime AbstractGroupItem::duration() GenTime start = GenTime(-1.0); GenTime end = GenTime(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() != GROUPWIDGET) { + if (children.at(i)->type() != GroupWidget) { AbstractClipItem *item = static_cast (children.at(i)); if (item) { if (start < GenTime() || item->startPos() < start) diff --git a/src/abstractgroupitem.h b/src/abstractgroupitem.h index 91792be7..3e0594ec 100644 --- a/src/abstractgroupitem.h +++ b/src/abstractgroupitem.h @@ -71,8 +71,8 @@ protected: private: void fixItemRect(); - QPainterPath groupShape(GRAPHICSRECTITEM type, const QPointF &offset) const; - QPainterPath spacerGroupShape(GRAPHICSRECTITEM type, const QPointF &offset) const; + QPainterPath groupShape(GraphicsRectItem type, const QPointF &offset) const; + QPainterPath spacerGroupShape(GraphicsRectItem type, const QPointF &offset) const; /** Stores the original info of the items beeing resized. */ QList m_resizeInfos; }; diff --git a/src/abstractmonitor.cpp b/src/abstractmonitor.cpp index 8593157e..c4fa50e6 100644 --- a/src/abstractmonitor.cpp +++ b/src/abstractmonitor.cpp @@ -29,7 +29,7 @@ #include -AbstractMonitor::AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager, QWidget *parent): +AbstractMonitor::AbstractMonitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *parent): QWidget(parent), videoSurface(NULL), m_id(id), diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h index 537f5d74..6d222b16 100644 --- a/src/abstractmonitor.h +++ b/src/abstractmonitor.h @@ -41,7 +41,7 @@ Q_OBJECT public: * @param name A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0) + explicit AbstractRender(Kdenlive::MonitorId name, QWidget *parent = 0) : QObject(parent), sendFrameForAnalysis(false), analyseAudio(false), @@ -94,8 +94,8 @@ class AbstractMonitor : public QWidget { Q_OBJECT public: - AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager, QWidget *parent = 0); - Kdenlive::MONITORID id() {return m_id;} + AbstractMonitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *parent = 0); + Kdenlive::MonitorId id() {return m_id;} virtual ~AbstractMonitor(); virtual AbstractRender *abstractRender() = 0; bool isActive() const; @@ -113,7 +113,7 @@ public slots: virtual void slotSwitchFullScreen() = 0; protected: - Kdenlive::MONITORID m_id; + Kdenlive::MonitorId m_id; MonitorManager *m_monitorManager; }; diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp index 85333938..24d5cb7b 100644 --- a/src/clipdurationdialog.cpp +++ b/src/clipdurationdialog.cpp @@ -47,14 +47,14 @@ ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, const Timecode &t crop_end_box->addWidget(m_cropEnd); bool allowCrop = true; - if (clip->type() == AVWIDGET) { + if (clip->type() == AVWidget) { ClipItem *item = static_cast (clip); const int t = item->clipType(); - if (t == COLOR || t == IMAGE || t == TEXT) + if (t == Color || t == Image || t == Text) allowCrop = false; } - if (!allowCrop || clip->type() == TRANSITIONWIDGET) { + if (!allowCrop || clip->type() == TransitionWidget) { m_cropStart->setHidden(true); crop_label->hide(); m_cropEnd->setHidden(true), diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 2875be2b..ce8ace3b 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -92,7 +92,7 @@ ClipItem::ClipItem(DocClipBase *clip, const ItemInfo& info, double fps, double s //setAcceptsHoverEvents(true); connect(this , SIGNAL(prepareAudioThumb(double,int,int,int,int)) , this, SLOT(slotPrepareAudioThumb(double,int,int,int,int))); - if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { + if (m_clipType == Video || m_clipType == AV || m_clipType == SlideShow || m_clipType == Playlist) { m_baseColor = QColor(141, 166, 215); if (!m_clip->isPlaceHolder()) { m_hasThumbs = true; @@ -105,17 +105,17 @@ ClipItem::ClipItem(DocClipBase *clip, const ItemInfo& info, double fps, double s if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); } - } else if (m_clipType == COLOR) { + } else if (m_clipType == Color) { QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); - } else if (m_clipType == IMAGE || m_clipType == TEXT) { + } else if (m_clipType == Image || m_clipType == Text) { m_baseColor = QColor(141, 166, 215); - if (m_clipType == TEXT) { + if (m_clipType == Text) { connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage))); } //m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); - } else if (m_clipType == AUDIO) { + } else if (m_clipType == Audio) { m_baseColor = QColor(141, 215, 166); connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } @@ -130,7 +130,7 @@ ClipItem::~ClipItem() m_startThumbTimer.stop(); if (scene()) scene()->removeItem(this); - if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { + if (m_clipType == Video || m_clipType == AV || m_clipType == SlideShow || m_clipType == Playlist) { //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage))); //disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } @@ -140,8 +140,8 @@ ClipItem::~ClipItem() ClipItem *ClipItem::clone(const ItemInfo &info) const { ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE); - if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix); - else if (m_clipType != COLOR) { + if (m_clipType == Image || m_clipType == Text) duplicate->slotSetStartThumb(m_startPix); + else if (m_clipType != Color) { if (info.cropStart == m_info.cropStart) duplicate->slotSetStartThumb(m_startPix); if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + m_info.cropDuration) { duplicate->slotSetEndThumb(m_endPix); @@ -579,7 +579,7 @@ void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs) { if (checkDuration && (m_maxDuration != m_clip->maxDuration())) { m_maxDuration = m_clip->maxDuration(); - if (m_clipType != IMAGE && m_clipType != TEXT && m_clipType != COLOR) { + if (m_clipType != Image && m_clipType != Text && m_clipType != Color) { if (m_maxDuration != GenTime() && m_info.cropStart + m_info.cropDuration > m_maxDuration) { // Clip duration changed, make sure to stay in correct range if (m_info.cropStart > m_maxDuration) { @@ -592,7 +592,7 @@ void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs) } } } - if (m_clipType == COLOR) { + if (m_clipType == Color) { QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); @@ -602,8 +602,8 @@ void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs) void ClipItem::slotFetchThumbs() { - if (scene() == NULL || m_clipType == AUDIO || m_clipType == COLOR) return; - if (m_clipType == IMAGE) { + if (scene() == NULL || m_clipType == Audio || m_clipType == Color) return; + if (m_clipType == Image) { if (m_startPix.isNull()) { m_startPix = KThumb::getImage(KUrl(m_clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); update(); @@ -611,7 +611,7 @@ void ClipItem::slotFetchThumbs() return; } - if (m_clipType == TEXT) { + if (m_clipType == Text) { if (m_startPix.isNull()) slotGetStartThumb(); return; } @@ -682,7 +682,7 @@ void ClipItem::slotThumbReady(int frame, const QImage &img) m_startPix = pix; m_startThumbRequested = false; update(r.left(), r.top(), width, pix.height()); - if (m_clipType == IMAGE || m_clipType == TEXT) { + if (m_clipType == Image || m_clipType == Text) { update(r.right() - width, r.top(), width, pix.height()); } } else if (m_endThumbRequested && frame == (m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1) { @@ -724,7 +724,7 @@ void ClipItem::slotGotAudioData() int ClipItem::type() const { - return AVWIDGET; + return AVWidget; } DocClipBase *ClipItem::baseClip() const @@ -825,7 +825,7 @@ void ClipItem::paint(QPainter *painter, // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { QRectF thumbRect; - if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { + if ((m_clipType == Image || m_clipType == Text) && !m_startPix.isNull()) { if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height()); thumbRect.moveTopRight(mapped.topRight()); painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect()); @@ -852,13 +852,13 @@ void ClipItem::paint(QPainter *painter, } // if we are in full zoom, paint thumbnail for every frame - if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && transformation.m11() == FRAME_SIZE) { + if (m_clip->thumbProducer() && clipType() != Color && clipType() != Audio && !m_audioOnly && transformation.m11() == FRAME_SIZE) { int offset = (m_info.startPos - m_info.cropStart).frames(m_fps); int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset); int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset); QPointF startPos = mapped.topLeft(); int startOffset = m_info.cropStart.frames(m_fps); - if (clipType() == IMAGE || clipType() == TEXT) { + if (clipType() == Image || clipType() == Text) { for (int i = left; i <= right; ++i) { painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix); } @@ -890,7 +890,7 @@ void ClipItem::paint(QPainter *painter, } } // draw audio thumbnails - if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == AUDIO) && m_audioThumbReady) { + if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == Audio) && m_audioThumbReady) { double startpixel = exposed.left(); if (startpixel < 0) @@ -1059,60 +1059,60 @@ void ClipItem::paint(QPainter *painter, } -OPERATIONTYPE ClipItem::operationMode(const QPointF &pos) +OperationType ClipItem::operationMode(const QPointF &pos) { - if (isItemLocked()) return NONE; + if (isItemLocked()) return None; const double scale = projectScene()->scale().x(); double maximumOffset = 6 / scale; if (isSelected() || (parentItem() && parentItem()->isSelected())) { int kf = mouseOverKeyFrames(pos, maximumOffset); if (kf != -1) { m_editedKeyframe = kf; - return KEYFRAME; + return KeyFrame; } } QRectF rect = sceneBoundingRect(); int addtransitionOffset = 10; // Don't allow add transition if track height is very small. No transitions for audio only clips - if (rect.height() < 30 || isAudioOnly() || m_clipType == AUDIO) addtransitionOffset = 0; + if (rect.height() < 30 || isAudioOnly() || m_clipType == Audio) addtransitionOffset = 0; if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - return FADEIN; + return FadeIn; } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { // If we are in a group, allow resize only if all clips start at same position if (parentItem()) { QGraphicsItemGroup *dragGroup = static_cast (parentItem()); QList list = dragGroup->childItems(); for (int i = 0; i < list.count(); ++i) { - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { ClipItem *c = static_cast (list.at(i)); - if (c->startPos() != startPos()) return MOVE; + if (c->startPos() != startPos()) return MoveOperation; } } } - return RESIZESTART; + return ResizeStart; } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - return FADEOUT; + return FadeOut; } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { // If we are in a group, allow resize only if all clips end at same position if (parentItem()) { QGraphicsItemGroup *dragGroup = static_cast (parentItem()); QList list = dragGroup->childItems(); for (int i = 0; i < list.count(); ++i) { - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { ClipItem *c = static_cast (list.at(i)); - if (c->endPos() != endPos()) return MOVE; + if (c->endPos() != endPos()) return MoveOperation; } } } - return RESIZEEND; + return ResizeEnd; } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - return TRANSITIONSTART; + return TransitionStart; } else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - return TRANSITIONEND; + return TransitionEnd; } - return MOVE; + return MoveOperation; } int ClipItem::itemHeight() @@ -1333,7 +1333,7 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange) { bool sizeLimit = false; - if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) { + if (clipType() != Image && clipType() != Color && clipType() != Text) { const int min = (startPos() - cropStart()).frames(m_fps); if (posx < min) posx = min; sizeLimit = true; @@ -1867,11 +1867,11 @@ void ClipItem::setAudioOnly(bool force) m_audioOnly = force; if (m_audioOnly) m_baseColor = QColor(141, 215, 166); else { - if (m_clipType == COLOR) { + if (m_clipType == Color) { QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); - } else if (m_clipType == AUDIO) m_baseColor = QColor(141, 215, 166); + } else if (m_clipType == Audio) m_baseColor = QColor(141, 215, 166); else m_baseColor = QColor(141, 166, 215); } if (parentItem()) diff --git a/src/clipitem.h b/src/clipitem.h index bb51610e..4ee13a69 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -54,7 +54,7 @@ public: virtual int type() const; void resizeStart(int posx, bool size = true, bool emitChange = true); void resizeEnd(int posx, bool emitChange = true); - OPERATIONTYPE operationMode(const QPointF &pos); + OperationType operationMode(const QPointF &pos); static int itemHeight(); const QString clipProducer() const; int clipType() const; @@ -208,7 +208,7 @@ private: DocClipBase *m_clip; ItemInfo m_speedIndependantInfo; QString m_producer; - CLIPTYPE m_clipType; + ClipType m_clipType; QString m_clipName; QString m_effectNames; int m_startFade; diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index b5932d6d..584955a4 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -403,7 +403,7 @@ QMap ClipManager::documentFolderList() const void ClipManager::addClip(DocClipBase *clip) { m_clipList.append(clip); - if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) { + if (clip->clipType() != Color && clip->clipType() != SlideShow && !clip->fileURL().isEmpty()) { // listen for file change //kDebug() << "// LISTEN FOR: " << clip->fileURL().path(); m_fileWatcher.addFile(clip->fileURL().path()); @@ -433,7 +433,7 @@ void ClipManager::deleteClip(const QString &clipId) for (int i = 0; i < m_clipList.count(); ++i) { if (m_clipList.at(i)->getId() == clipId) { DocClipBase *clip = m_clipList.takeAt(i); - if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) { + if (clip->clipType() != Color && clip->clipType() != SlideShow && !clip->fileURL().isEmpty()) { //if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) { // listen for file change m_fileWatcher.removeFile(clip->fileURL().path()); @@ -573,7 +573,7 @@ void ClipManager::slotAddClipList(const KUrl::List &urls, const QMap name().startsWith("image/")) { - prod.setAttribute("type", (int) IMAGE); + prod.setAttribute("type", (int) Image); prod.setAttribute("in", 0); prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1); @@ -596,7 +596,7 @@ void ClipManager::slotAddClipList(const KUrl::List &urls, const QMap properties, c prod.setAttribute(i.key(), i.value()); ++i; } - prod.setAttribute("type", (int) SLIDESHOW); + prod.setAttribute("type", (int) SlideShow); uint id = m_clipIdCounter++; if (!group.isEmpty()) { prod.setAttribute("groupname", group); @@ -719,7 +719,7 @@ void ClipManager::slotAddTextClipFile(const QString &titleName, int duration, co prod.setAttribute("groupname", group); prod.setAttribute("groupid", groupId); } - prod.setAttribute("type", (int) TEXT); + prod.setAttribute("type", (int) Text); prod.setAttribute("transparency", "1"); prod.setAttribute("in", "0"); prod.setAttribute("out", duration - 1); @@ -740,7 +740,7 @@ void ClipManager::slotAddTextTemplateClip(QString titleName, const KUrl &path, c prod.setAttribute("groupname", group); prod.setAttribute("groupid", groupId); } - prod.setAttribute("type", (int) TEXT); + prod.setAttribute("type", (int) Text); prod.setAttribute("transparency", "1"); prod.setAttribute("in", "0"); @@ -817,15 +817,15 @@ QDomElement ClipManager::groupsXml() const groups.appendChild(group); QList children = m_groupsList.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { - if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + if (children.at(j)->type() == AVWidget || children.at(j)->type() == TransitionWidget) { AbstractClipItem *item = static_cast (children.at(j)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { QDomElement clip = doc.createElement("clipitem"); clip.setAttribute("track", info.track); clip.setAttribute("position", info.startPos.frames(m_doc->fps())); group.appendChild(clip); - } else if (item->type() == TRANSITIONWIDGET) { + } else if (item->type() == TransitionWidget) { QDomElement clip = doc.createElement("transitionitem"); clip.setAttribute("track", info.track); clip.setAttribute("position", info.startPos.frames(m_doc->fps())); diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 79b8c2c2..18c2a6b9 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -265,7 +265,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Frequency") << props.value("frequency")); - CLIPTYPE t = m_clip->clipType(); + ClipType t = m_clip->clipType(); if (props.contains("proxy") && props.value("proxy") != "-") { KFileItem f(KFileItem::Unknown, KFileItem::Unknown, KUrl(props.value("proxy")), true); @@ -281,11 +281,11 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps l->addWidget(pb); connect(pb, SIGNAL(clicked()), this, SLOT(slotDeleteProxy())); m_proxyContainer->setLayout(l); - if (t == IMAGE) { + if (t == Image) { m_view.tab_image->layout()->addWidget(line); m_view.tab_image->layout()->addWidget(m_proxyContainer); } - else if (t == AUDIO) { + else if (t == Audio) { m_view.tab_audio->layout()->addWidget(line); m_view.tab_audio->layout()->addWidget(m_proxyContainer); } @@ -295,18 +295,18 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps } } - if (t != AUDIO && t != AV) { + if (t != Audio && t != AV) { m_view.clip_force_aindex->setEnabled(false); } - if (t != VIDEO && t != AV) { + if (t != Video && t != AV) { m_view.clip_force_vindex->setEnabled(false); } - if (t == PLAYLIST) + if (t == Playlist) m_view.tabWidget->setTabText(VIDEOTAB, i18n("Playlist")); - if (t == IMAGE) { + if (t == Image) { m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); m_view.tabWidget->removeTab(AUDIOTAB); @@ -320,7 +320,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps if (width % 2 == 1) width++; m_view.clip_thumb->setPixmap(QPixmap(url.path()).scaled(QSize(width, 180), Qt::KeepAspectRatio)); - } else if (t == COLOR) { + } else if (t == Color) { m_view.clip_path->setEnabled(false); m_view.tabWidget->removeTab(METATAB); m_view.tabWidget->removeTab(IMAGETAB); @@ -330,7 +330,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps m_view.clip_thumb->setHidden(true); m_view.clip_color->setColor(QColor('#' + props.value("colour").right(8).left(6))); connect(m_view.clip_color, SIGNAL(changed(QColor)), this, SLOT(slotModified())); - } else if (t == SLIDESHOW) { + } else if (t == SlideShow) { if (url.fileName().startsWith(QLatin1String(".all."))) { // the image sequence is defined by mimetype m_view.clip_path->setText(url.directory()); @@ -441,7 +441,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps connect(m_view.slide_luma, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int))); connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder())); - } else if (t != AUDIO) { + } else if (t != Audio) { m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); @@ -456,7 +456,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps m_view.clip_thumb->setMinimumSize(180 * KdenliveSettings::project_display_ratio(), 180); - if (t == IMAGE || t == VIDEO || t == PLAYLIST) + if (t == Image || t == Video || t == Playlist) m_view.tabWidget->removeTab(AUDIOTAB); } else { m_view.tabWidget->removeTab(IMAGETAB); @@ -466,7 +466,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps m_view.clip_thumb->setHidden(true); } - if (t != SLIDESHOW && t != COLOR) { + if (t != SlideShow && t != Color) { KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true); m_view.clip_filesize->setText(KIO::convertSize(f.size())); } else { @@ -475,7 +475,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps } m_view.clip_duration->setInputMask(tc.mask()); m_view.clip_duration->setText(tc.getTimecode(m_clip->duration())); - if (t != IMAGE && t != COLOR && t != TEXT) { + if (t != Image && t != Color && t != Text) { m_view.clip_duration->setReadOnly(true); } else { connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength())); @@ -960,7 +960,7 @@ QMap ClipProperties::properties() { QMap props; QLocale locale; - CLIPTYPE t = UNKNOWN; + ClipType t = Unknown; if (m_clip != NULL) { t = m_clip->clipType(); m_old_props = m_clip->properties(); @@ -1081,7 +1081,7 @@ QMap ClipProperties::properties() if (m_old_props.value("description") != m_view.clip_description->text()) props["description"] = m_view.clip_description->text(); - if (t == COLOR) { + if (t == Color) { QString new_color = m_view.clip_color->color().name(); if (new_color != QString('#' + m_old_props.value("colour").right(8).left(6))) { m_clipNeedsRefresh = true; @@ -1091,7 +1091,7 @@ QMap ClipProperties::properties() if (duration != m_clip->duration().frames(m_fps)) { props["out"] = QString::number(duration - 1); } - } else if (t == IMAGE) { + } else if (t == Image) { if ((int) m_view.image_transparency->isChecked() != m_old_props.value("transparency").toInt()) { props["transparency"] = QString::number((int)m_view.image_transparency->isChecked()); //m_clipNeedsRefresh = true; @@ -1100,7 +1100,7 @@ QMap ClipProperties::properties() if (duration != m_clip->duration().frames(m_fps)) { props["out"] = QString::number(duration - 1); } - } else if (t == SLIDESHOW) { + } else if (t == SlideShow) { QString value = QString::number((int) m_view.slide_loop->isChecked()); if (m_old_props.value("loop") != value) props["loop"] = value; value = QString::number((int) m_view.slide_crop->isChecked()); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 0cf3b482..65454aa2 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -116,8 +116,8 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen , m_document(doc) , m_scene(projectscene) , m_cursorLine(NULL) - , m_operationMode(NONE) - , m_moveOpMode(NONE) + , m_operationMode(None) + , m_moveOpMode(None) , m_dragItem(NULL) , m_dragGuide(NULL) , m_visualTip(NULL) @@ -137,7 +137,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen , m_scrollOffset(0) , m_clipDrag(false) , m_findIndex(0) - , m_tool(SELECTTOOL) + , m_tool(SelectTool) , m_copiedItems() , m_menuPosition() , m_blockRefresh(false) @@ -299,7 +299,7 @@ void CustomTrackView::updateSceneFrameWidth() QList itemList = items(); ClipItem *item; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { item = (ClipItem*) itemList.at(i); item->resetFrameWidth(frameWidth); item->resetThumbs(true); @@ -319,13 +319,13 @@ bool CustomTrackView::checkTrackHeight() bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { item = (ClipItem*) itemList.at(i); item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1); item->resetFrameWidth(frameWidth); item->resetThumbs(true); - } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + } else if (itemList.at(i)->type() == TransitionWidget) { transitionitem = (Transition*) itemList.at(i); transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1); transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2); @@ -368,7 +368,7 @@ int CustomTrackView::getPreviousVideoTrack(int track) track = m_document->tracksCount() - track - 1; track --; for (int i = track; i > -1; --i) { - if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1; + if (m_document->trackInfoAt(i).type == VideoTrack) return i + 1; } return 0; } @@ -399,7 +399,7 @@ void CustomTrackView::slotCheckMouseScrolling() void CustomTrackView::slotCheckPositionScrolling() { // If mouse is at a border of the view, scroll - if (m_moveOpMode != SEEK) return; + if (m_moveOpMode != Seek) return; if (mapFromScene(m_cursorPos, 0).x() < 3) { if (horizontalScrollBar()->value() == 0) return; horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2); @@ -435,15 +435,15 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); - if (m_operationMode == SCROLLTIMELINE) { + if (m_operationMode == ScrollTimeline) { QGraphicsView::mouseMoveEvent(event); return; } if (event->buttons() & Qt::MidButton) return; - if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && m_operationMode != RESIZESTART && m_operationMode != RESIZEEND)) { + if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SpacerTool && m_operationMode != ResizeStart && m_operationMode != ResizeEnd)) { event->setAccepted(true); - m_moveOpMode = NONE; + m_moveOpMode = None; if (event->modifiers() != Qt::ControlModifier || dragMode() == QGraphicsView::RubberBandDrag) QGraphicsView::mouseMoveEvent(event); return; } @@ -451,8 +451,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (event->buttons() != Qt::NoButton) { bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance(); if (m_dragItem && move) m_clipDrag = true; - if (m_dragItem && m_tool == SELECTTOOL) { - if (m_operationMode == MOVE && m_clipDrag) { + if (m_dragItem && m_tool == SelectTool) { + if (m_operationMode == MoveOperation && m_clipDrag) { QGraphicsView::mouseMoveEvent(event); // If mouse is at a border of the view, scroll if (pos < 5) { @@ -464,9 +464,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } else if (m_scrollTimer.isActive()) { m_scrollTimer.stop(); } - } else if (m_operationMode == RESIZESTART && move) { + } else if (m_operationMode == ResizeStart && move) { m_document->renderer()->pause(); - if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWidget && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps()))); @@ -477,9 +477,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart() - m_dragItemInfo.cropStart, KdenliveSettings::frametimecode()); emit displayMessage(i18n("Crop from start:") + ' ' + crop + ' ' + i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage); - } else if (m_operationMode == RESIZEEND && move) { + } else if (m_operationMode == ResizeEnd && move) { m_document->renderer()->pause(); - if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWidget && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps()))); @@ -489,11 +489,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode()); emit displayMessage(i18n("Duration:") + ' ' + duration + ' ' + i18n("Offset:") + ' ' + offset, InformationMessage); - } else if (m_operationMode == FADEIN && move) { + } else if (m_operationMode == FadeIn && move) { ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps()))); - } else if (m_operationMode == FADEOUT && move) { + } else if (m_operationMode == FadeOut && move) { ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - mappedXPos)); - } else if (m_operationMode == KEYFRAME && move) { + } else if (m_operationMode == KeyFrame && move) { GenTime keyFramePos = GenTime(mappedXPos, m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); double pos = mapToScene(event->pos()).toPoint().y(); QRectF br = m_dragItem->sceneBoundingRect(); @@ -505,11 +505,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } removeTipAnimation(); return; - } else if (m_operationMode == MOVEGUIDE) { + } else if (m_operationMode == MoveGuide) { removeTipAnimation(); QGraphicsView::mouseMoveEvent(event); return; - } else if (m_operationMode == SPACER && move && m_selectionGroup) { + } else if (m_operationMode == Spacer && move && m_selectionGroup) { // spacer tool snappedPos = getSnapPointForPos(mappedXPos + m_spacerOffset); if (snappedPos < 0) snappedPos = 0; @@ -520,7 +520,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); @@ -531,7 +531,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) int offset = 0; for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; - if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + if (collidingItems.at(i)->type() == AVWidget && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); // Moving backward, determine best pos QPainterPath clipPath; @@ -546,7 +546,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); @@ -556,7 +556,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; - if (collidingItems.at(i)->type() == AVWIDGET) { + if (collidingItems.at(i)->type() == AVWidget) { collision = true; break; } @@ -569,7 +569,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); @@ -579,7 +579,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) offset = 0; for (int i = 0; i < collidingItems.count(); ++i) { - if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { + if (collidingItems.at(i)->type() == TransitionWidget && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); // Moving backward, determine best pos QPainterPath clipPath; @@ -595,7 +595,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) collidingItems.removeAll(subchildren.at(j)); @@ -603,7 +603,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems.removeAll(children.at(i)); } for (int i = 0; i < collidingItems.count(); ++i) { - if (collidingItems.at(i)->type() == TRANSITIONWIDGET) { + if (collidingItems.at(i)->type() == TransitionWidget) { collision = true; break; } @@ -616,36 +616,36 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } } - if (m_tool == RAZORTOOL) { + if (m_tool == RazorTool) { setCursor(m_razorCursor); - } else if (m_tool == SPACERTOOL) { + } else if (m_tool == SpacerTool) { setCursor(m_spacerCursor); } QList itemList = items(event->pos()); QGraphicsRectItem *item = NULL; - OPERATIONTYPE opMode = NONE; + OperationType opMode = None; if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) { - opMode = MOVEGUIDE; + opMode = MoveGuide; setCursor(Qt::SplitHCursor); } else for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { + if (itemList.at(i)->type() == AVWidget || itemList.at(i)->type() == TransitionWidget) { item = (QGraphicsRectItem*) itemList.at(i); break; } } - if (m_tool == SPACERTOOL) { + if (m_tool == SpacerTool) { event->accept(); return; } if (item && event->buttons() == Qt::NoButton) { AbstractClipItem *clip = static_cast (item); - if (m_tool == RAZORTOOL) { + if (m_tool == RazorTool) { // razor tool over a clip, display current frame in monitor - if (false && !m_blockRefresh && item->type() == AVWIDGET) { + if (false && !m_blockRefresh && item->type() == AVWidget) { //TODO: solve crash when showing frame when moving razor over clip emit showClipFrame(((ClipItem *) item)->baseClip(), QPoint(), false, mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps())); } @@ -655,11 +655,11 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (m_selectionGroup && clip->parentItem() == m_selectionGroup) { // all other modes break the selection, so the user probably wants to move it - opMode = MOVE; + opMode = MoveOperation; } else { if (clip->rect().width() * transform().m11() < 15) { // If the item is very small, only allow move - opMode = MOVE; + opMode = MoveOperation; } else opMode = clip->operationMode(mapToScene(event->pos())); } @@ -674,55 +674,55 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) m_moveOpMode = opMode; setTipAnimation(clip, opMode, size); ClipItem *ci = NULL; - if (item->type() == AVWIDGET) + if (item->type() == AVWidget) ci = static_cast (item); QString message; - if (opMode == MOVE) { + if (opMode == MoveOperation) { setCursor(Qt::OpenHandCursor); if (ci) { message = ci->clipName() + i18n(":"); message.append(i18n(" Position:") + m_document->timecode().getDisplayTimecode(ci->info().startPos, KdenliveSettings::frametimecode())); message.append(i18n(" Duration:") + m_document->timecode().getDisplayTimecode(ci->cropDuration(), KdenliveSettings::frametimecode())); - if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + if (clip->parentItem() && clip->parentItem()->type() == GroupWidget) { AbstractGroupItem *parent = static_cast (clip->parentItem()); if (clip->parentItem() == m_selectionGroup) message.append(i18n(" Selection duration:")); else message.append(i18n(" Group duration:")); message.append(m_document->timecode().getDisplayTimecode(parent->duration(), KdenliveSettings::frametimecode())); - if (parent->parentItem() && parent->parentItem()->type() == GROUPWIDGET) { + if (parent->parentItem() && parent->parentItem()->type() == GroupWidget) { AbstractGroupItem *parent2 = static_cast (parent->parentItem()); message.append(i18n(" Selection duration:") + m_document->timecode().getDisplayTimecode(parent2->duration(), KdenliveSettings::frametimecode())); } } } - } else if (opMode == RESIZESTART) { + } else if (opMode == ResizeStart) { setCursor(KCursor("left_side", Qt::SizeHorCursor)); if (ci) message = i18n("Crop from start: ") + m_document->timecode().getDisplayTimecode(ci->cropStart(), KdenliveSettings::frametimecode()); - if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup) + if (item->type() == AVWidget && item->parentItem() && item->parentItem() != m_selectionGroup) message.append(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once.")); - } else if (opMode == RESIZEEND) { + } else if (opMode == ResizeEnd) { setCursor(KCursor("right_side", Qt::SizeHorCursor)); if (ci) message = i18n("Duration: ") + m_document->timecode().getDisplayTimecode(ci->cropDuration(), KdenliveSettings::frametimecode()); - if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup) + if (item->type() == AVWidget && item->parentItem() && item->parentItem() != m_selectionGroup) message.append(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once.")); - } else if (opMode == FADEIN || opMode == FADEOUT) { + } else if (opMode == FadeIn || opMode == FadeOut) { setCursor(Qt::PointingHandCursor); - if (ci && opMode == FADEIN && ci->fadeIn()) { + if (ci && opMode == FadeIn && ci->fadeIn()) { message = i18n("Fade in duration: "); message.append(m_document->timecode().getDisplayTimecodeFromFrames(ci->fadeIn(), KdenliveSettings::frametimecode())); - } else if (ci && opMode == FADEOUT && ci->fadeOut()) { + } else if (ci && opMode == FadeOut && ci->fadeOut()) { message = i18n("Fade out duration: "); message.append(m_document->timecode().getDisplayTimecodeFromFrames(ci->fadeOut(), KdenliveSettings::frametimecode())); } else { message = i18n("Drag to add or resize a fade effect."); } - } else if (opMode == TRANSITIONSTART || opMode == TRANSITIONEND) { + } else if (opMode == TransitionStart || opMode == TransitionEnd) { setCursor(Qt::PointingHandCursor); message = i18n("Click to add a transition."); - } else if (opMode == KEYFRAME) { + } else if (opMode == KeyFrame) { setCursor(Qt::PointingHandCursor); emit displayMessage(i18n("Move keyframe above or below clip to remove it, double click to add a new one."), InformationMessage); } @@ -730,23 +730,23 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (!message.isEmpty()) emit displayMessage(message, InformationMessage); } // no clip under mouse - else if (m_tool == RAZORTOOL) { + else if (m_tool == RazorTool) { event->accept(); return; - } else if (opMode == MOVEGUIDE) { + } else if (opMode == MoveGuide) { m_moveOpMode = opMode; } else { removeTipAnimation(); setCursor(Qt::ArrowCursor); if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { QGraphicsView::mouseMoveEvent(event); - m_moveOpMode = SEEK; + m_moveOpMode = Seek; if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) { seekCursorPos(mappedXPos); slotCheckPositionScrolling(); } return; - } else m_moveOpMode = NONE; + } else m_moveOpMode = None; } QGraphicsView::mouseMoveEvent(event); } @@ -762,7 +762,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (event->button() == Qt::MidButton) { emit playMonitor(); m_blockRefresh = false; - m_operationMode = NONE; + m_operationMode = None; return; } @@ -779,7 +779,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) scene()->clearSelection(); } m_blockRefresh = false; - m_operationMode = RUBBERSELECTION; + m_operationMode = RubberSelection; QGraphicsView::mousePressEvent(event); return; } @@ -787,7 +787,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_blockRefresh = true; m_dragGuide = NULL; - if (m_tool != RAZORTOOL) activateMonitor(); + if (m_tool != RazorTool) activateMonitor(); else if (m_document->renderer()->isPlaying()) { m_document->renderer()->pause(); return; @@ -796,11 +796,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // check item under mouse QList collisionList = items(m_clickEvent); - if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { + if (event->modifiers() == Qt::ControlModifier && m_tool != SpacerTool && collisionList.count() == 0) { // Pressing Ctrl + left mouse button in an empty area scrolls the timeline setDragMode(QGraphicsView::ScrollHandDrag); m_blockRefresh = false; - m_operationMode = SCROLLTIMELINE; + m_operationMode = ScrollTimeline; QGraphicsView::mousePressEvent(event); return; } @@ -811,7 +811,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = (Guide *) collisionList.at(i); if (event->button() == Qt::LeftButton) { // move it m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, true); - m_operationMode = MOVEGUIDE; + m_operationMode = MoveGuide; // deselect all clips so that only the guide will move m_scene->clearSelection(); resetSelectionGroup(false); @@ -832,7 +832,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) double yOffset = 0; m_selectionMutex.lock(); while (!m_dragGuide && ct < collisionList.count()) { - if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { + if (collisionList.at(ct)->type() == AVWidget || collisionList.at(ct)->type() == TransitionWidget) { collisionClip = static_cast (collisionList.at(ct)); if (collisionClip->isItemLocked() || !collisionClip->isEnabled()) { ct++; @@ -856,9 +856,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionGroup->setProperty("y_absolute", yOffset); m_selectionGroup->setProperty("locked_tracks", lockedTracks); } - if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GroupWidget && m_dragItem->parentItem() != m_selectionGroup) { QGraphicsItem *topGroup = m_dragItem->parentItem(); - while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) { + while (topGroup->parentItem() && topGroup->parentItem()->type() == GroupWidget && topGroup->parentItem() != m_selectionGroup) { topGroup = topGroup->parentItem(); } dragGroup = static_cast (topGroup); @@ -883,7 +883,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem->setGraphicsEffect(eff); }*/ #endif - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isEnabled()) { + if (m_dragItem && m_dragItem->type() == TransitionWidget && m_dragItem->isEnabled()) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); m_autoTransition->setEnabled(true); @@ -921,7 +921,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = static_cast (guidesCollisionList.at(0));*/ } - m_operationMode = NONE; + m_operationMode = None; if (dragGroup == NULL) { if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) dragGroup = static_cast (m_dragItem->parentItem()); @@ -931,12 +931,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } m_selectionMutex.unlock(); // No item under click - if (m_dragItem == NULL || m_tool == SPACERTOOL) { + if (m_dragItem == NULL || m_tool == SpacerTool) { resetSelectionGroup(false); m_scene->clearSelection(); //event->accept(); updateClipTypeActions(NULL); - if (m_tool == SPACERTOOL) { + if (m_tool == SpacerTool) { QList selection; if (event->modifiers() == Qt::ControlModifier) { // Ctrl + click, select all items on track after click position @@ -971,13 +971,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { + if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget)) { AbstractClipItem *item = static_cast(selection.at(i)); if (item->isItemLocked()) continue; offsetList.append(item->startPos()); offsetList.append(item->endPos()); m_selectionGroup->addItem(selection.at(i)); - } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) { + } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GroupWidget) { if (static_cast(selection.at(i))->isItemLocked()) continue; QList children = selection.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { @@ -1005,7 +1005,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } - m_operationMode = SPACER; + m_operationMode = Spacer; } else if (event->button() != Qt::RightButton) { setCursor(Qt::ArrowCursor); seekCursorPos((int)(mapToScene(event->x(), 0).x())); @@ -1016,9 +1016,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } // Razor tool - if (m_tool == RAZORTOOL && m_dragItem) { + if (m_tool == RazorTool && m_dragItem) { GenTime cutPos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()); - if (m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem->type() == TransitionWidget) { emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); } else { m_document->renderer()->pause(); @@ -1116,7 +1116,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } if (collisionClip != NULL || m_dragItem == NULL) { - if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) { + if (m_dragItem && m_dragItem->type() == AVWidget && !m_dragItem->isItemLocked()) { ClipItem *selected = static_cast (m_dragItem); emit clipItemSelected(selected); } else { @@ -1132,20 +1132,20 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) { // all other modes break the selection, so the user probably wants to move it - m_operationMode = MOVE; + m_operationMode = MoveOperation; } else { if (m_dragItem->rect().width() * transform().m11() < 15) { // If the item is very small, only allow move - m_operationMode = MOVE; + m_operationMode = MoveOperation; } else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); } - } else m_operationMode = NONE; + } else m_operationMode = None; m_controlModifier = (event->modifiers() == Qt::ControlModifier); // Update snap points if (m_selectionGroup == NULL) { - if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) + if (m_operationMode == ResizeEnd || m_operationMode == ResizeStart) updateSnapPoints(NULL); else updateSnapPoints(m_dragItem); @@ -1154,7 +1154,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList offsetList; QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (children.at(i)->type() == AVWidget || children.at(i)->type() == TransitionWidget) { AbstractClipItem *item = static_cast (children.at(i)); offsetList.append(item->startPos()); offsetList.append(item->endPos()); @@ -1175,13 +1175,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionMutex.unlock(); } - if (m_operationMode == KEYFRAME) { + if (m_operationMode == KeyFrame) { m_dragItem->updateSelectedKeyFrame(); m_blockRefresh = false; return; - } else if (m_operationMode == MOVE) { + } else if (m_operationMode == MoveOperation) { setCursor(Qt::ClosedHandCursor); - } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) { + } else if (m_operationMode == TransitionStart && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.startPos = m_dragItem->startPos(); info.track = m_dragItem->track(); @@ -1204,7 +1204,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList selection = m_scene->items(r); bool transitionAccepted = true; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); @@ -1213,7 +1213,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) { + } else if (m_operationMode == TransitionEnd && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps()); info.track = m_dragItem->track(); @@ -1239,7 +1239,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList selection = m_scene->items(r); bool transitionAccepted = true; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); @@ -1249,7 +1249,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition); else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - } else if ((m_operationMode == RESIZESTART || m_operationMode == RESIZEEND) && m_selectionGroup) { + } else if ((m_operationMode == ResizeStart || m_operationMode == ResizeEnd) && m_selectionGroup) { resetSelectionGroup(false); m_dragItem->setSelected(true); } @@ -1263,7 +1263,7 @@ void CustomTrackView::rebuildGroup(int childTrack, const GenTime &childPos) AbstractGroupItem *group = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == GROUPWIDGET) { + if (list.at(i)->type() == GroupWidget) { group = static_cast (list.at(i)); break; } @@ -1300,12 +1300,12 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) m_selectionGroup = NULL; for (int i = 0; i < children.count(); ++i) { if (children.at(i)->parentItem() == 0) { - if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { + if ((children.at(i)->type() == AVWidget || children.at(i)->type() == TransitionWidget)) { if (!static_cast (children.at(i))->isItemLocked()) { children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } - } else if (children.at(i)->type() == GROUPWIDGET) { + } else if (children.at(i)->type() == GroupWidget) { children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); children.at(i)->setSelected(selectItems); } @@ -1329,9 +1329,9 @@ void CustomTrackView::groupSelectedItems(QList selection, bool for (int i = 0; i < selection.count(); ++i) { if (selectNewGroup) selection.at(i)->setSelected(true); - if (selection.at(i)->type() == GROUPWIDGET) { + if (selection.at(i)->type() == GroupWidget) { AbstractGroupItem *it = static_cast (selection.at(i)); - while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + while (it->parentItem() && it->parentItem()->type() == GroupWidget) { it = static_cast (it->parentItem()); } if (!it || it->isItemLocked()) continue; @@ -1339,10 +1339,10 @@ void CustomTrackView::groupSelectedItems(QList selection, bool } } for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) { + if (selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget) { + if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GroupWidget) { AbstractGroupItem *it = static_cast (selection.at(i)->parentItem()); - while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + while (it->parentItem() && it->parentItem()->type() == GroupWidget) { it = static_cast (it->parentItem()); } if (!it || it->isItemLocked()) continue; @@ -1389,7 +1389,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool foreach (QGraphicsItemGroup *value, groupsList) { QList children = value->childItems(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) + if (children.at(i)->type() == AVWidget || children.at(i)->type() == TransitionWidget) itemsList.insert(children.at(i)); } AbstractGroupItem *grp = static_cast(value); @@ -1506,7 +1506,7 @@ void CustomTrackView::editItemDuration() return; } - if (item->type() == GROUPWIDGET || (item->parentItem() && item->parentItem()->type() == GROUPWIDGET)) { + if (item->type() == GroupWidget || (item->parentItem() && item->parentItem()->type() == GroupWidget)) { emit displayMessage(i18n("Cannot edit an item in a group"), ErrorMessage); return; } @@ -1514,7 +1514,7 @@ void CustomTrackView::editItemDuration() if (!item->isItemLocked()) { GenTime minimum; GenTime maximum; - if (item->type() == TRANSITIONWIDGET) + if (item->type() == TransitionWidget) getTransitionAvailableSpace(item, minimum, maximum); else getClipAvailableSpace(item, minimum, maximum); @@ -1524,7 +1524,7 @@ void CustomTrackView::editItemDuration() if (d->exec() == QDialog::Accepted) { ItemInfo clipInfo = item->info(); ItemInfo startInfo = clipInfo; - if (item->type() == TRANSITIONWIDGET) { + if (item->type() == TransitionWidget) { // move & resize transition clipInfo.startPos = d->startPos(); clipInfo.endPos = clipInfo.startPos + d->duration(); @@ -1601,7 +1601,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs m_timelineContextClipMenu->popup(pos); } else { m_ungroupAction->setEnabled(false); - if (clip->type() == AVWIDGET) { + if (clip->type() == AVWidget) { ClipItem *item = static_cast (clip); //build go to marker menu if (item->baseClip()) { @@ -1620,7 +1620,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs updateClipTypeActions(item); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); m_timelineContextClipMenu->popup(pos); - } else if (clip->type() == TRANSITIONWIDGET) { + } else if (clip->type() == TransitionWidget) { m_timelineContextTransitionMenu->popup(pos); } } @@ -1646,13 +1646,13 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) pasteInfo.startPos = GenTime(m_cursorPos, m_document->fps()); pasteInfo.endPos = pasteInfo.startPos + info.endPos; pasteInfo.track = selectedTrack(); - bool ok = canBePastedTo(pasteInfo, AVWIDGET); + bool ok = canBePastedTo(pasteInfo, AVWidget); if (!ok) { // Cannot be inserted at cursor pos, insert at end of track int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1; pasteInfo.startPos = GenTime(duration, m_document->fps()); pasteInfo.endPos = pasteInfo.startPos + info.endPos; - ok = canBePastedTo(pasteInfo, AVWIDGET); + ok = canBePastedTo(pasteInfo, AVWidget); } if (!ok) { emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); @@ -1712,7 +1712,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) pasteInfo.track = (int)(framePos.y() / m_tracksHeight); framePos.setX((int)(framePos.x() + 0.5)); framePos.setY(pasteInfo.track * m_tracksHeight); - if (!canBePastedTo(pasteInfo, AVWIDGET)) { + if (!canBePastedTo(pasteInfo, AVWidget)) { return true; } m_selectionGroup = new AbstractGroupItem(m_document->fps()); @@ -1769,7 +1769,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) infoList.append(info); start += info.cropDuration; } - if (!canBePastedTo(infoList, AVWIDGET)) { + if (!canBePastedTo(infoList, AVWidget)) { return true; } if (ids.size() > 1) m_selectionGroup = new AbstractGroupItem(m_document->fps()); @@ -1892,7 +1892,7 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) if (clip) { // Special case: speed effect if (effect.attribute("id") == "speed") { - if (clip->clipType() != VIDEO && clip->clipType() != AV && clip->clipType() != PLAYLIST) { + if (clip->clipType() != Video && clip->clipType() != AV && clip->clipType() != Playlist) { emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); return; } @@ -1963,10 +1963,10 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == GROUPWIDGET) { + if (itemList.at(i)->type() == GroupWidget) { itemList << itemList.at(i)->childItems(); } - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = static_cast (itemList.at(i)); if (effect.tagName() == "effectgroup") { QDomNodeList effectlist = effect.elementsByTagName("effect"); @@ -2047,7 +2047,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int //expand groups for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == GROUPWIDGET) { + if (itemList.at(i)->type() == GroupWidget) { QList subitems = itemList.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { if (!itemList.contains(subitems.at(j))) itemList.append(subitems.at(j)); @@ -2056,7 +2056,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int } for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = static_cast (itemList.at(i)); if (effect.tagName() == "effectgroup") { QDomNodeList effectlist = effect.elementsByTagName("effect"); @@ -2084,7 +2084,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int /*if (effectCommand->childCount() == 1) { // Display newly added clip effect for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *clip = static_cast(itemList.at(i)); clip->setSelectedEffect(clip->effectsCount()); if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) { @@ -2100,7 +2100,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int } else { for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *clip = static_cast(itemList.at(i)); if (clip->isMainSelectedClip()) { emit clipItemSelected(clip); @@ -2116,7 +2116,7 @@ void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, int offs { if (effect.attribute("type") == "audio") { // Don't add audio effects on video clips - if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + if (item->isVideoOnly() || (item->clipType() != Audio && item->clipType() != AV && item->clipType() != Playlist)) { /* do not show error message when item is part of a group as the user probably knows what he does then * and the message is annoying when working with the split audio feature */ if (!item->parentItem() || item->parentItem() == m_selectionGroup) @@ -2125,7 +2125,7 @@ void CustomTrackView::processEffect(ClipItem *item, QDomElement effect, int offs } } else if (effect.attribute("type") == "video" || !effect.hasAttribute("type")) { // Don't add video effect on audio clips - if (item->isAudioOnly() || item->clipType() == AUDIO) { + if (item->isAudioOnly() || item->clipType() == Audio) { /* do not show error message when item is part of a group as the user probably knows what he does then * and the message is annoying when working with the split audio feature */ if (!item->parentItem() || item->parentItem() == m_selectionGroup) @@ -2170,7 +2170,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef //expand groups for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == GROUPWIDGET) { + if (items.at(i)->type() == GroupWidget) { QList subitems = items.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { if (!items.contains(subitems.at(j))) items.append(subitems.at(j)); @@ -2179,7 +2179,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef } for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == AVWIDGET) { + if (items.at(i)->type() == AVWidget) { ClipItem *item = static_cast (items.at(i)); int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id")); if (ix != -1) { @@ -2573,7 +2573,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { QList itemList = scene()->selectedItems(); if (itemList.count() == 1) { - if (itemList.at(0)->type() == AVWIDGET) { + if (itemList.at(0)->type() == AVWidget) { ClipItem *item = (ClipItem *) itemList.at(0); ItemInfo info; info.track = item->track(); @@ -2593,7 +2593,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QList selection = m_scene->items(r); bool transitionAccepted = true; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); @@ -2619,7 +2619,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QList selection = m_scene->items(r); bool transitionAccepted = true; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { if (tr->endPos() > info.startPos) info.startPos = tr->endPos(); @@ -2631,7 +2631,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) } } } else for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = (ClipItem *) itemList.at(i); ItemInfo info; info.startPos = item->startPos(); @@ -2644,7 +2644,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QList selection = m_scene->items(r); bool transitionAccepted = true; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { if (tr->startPos() < info.endPos) info.endPos = tr->startPos(); @@ -2804,7 +2804,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) for (int i = 0; i < items.count(); ++i) { ClipItem *item = static_cast (items.at(i)); - if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; + if (!hasVideoClip && (item->clipType() == AV || item->clipType() == Video)) hasVideoClip = true; if (items.count() == 1) { updateClipTypeActions(item); } else { @@ -2836,7 +2836,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { // add transparency transition if space is available - if (canBePastedTo(info, TRANSITIONWIDGET)) { + if (canBePastedTo(info, TransitionWidget)) { QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement(); new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); } @@ -2864,7 +2864,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) kDebug()<<"// ITEMS on TRACK: "<type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); int end = clip->endPos().frames(m_document->fps()); @@ -2906,7 +2906,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf if (item) selection.removeAll(item); for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast(selection.at(i)); if (clip->startPos() < info.startPos) { if (clip->endPos() > info.endPos) { @@ -2956,7 +2956,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf QList selection = m_scene->items(rect); if (item) selection.removeAll(item); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast(selection.at(i)); if (clip->startPos() < info.startPos) { if (clip->endPos() > info.startPos) { @@ -2993,7 +2993,7 @@ void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, selection.removeAll(item); for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { Transition *tr = static_cast(selection.at(i)); if (tr->startPos() < info.startPos) { ItemInfo firstPos = tr->info(); @@ -3057,11 +3057,11 @@ void CustomTrackView::addTrack(const TrackInfo &type, int ix) QList transitionInfos; if (ix == -1 || ix == m_document->tracksCount()) { m_document->insertTrack(0, type); - transitionInfos = m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK); + transitionInfos = m_document->renderer()->mltInsertTrack(1, type.type == VideoTrack); } else { m_document->insertTrack(m_document->tracksCount() - ix, type); // insert track in MLT playlist - transitionInfos = m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VIDEOTRACK); + transitionInfos = m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VideoTrack); double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); @@ -3071,7 +3071,7 @@ void CustomTrackView::addTrack(const TrackInfo &type, int ix) m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); ++i) { - if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget || selection.at(i)->type() == GroupWidget)) { m_selectionGroup->addItem(selection.at(i)); } } @@ -3082,7 +3082,7 @@ void CustomTrackView::addTrack(const TrackInfo &type, int ix) Mlt::Tractor *tractor = m_document->renderer()->lockService(); QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); continue; @@ -3090,12 +3090,12 @@ void CustomTrackView::addTrack(const TrackInfo &type, int ix) AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo clipinfo = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ClipItem *clip = static_cast (item); // slowmotion clips are not track dependant, so no need to update them if (clip->speed() != 1.0) continue; // We add a move clip command so that we get the correct producer for new track number - if (clip->clipType() == AV || clip->clipType() == AUDIO) { + if (clip->clipType() == AV || clip->clipType() == Audio) { Mlt::Producer *prod = clip->getProducer(clipinfo.track); if (m_document->renderer()->mltUpdateClipProducer(tractor, (int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod) == false) { // problem updating clip @@ -3155,7 +3155,7 @@ void CustomTrackView::removeTrack(int ix) m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); ++i) { - if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget || selection.at(i)->type() == GroupWidget)) { m_selectionGroup->addItem(selection.at(i)); } } @@ -3168,23 +3168,23 @@ void CustomTrackView::removeTrack(int ix) QList children = m_selectionGroup->childItems(); //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); continue; } - if (children.at(i)->type() == AVWIDGET) { + if (children.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (children.at(i)); clip->updateItem(); ItemInfo clipinfo = clip->info(); // We add a move clip command so that we get the correct producer for new track number - if (clip->clipType() == AV || clip->clipType() == AUDIO || clip->clipType() == PLAYLIST) { + if (clip->clipType() == AV || clip->clipType() == Audio || clip->clipType() == Playlist) { Mlt::Producer *prod = clip->getProducer(clipinfo.track); if (prod == NULL || !m_document->renderer()->mltUpdateClipProducer(tractor, (int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod)) { emit displayMessage(i18n("Cannot update clip (time: %1, track: %2)", clipinfo.startPos.frames(m_document->fps()), clipinfo.track), ErrorMessage); } } - } else if (children.at(i)->type() == TRANSITIONWIDGET) { + } else if (children.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (children.at(i)); tr->updateItem(); int track = tr->transitionEndTrack(); @@ -3253,7 +3253,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) QList selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) { + if (selection.at(i)->type() == GroupWidget && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) { if (selection.at(i)->parentItem() && m_selectionGroup) { selection.removeAll((QGraphicsItem*)m_selectionGroup); resetSelectionGroup(); @@ -3264,9 +3264,9 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) QList children = selection.at(i)->childItems(); for (int j = 0; j < children.count(); ++j) { if (children.at(j)->isSelected()) { - if (children.at(j)->type() == AVWIDGET) + if (children.at(j)->type() == AVWidget) emit clipItemSelected(NULL); - else if (children.at(j)->type() == TRANSITIONWIDGET) + else if (children.at(j)->type() == TransitionWidget) emit transitionItemSelected(NULL); else continue; @@ -3286,7 +3286,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) } if (changeGroupLock && hasClipOnTrack) ((AbstractGroupItem*)selection.at(i))->setItemLocked(lock); - } else if((selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { + } else if((selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget)) { if (selection.at(i)->parentItem()) { if (selection.at(i)->parentItem() == m_selectionGroup) { selection.removeAll((QGraphicsItem*)m_selectionGroup); @@ -3298,7 +3298,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) } if (selection.at(i)->isSelected()) { - if (selection.at(i)->type() == AVWIDGET) + if (selection.at(i)->type() == AVWidget) emit clipItemSelected(NULL); else emit transitionItemSelected(NULL); @@ -3330,7 +3330,7 @@ QList CustomTrackView::checkForGroups(const QRectF &rect, bool int maxHeight = m_tracksHeight * 1.5; for (int i = 0; i < selection.count(); ++i) { // Check that we don't try to move a group with clips on other tracks - if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) { + if (selection.at(i)->type() == GroupWidget && (selection.at(i)->boundingRect().height() >= maxHeight)) { *ok = false; break; } else if (selection.at(i)->parentItem() && (selection.at(i)->parentItem()->boundingRect().height() >= maxHeight)) { @@ -3397,12 +3397,12 @@ void CustomTrackView::slotRemoveSpace() QList transitionsToMove; for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { + if (items.at(i)->type() == AVWidget || items.at(i)->type() == TransitionWidget) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { clipsToMove.append(info); - } else if (item->type() == TRANSITIONWIDGET) { + } else if (item->type() == TransitionWidget) { transitionsToMove.append(info); } } @@ -3420,7 +3420,7 @@ void CustomTrackView::slotRemoveSpace() items = scene()->items(rect); int transitionCorrection = -1; for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == TRANSITIONWIDGET) { + if (items.at(i)->type() == TransitionWidget) { // There is a transition on the way AbstractClipItem *item = static_cast (items.at(i)); int transitionEnd = item->endPos().frames(m_document->fps()); @@ -3493,12 +3493,12 @@ void CustomTrackView::slotInsertSpace() QList transitionsToMove; for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { + if (items.at(i)->type() == AVWidget || items.at(i)->type() == TransitionWidget) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) + if (item->type() == AVWidget) clipsToMove.append(info); - else if (item->type() == TRANSITIONWIDGET) + else if (item->type() == TransitionWidget) transitionsToMove.append(info); } } @@ -3561,9 +3561,9 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t QList itemList = m_selectionGroup->childItems(); for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { + if (itemList.at(i)->type() == AVWidget || itemList.at(i)->type() == TransitionWidget) { static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); - } else if (itemList.at(i)->type() == GROUPWIDGET) { + } else if (itemList.at(i)->type() == GroupWidget) { QList children = itemList.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { AbstractClipItem * clp = static_cast < AbstractClipItem *>(children.at(j)); @@ -3586,7 +3586,7 @@ void CustomTrackView::deleteClip(const QString &clipId) new RefreshMonitorCommand(this, false, true, deleteCommand); int count = 0; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { count++; @@ -3669,14 +3669,14 @@ void CustomTrackView::checkScrolling() void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { - if (m_moveOpMode == SEEK) m_moveOpMode = NONE; - if (m_operationMode == SCROLLTIMELINE) { - m_operationMode = NONE; + if (m_moveOpMode == Seek) m_moveOpMode = None; + if (m_operationMode == ScrollTimeline) { + m_operationMode = None; setDragMode(QGraphicsView::NoDrag); QGraphicsView::mouseReleaseEvent(event); return; } - if (!m_controlModifier && m_operationMode != RUBBERSELECTION) { + if (!m_controlModifier && m_operationMode != RubberSelection) { //event->accept(); setDragMode(QGraphicsView::NoDrag); if (m_clipDrag) QGraphicsView::mouseReleaseEvent(event); @@ -3693,9 +3693,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) return; } - if (m_operationMode == MOVEGUIDE) { + if (m_operationMode == MoveGuide) { setCursor(Qt::ArrowCursor); - m_operationMode = NONE; + m_operationMode = None; m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, false); GenTime newPos = GenTime(m_dragGuide->pos().x(), m_document->fps()); if (newPos != m_dragGuide->position()) { @@ -3709,7 +3709,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_dragItem = NULL; QGraphicsView::mouseReleaseEvent(event); return; - } else if (m_operationMode == SPACER && m_selectionGroup) { + } else if (m_operationMode == Spacer && m_selectionGroup) { int track; if (event->modifiers() != Qt::ControlModifier) { // We are moving all tracks @@ -3734,7 +3734,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == GROUPWIDGET) { + if (items.at(i)->type() == GroupWidget) { AbstractGroupItem* group = (AbstractGroupItem*)items.at(i); if (!groups.contains(group)) groups.append(group); items += items.at(i)->childItems(); @@ -3742,14 +3742,14 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() == AVWIDGET) { + if (items.at(i)->type() == AVWidget) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); clipsToMove.append(info); item->updateItem(); if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track)) trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); - } else if (items.at(i)->type() == TRANSITIONWIDGET) { + } else if (items.at(i)->type() == TransitionWidget) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); transitionsToMove.append(info); @@ -3775,8 +3775,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) clearSelection(); - m_operationMode = NONE; - } else if (m_operationMode == RUBBERSELECTION) { + m_operationMode = None; + } else if (m_operationMode == RubberSelection) { //event->accept(); QGraphicsView::mouseReleaseEvent(event); setDragMode(QGraphicsView::NoDrag); @@ -3784,10 +3784,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) if (event->modifiers() != Qt::ControlModifier) m_dragItem = NULL; resetSelectionGroup(); groupSelectedItems(); - m_operationMode = NONE; + m_operationMode = None; if (m_selectionGroup == NULL && m_dragItem) { // Only 1 item selected - if (m_dragItem->type() == AVWIDGET) + if (m_dragItem->type() == AVWidget) emit clipItemSelected(static_cast(m_dragItem)); } } @@ -3799,11 +3799,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) ItemInfo info; if (m_dragItem) info = m_dragItem->info(); - if (m_operationMode == MOVE) { + if (m_operationMode == MoveOperation) { setCursor(Qt::OpenHandCursor); if (m_dragItem->parentItem() == 0) { // we are moving one clip, easy - if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + if (m_dragItem->type() == AVWidget && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { ClipItem *item = static_cast (m_dragItem); Mlt::Producer *prod = item->getProducer(info.track); bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - info.track), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(info.startPos.frames(m_document->fps())), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); @@ -3930,7 +3930,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps()))), ErrorMessage); } setDocumentModified(); - } else if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + } else if (m_dragItem->type() == TransitionWidget && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) { @@ -3974,16 +3974,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // Expand groups int max = items.count(); for (int i = 0; i < max; ++i) { - if (items.at(i)->type() == GROUPWIDGET) { + if (items.at(i)->type() == GroupWidget) { items += items.at(i)->childItems(); } } m_document->renderer()->blockSignals(true); for (int i = 0; i < items.count(); ++i) { - if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; + if (items.at(i)->type() != AVWidget && items.at(i)->type() != TransitionWidget) continue; AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { // error, clip cannot be removed from playlist emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage); @@ -3999,7 +3999,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->blockSignals(false); for (int i = 0; i < items.count(); ++i) { // re-add items in correct place - if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; + if (items.at(i)->type() != AVWidget && items.at(i)->type() != TransitionWidget) continue; AbstractClipItem *item = static_cast (items.at(i)); item->updateItem(); ItemInfo info = item->info(); @@ -4010,7 +4010,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) item->setItemLocked(true); } - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ClipItem *clip = static_cast (item); int trackProducer = info.track; info.track = m_document->tracksCount() - info.track; @@ -4049,13 +4049,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) QSet itemList; while (!items.isEmpty()) { QGraphicsItem *first = items.takeFirst(); - if (first->type() == GROUPWIDGET) { + if (first->type() == GroupWidget) { if (first != m_selectionGroup) { groupList.insert(first); } } - else if (first->type() == AVWIDGET || first->type() == TRANSITIONWIDGET) { - if (first->parentItem() && first->parentItem()->type() == GROUPWIDGET) { + else if (first->type() == AVWidget || first->type() == TransitionWidget) { + if (first->parentItem() && first->parentItem()->type() == GroupWidget) { if (first->parentItem() != m_selectionGroup) { groupList.insert(first->parentItem()); } @@ -4084,9 +4084,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } m_document->renderer()->doRefresh(); - } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { + } else if (m_operationMode == ResizeStart && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start - if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWidget && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) { QUndoCommand *resizeCommand = new QUndoCommand(); @@ -4097,7 +4097,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int itemcount = 0; for (int i = 0; i < items.count(); ++i) { AbstractClipItem *item = static_cast(items.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { ItemInfo info = infos.at(itemcount); prepareResizeClipStart(item, info, item->startPos().frames(m_document->fps()), false, resizeCommand); ++itemcount; @@ -4107,11 +4107,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); - if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); + if (m_dragItem->type() == AVWidget) static_cast (m_dragItem)->slotUpdateRange(); } - } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { + } else if (m_operationMode == ResizeEnd && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end - if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWidget && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) { QUndoCommand *resizeCommand = new QUndoCommand(); @@ -4122,7 +4122,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) int itemcount = 0; for (int i = 0; i < items.count(); ++i) { AbstractClipItem *item = static_cast(items.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { ItemInfo info = infos.at(itemcount); prepareResizeClipEnd(item, info, item->endPos().frames(m_document->fps()), false, resizeCommand); ++itemcount; @@ -4133,9 +4133,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); - if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); + if (m_dragItem->type() == AVWidget) static_cast (m_dragItem)->slotUpdateRange(); } - } else if (m_operationMode == FADEIN) { + } else if (m_operationMode == FadeIn) { // resize fade in effect ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadein"); @@ -4156,7 +4156,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else if (item->fadeIn() != 0 && ix2 == -1) { QDomElement effect; - if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + if (item->isVideoOnly() || (item->clipType() != Audio && item->clipType() != AV && item->clipType() != Playlist)) { // add video fade effect = MainWindow::videoEffects.getEffectByTag("", "fade_from_black").cloneNode().toElement(); } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement(); @@ -4178,7 +4178,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) emit clipItemSelected(item); } } - } else if (m_operationMode == FADEOUT) { + } else if (m_operationMode == FadeOut) { // resize fade out effect ClipItem * item = static_cast (m_dragItem); int ix = item->hasEffect("volume", "fadeout"); @@ -4200,7 +4200,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else if (item->fadeOut() != 0 && ix2 == -1) { QDomElement effect; - if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) { + if (item->isVideoOnly() || (item->clipType() != Audio && item->clipType() != AV && item->clipType() != Playlist)) { // add video fade effect = MainWindow::videoEffects.getEffectByTag("", "fade_to_black").cloneNode().toElement(); } else effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement(); @@ -4226,7 +4226,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) emit clipItemSelected(item); } } - } else if (m_operationMode == KEYFRAME) { + } else if (m_operationMode == KeyFrame) { // update the MLT effect ClipItem * item = static_cast (m_dragItem); QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); @@ -4256,8 +4256,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect()); emit clipItemSelected(item); } - if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); - m_operationMode = NONE; + if (m_operationMode != None && m_operationMode != MoveOperation) setDocumentModified(); + m_operationMode = None; } void CustomTrackView::deleteClip(ItemInfo info, bool refresh) @@ -4327,16 +4327,16 @@ void CustomTrackView::deleteSelectedClips() int transitionCount = 0; // expand & destroy groups for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == GROUPWIDGET) { + if (itemList.at(i)->type() == GroupWidget) { groupCount++; QList children = itemList.at(i)->childItems(); QList clipInfos; QList transitionInfos; for (int j = 0; j < children.count(); j++) { - if (children.at(j)->type() == AVWIDGET) { + if (children.at(j)->type() == AVWidget) { AbstractClipItem *clip = static_cast (children.at(j)); if (!clip->isItemLocked()) clipInfos.append(clip->info()); - } else if (children.at(j)->type() == TRANSITIONWIDGET) { + } else if (children.at(j)->type() == TransitionWidget) { AbstractClipItem *clip = static_cast (children.at(j)); if (!clip->isItemLocked()) transitionInfos.append(clip->info()); } @@ -4349,18 +4349,18 @@ void CustomTrackView::deleteSelectedClips() if (clipInfos.count() > 0) new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); - } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET) + } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GroupWidget) itemList.insert(i + 1, itemList.at(i)->parentItem()); } emit clipItemSelected(NULL); emit transitionItemSelected(NULL); for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); - } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + } else if (itemList.at(i)->type() == TransitionWidget) { transitionCount++; Transition *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); @@ -4413,7 +4413,7 @@ void CustomTrackView::cutSelectedClips() for (int i = 0; i < itemList.count(); ++i) { if (!itemList.at(i)) continue; - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem() && item->parentItem() != m_selectionGroup) { AbstractGroupItem *group = static_cast (item->parentItem()); @@ -4423,7 +4423,7 @@ void CustomTrackView::cutSelectedClips() RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos); m_commandStack->push(command); } - } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) { + } else if (itemList.at(i)->type() == GroupWidget && itemList.at(i) != m_selectionGroup) { AbstractGroupItem *group = static_cast(itemList.at(i)); if (!groups.contains(group)) groups << group; @@ -4450,7 +4450,7 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(false); AbstractClipItem *child = static_cast (children.at(i)); - if (child->type() == AVWIDGET) { + if (child->type() == AVWidget) { if (cutPos > child->endPos()) clips1 << child->info(); else if (cutPos < child->startPos()) @@ -4497,16 +4497,16 @@ void CustomTrackView::groupClips(bool group, QList itemList, QU // Expand groups int max = itemList.count(); for (int i = 0; i < max; ++i) { - if (itemList.at(i)->type() == GROUPWIDGET) { + if (itemList.at(i)->type() == GroupWidget) { itemList += itemList.at(i)->childItems(); } } for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { AbstractClipItem *clip = static_cast (itemList.at(i)); if (!clip->isItemLocked()) clipInfos.append(clip->info()); - } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + } else if (itemList.at(i)->type() == TransitionWidget) { AbstractClipItem *clip = static_cast (itemList.at(i)); if (!clip->isItemLocked()) transitionInfos.append(clip->info()); } @@ -4530,7 +4530,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip == NULL) continue; - if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + if (clip->parentItem() && clip->parentItem()->type() == GroupWidget) { AbstractGroupItem *grp = static_cast (clip->parentItem()); m_document->clipManager()->removeGroup(grp); if (grp == m_selectionGroup) m_selectionGroup = NULL; @@ -4541,7 +4541,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList for (int i = 0; i < transitionInfos.count(); ++i) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (tr == NULL) continue; - if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { + if (tr->parentItem() && tr->parentItem()->type() == GroupWidget) { AbstractGroupItem *grp = static_cast (tr->parentItem()); m_document->clipManager()->removeGroup(grp); if (grp == m_selectionGroup) m_selectionGroup = NULL; @@ -4637,7 +4637,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) DocClipBase *baseClip = NULL; Mlt::Tractor *tractor = m_document->renderer()->lockService(); for (int i = 0; i < list.size(); ++i) { - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { if (baseClip == NULL) { @@ -4667,7 +4667,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { ClipItem *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; break; @@ -4682,7 +4682,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { ClipItem *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; break; @@ -4698,7 +4698,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { clip = static_cast (list.at(i)); break; } @@ -4726,7 +4726,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == TRANSITIONWIDGET) { + if (list.at(i)->type() == TransitionWidget) { clip = static_cast (list.at(i)); break; } @@ -4747,7 +4747,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == TRANSITIONWIDGET) { + if (list.at(i)->type() == TransitionWidget) { Transition *test = static_cast (list.at(i)); if (test->endPos() == pos) clip = test; break; @@ -4763,7 +4763,7 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; - if (list.at(i)->type() == TRANSITIONWIDGET) { + if (list.at(i)->type() == TransitionWidget) { Transition *test = static_cast (list.at(i)); if (test->startPos() == pos) clip = test; break; @@ -4889,7 +4889,7 @@ void CustomTrackView::moveGroup(QList startClip, QList start // Expand groups int max = children.count(); for (int i = 0; i < max; ++i) { - if (children.at(i)->type() == GROUPWIDGET) { + if (children.at(i)->type() == GroupWidget) { children += children.at(i)->childItems(); //AbstractGroupItem *grp = static_cast(children.at(i)); //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight); @@ -4904,7 +4904,7 @@ void CustomTrackView::moveGroup(QList startClip, QList start for (int i = 0; i < children.count(); ++i) { // re-add items in correct place - if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; + if (children.at(i)->type() != AVWidget && children.at(i)->type() != TransitionWidget) continue; AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo info = item->info(); @@ -4915,7 +4915,7 @@ void CustomTrackView::moveGroup(QList startClip, QList start else if (item->isItemLocked()) item->setItemLocked(false); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ClipItem *clip = static_cast (item); int trackProducer = info.track; info.track = m_document->tracksCount() - info.track; @@ -4923,7 +4923,7 @@ void CustomTrackView::moveGroup(QList startClip, QList start for (int i = 0; i < clip->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false); } - } else if (item->type() == TRANSITIONWIDGET) { + } else if (item->type() == TransitionWidget) { Transition *tr = static_cast (item); int newTrack; if (!tr->forcedTrack()) { @@ -5078,7 +5078,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ItemInfo resizeinfo = oldInfo; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, item->startPos() - oldInfo.startPos); @@ -5118,7 +5118,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } - } else if (item->type() == TRANSITIONWIDGET) { + } else if (item->type() == TransitionWidget) { Transition *transition = static_cast (item); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) { // Cannot resize transition @@ -5169,7 +5169,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI new RebuildGroupCommand(this, item->info().track, item->startPos(), command); ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { if (!hasParentCommand) command->setText(i18n("Resize clip end")); ItemInfo resizeinfo = info; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; @@ -5212,7 +5212,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI KdenliveSettings::setSnaptopoints(true); emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } - } else if (item->type() == TRANSITIONWIDGET) { + } else if (item->type() == TransitionWidget) { if (!hasParentCommand) command->setText(i18n("Resize transition end")); Transition *transition = static_cast (item); if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) { @@ -5378,7 +5378,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList isSelected()) continue; - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); GenTime end = item->endPos(); @@ -5401,7 +5401,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList type() == TRANSITIONWIDGET) { + } else if (itemList.at(i)->type() == TransitionWidget) { Transition *transition = static_cast (itemList.at(i)); GenTime start = transition->startPos(); GenTime end = transition->endPos(); @@ -5857,14 +5857,14 @@ void CustomTrackView::slotDeleteAllGuides() m_commandStack->push(deleteAll); } -void CustomTrackView::setTool(PROJECTTOOL tool) +void CustomTrackView::setTool(ProjectTool tool) { m_tool = tool; switch (m_tool) { - case RAZORTOOL: + case RazorTool: setCursor(m_razorCursor); break; - case SPACERTOOL: + case SpacerTool: setCursor(m_spacerCursor); break; default: @@ -5925,7 +5925,7 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) QColor audioColor = palette().alternateBase().color(); for (int i = 0; i < maxTrack; ++i) { TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); - if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { + if (info.isLocked || info.type == AudioTrack || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); if (i == m_selectedTrack) painter->fillRect(track, m_activeTrackBrush.brush(this)); @@ -5987,7 +5987,7 @@ void CustomTrackView::initSearchStrings() QList itemList = items(); for (int i = 0; i < itemList.count(); ++i) { // parse all clip names - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = static_cast (itemList.at(i)); GenTime start = item->startPos(); CommentedTime t(start, item->clipName()); @@ -6016,7 +6016,7 @@ QList CustomTrackView::findId(const QString &clipId) QList matchingInfo; QList itemList = items(); for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) matchingInfo << item->info(); @@ -6035,11 +6035,11 @@ void CustomTrackView::copyClip() return; } for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (itemList.at(i)); ClipItem *clone = clip->clone(clip->info()); m_copiedItems.append(clone); - } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + } else if (itemList.at(i)->type() == TransitionWidget) { Transition *dup = static_cast (itemList.at(i)); m_copiedItems.append(dup->clone()); } @@ -6054,11 +6054,11 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const } int height = m_tracksHeight - 2; int offset = 0; - if (type == TRANSITIONWIDGET) { + if (type == TransitionWidget) { height = Transition::itemHeight(); offset = Transition::itemOffset(); } - else if (type == AVWIDGET) { + else if (type == AVWidget) { height = ClipItem::itemHeight(); offset = ClipItem::itemOffset(); } @@ -6117,7 +6117,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset } QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); ++i) { - if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast (collisions.at(i)))) { + if ((collisions.at(i)->type() == AVWidget || collisions.at(i)->type() == TransitionWidget) && !items.contains(static_cast (collisions.at(i)))) { kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED"; return false; } @@ -6176,16 +6176,16 @@ void CustomTrackView::pasteClip() for (int i = 0; i < m_copiedItems.count(); ++i) { // parse all clip names - if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { + if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (m_copiedItems.at(i)); ItemInfo info = clip->info(); info.startPos += offset; info.endPos += offset; info.track += trackOffset; - if (canBePastedTo(info, AVWIDGET)) { + if (canBePastedTo(info, AVWidget)) { new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, pasteClips); } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); - } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { + } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TransitionWidget) { Transition *tr = static_cast (m_copiedItems.at(i)); ItemInfo info; info.startPos = tr->startPos() + offset; @@ -6194,7 +6194,7 @@ void CustomTrackView::pasteClip() int transitionEndTrack; if (!tr->forcedTrack()) transitionEndTrack = getPreviousVideoTrack(info.track); else transitionEndTrack = tr->transitionEndTrack(); - if (canBePastedTo(info, TRANSITIONWIDGET)) { + if (canBePastedTo(info, TransitionWidget)) { if (info.startPos >= info.endPos) { emit displayMessage(i18n("Invalid transition"), ErrorMessage); } else new AddTransitionCommand(this, info, transitionEndTrack, tr->toXML(), false, true, pasteClips); @@ -6208,7 +6208,7 @@ void CustomTrackView::pasteClip() void CustomTrackView::pasteClipEffects() { - if (m_copiedItems.count() != 1 || m_copiedItems.at(0)->type() != AVWIDGET) { + if (m_copiedItems.count() != 1 || m_copiedItems.at(0)->type() != AVWidget) { emit displayMessage(i18n("You must copy exactly one clip before pasting effects"), ErrorMessage); return; } @@ -6221,10 +6221,10 @@ void CustomTrackView::pasteClipEffects() // expand groups for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == GROUPWIDGET) { + if (clips.at(i)->type() == GroupWidget) { QList children = clips.at(i)->childItems(); for (int j = 0; j < children.count(); j++) { - if (children.at(j)->type() == AVWIDGET && !clips.contains(children.at(j))) { + if (children.at(j)->type() == AVWidget && !clips.contains(children.at(j))) { clips.append(children.at(j)); } } @@ -6232,7 +6232,7 @@ void CustomTrackView::pasteClipEffects() } for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) { + if (clips.at(i)->type() == AVWidget) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); for (int j = 0; j < clip->effectsCount(); j++) { QDomElement eff = clip->effect(j); @@ -6248,7 +6248,7 @@ void CustomTrackView::pasteClipEffects() //adjust effects (fades, ...) for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) { + if (clips.at(i)->type() == AVWidget) { ClipItem *item = static_cast < ClipItem *>(clips.at(i)); updatePositionEffects(item, item->info()); } @@ -6290,7 +6290,7 @@ ClipItem *CustomTrackView::getClipUnderCursor() const QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); ++i) { - if (collisions.at(i)->type() == AVWIDGET) { + if (collisions.at(i)->type() == AVWidget) { ClipItem *clip = static_cast < ClipItem *>(collisions.at(i)); if (!clip->isItemLocked()) return clip; } @@ -6306,7 +6306,7 @@ AbstractClipItem *CustomTrackView::getMainActiveClip() const } else { AbstractClipItem *item = NULL; for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) { + if (clips.at(i)->type() == AVWidget) { item = static_cast < AbstractClipItem *>(clips.at(i)); if (clips.count() > 1 && item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break; } @@ -6325,12 +6325,12 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con ClipItem *item; // remove all items in the list that are not clips for (int i = 0; i < clips.count();) { - if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i); + if (clips.at(i)->type() != AVWidget) clips.removeAt(i); else ++i; } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) { + if (clips.at(i)->type() == AVWidget) { item = static_cast < ClipItem *>(clips.at(i)); if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item; @@ -6344,7 +6344,7 @@ void CustomTrackView::setInPoint() { AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem && m_dragItem->type() == TransitionWidget) { clip = m_dragItem; } else { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); @@ -6360,7 +6360,7 @@ void CustomTrackView::setInPoint() QList items = parent->childItems(); for (int i = 0; i < items.count(); ++i) { AbstractClipItem *item = static_cast(items.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { prepareResizeClipStart(item, item->info(), m_cursorPos, true, resizeCommand); } } @@ -6377,7 +6377,7 @@ void CustomTrackView::setOutPoint() { AbstractClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem && m_dragItem->type() == TransitionWidget) { clip = m_dragItem; } else { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); @@ -6392,7 +6392,7 @@ void CustomTrackView::setOutPoint() QList items = parent->childItems(); for (int i = 0; i < items.count(); ++i) { AbstractClipItem *item = static_cast(items.at(i)); - if (item && item->type() == AVWIDGET) { + if (item && item->type() == AVWidget) { prepareResizeClipEnd(item, item->info(), m_cursorPos, true, resizeCommand); } } @@ -6413,11 +6413,11 @@ void CustomTrackView::slotUpdateAllThumbs() ClipItem *item; const QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { item = static_cast (itemList.at(i)); - if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) { + if (item && item->isEnabled() && item->clipType() != Color && item->clipType() != Audio) { // Check if we have a cached thumbnail - if (item->clipType() == IMAGE || item->clipType() == TEXT) { + if (item->clipType() == Image || item->clipType() == Text) { QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; if (QFile::exists(thumb)) { QPixmap pix(thumb); @@ -6453,11 +6453,11 @@ void CustomTrackView::saveThumbnails() ClipItem *item; QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == AVWIDGET) { + if (itemList.at(i)->type() == AVWidget) { item = static_cast (itemList.at(i)); - if (item->clipType() != COLOR) { + if (item->clipType() != Color) { // Check if we have a cached thumbnail - if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) { + if (item->clipType() == Image || item->clipType() == Text || item->clipType() == Audio) { QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png"; if (!QFile::exists(thumb)) { QPixmap pix(item->startThumb()); @@ -6500,10 +6500,10 @@ void CustomTrackView::slotInsertTrack(int ix) info.isLocked = false; info.effectsList = EffectsList(true); if (d->video_track->isChecked()) { - info.type = VIDEOTRACK; + info.type = VideoTrack; info.isBlind = false; } else { - info.type = AUDIOTRACK; + info.type = AudioTrack; info.isBlind = true; } AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); @@ -6567,14 +6567,14 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) // Delete all clips in selected track for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *item = static_cast (selection.at(i)); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack); m_waitingThumbs.removeAll(item); m_scene->removeItem(item); delete item; item = NULL; - } else if (selection.at(i)->type() == TRANSITIONWIDGET) { + } else if (selection.at(i)->type() == TransitionWidget) { Transition *item = static_cast (selection.at(i)); new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, false, deleteTrack); m_scene->removeItem(item); @@ -6591,7 +6591,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) void CustomTrackView::autoTransition() { QList itemList = scene()->selectedItems(); - if (itemList.count() != 1 || itemList.at(0)->type() != TRANSITIONWIDGET) { + if (itemList.count() != 1 || itemList.at(0)->type() != TransitionWidget) { emit displayMessage(i18n("You must select one transition for this action"), ErrorMessage); return; } @@ -6607,7 +6607,7 @@ void CustomTrackView::clipNameChanged(const QString &id, const QString &name) QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { clip = static_cast (list.at(i)); if (clip->clipProducer() == id) { clip->setClipName(name); @@ -6626,7 +6626,7 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min selection.removeAll(item); for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); - if (clip && clip->type() == AVWIDGET) { + if (clip && clip->type() == AVWidget) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); } @@ -6642,7 +6642,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim selection.removeAll(item); for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); - if (clip && clip->type() == TRANSITIONWIDGET) { + if (clip && clip->type() == TransitionWidget) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); if (clip->startPos() > item->startPos() && (clip->startPos() < maximum || maximum == GenTime())) maximum = clip->startPos(); } @@ -6682,9 +6682,9 @@ void CustomTrackView::splitAudio() QUndoCommand *splitCommand = new QUndoCommand(); splitCommand->setText(i18n("Split audio")); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); - if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->clipType() == AV || clip->clipType() == Playlist) { if (clip->parentItem()) { emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage); } else { @@ -6711,9 +6711,9 @@ void CustomTrackView::setAudioAlignReference() if (m_audioCorrelator != NULL) { delete m_audioCorrelator; } - if (selection.at(0)->type() == AVWIDGET) { + if (selection.at(0)->type() == AVWidget) { ClipItem *clip = static_cast(selection.at(0)); - if (clip->clipType() == AV || clip->clipType() == AUDIO) { + if (clip->clipType() == AV || clip->clipType() == Audio) { m_audioAlignmentReference = clip; AudioEnvelope *envelope = new AudioEnvelope(clip->baseClip()->fileURL().path(), clip->getProducer(clip->track())); @@ -6753,14 +6753,14 @@ void CustomTrackView::alignAudio() int counter = 0; QList selection = scene()->selectedItems(); foreach (QGraphicsItem *item, selection) { - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ClipItem *clip = static_cast(item); if (clip == m_audioAlignmentReference) { continue; } - if (clip->clipType() == AV || clip->clipType() == AUDIO) { + if (clip->clipType() == AV || clip->clipType() == Audio) { AudioEnvelope *envelope = new AudioEnvelope(clip->baseClip()->fileURL().path(), clip->getProducer(clip->track()), clip->info().cropStart.frames(m_document->fps()), clip->info().cropDuration.frames(m_document->fps())); // FFT only for larger vectors. We could use it all time, but for small vectors @@ -6851,12 +6851,12 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef int freetrack = m_document->tracksCount() - track - 1; // do not split audio when we are on an audio track - if (m_document->trackInfoAt(freetrack).type == AUDIOTRACK) + if (m_document->trackInfoAt(freetrack).type == AudioTrack) return; for (; freetrack > 0; freetrack--) { //kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); - if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) { + if (m_document->trackInfoAt(freetrack - 1).type == AudioTrack && !m_document->trackInfoAt(freetrack - 1).isLocked) { //kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) { //kDebug() << "FOUND SPACE ON TRK: " << freetrack; @@ -6901,7 +6901,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef } } else { // unsplit clip: remove audio part and change video part to normal clip - if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) { + if (clip->parentItem() == NULL || clip->parentItem()->type() != GroupWidget) { kDebug() << "//CANNOT FIND CLP GRP"; return; } @@ -6958,9 +6958,9 @@ void CustomTrackView::setVideoOnly() QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Video only")); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); - if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->clipType() == AV || clip->clipType() == Playlist) { if (clip->parentItem()) { emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); } else { @@ -6983,9 +6983,9 @@ void CustomTrackView::setAudioOnly() QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio only")); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); - if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->clipType() == AV || clip->clipType() == Playlist) { if (clip->parentItem()) { emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); } else { @@ -7008,9 +7008,9 @@ void CustomTrackView::setAudioAndVideo() QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio and Video")); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); - if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->clipType() == AV || clip->clipType() == Playlist) { if (clip->parentItem()) { emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); } else { @@ -7066,18 +7066,18 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) { bool hasAudio; bool hasAV; - if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { + if (clip == NULL || (clip->clipType() != AV && clip->clipType() != Playlist)) { m_clipTypeGroup->setEnabled(false); - hasAudio = clip != NULL && clip->clipType() == AUDIO; + hasAudio = clip != NULL && clip->clipType() == Audio; hasAV = false; } else { switch (clip->clipType()) { case AV: - case PLAYLIST: + case Playlist: hasAudio = true; hasAV = true; break; - case AUDIO: + case Audio: hasAudio = true; hasAV = false; break; @@ -7132,7 +7132,7 @@ void CustomTrackView::reloadTransitionLumas() Transition *transitionitem; QDomElement transitionXml; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == TRANSITIONWIDGET) { + if (itemList.at(i)->type() == TransitionWidget) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") { @@ -7179,15 +7179,15 @@ void CustomTrackView::updateProjectFps() if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i)); } for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) { + if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWidget || itemList.at(i)->type() == TransitionWidget)) { AbstractClipItem *clip = static_cast (itemList.at(i)); clip->updateFps(m_document->fps()); m_scene->addItem(clip); - } else if (itemList.at(i)->type() == GROUPWIDGET) { + } else if (itemList.at(i)->type() == GroupWidget) { AbstractGroupItem *grp = static_cast (itemList.at(i)); QList children = grp->childItems(); for (int j = 0; j < children.count(); j++) { - if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + if (children.at(j)->type() == AVWidget || children.at(j)->type() == TransitionWidget) { AbstractClipItem *clip = static_cast (children.at(j)); clip->setFlag(QGraphicsItem::ItemIsMovable, true); clip->updateFps(m_document->fps()); @@ -7199,7 +7199,7 @@ void CustomTrackView::updateProjectFps() scene()->destroyItemGroup(grp); scene()->clearSelection(); /*for (int j = 0; j < children.count(); j++) { - if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) { + if (children.at(j)->type() == AVWidget || children.at(j)->type() == TRANSITIONWIDGET) { //children.at(j)->setParentItem(0); children.at(j)->setSelected(true); } @@ -7244,7 +7244,7 @@ QStringList CustomTrackView::selectedClips() const QStringList clipIds; QList selection = m_scene->selectedItems(); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *item = (ClipItem *)selection.at(i); clipIds << item->clipProducer(); } @@ -7257,7 +7257,7 @@ QList CustomTrackView::selectedClipItems() const QList clips; QList selection = m_scene->selectedItems(); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { clips.append((ClipItem *)selection.at(i)); } } @@ -7282,7 +7282,7 @@ void CustomTrackView::slotSelectClipsInTrack() m_scene->clearSelection(); QList list; for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { + if (selection.at(i)->type() == AVWidget || selection.at(i)->type() == TransitionWidget || selection.at(i)->type() == GroupWidget) { list.append(selection.at(i)); } } @@ -7307,7 +7307,7 @@ void CustomTrackView::selectClip(bool add, bool group, int track, int pos) resetSelectionGroup(group); if (!group) m_scene->clearSelection(); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { selection.at(i)->setSelected(add); break; } @@ -7322,7 +7322,7 @@ void CustomTrackView::selectTransition(bool add, bool group) resetSelectionGroup(group); if (!group) m_scene->clearSelection(); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == TransitionWidget) { selection.at(i)->setSelected(add); break; } @@ -7337,7 +7337,7 @@ QStringList CustomTrackView::extractTransitionsLumas() Transition *transitionitem; QDomElement transitionXml; for (int i = 0; i < itemList.count(); ++i) { - if (itemList.at(i)->type() == TRANSITIONWIDGET) { + if (itemList.at(i)->type() == TransitionWidget) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); // luma files in transitions can be in "resource" or "luma" property @@ -7364,7 +7364,7 @@ void CustomTrackView::checkTrackSequence(int track) QList timelineList; timelineList.append(0); for (int i = 0; i < selection.count(); ++i) { - if (selection.at(i)->type() == AVWIDGET) { + if (selection.at(i)->type() == AVWidget) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); int end = clip->endPos().frames(m_document->fps()); @@ -7432,7 +7432,7 @@ void CustomTrackView::removeTipAnimation() } } -void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode, const double size) +void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OperationType mode, const double size) { if (m_visualTip == NULL) { QRectF rect = clip->sceneBoundingRect(); @@ -7441,22 +7441,22 @@ void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode m_animation->setScaleAt(1, 1, 1); QPolygon polygon; switch (mode) { - case FADEIN: - case FADEOUT: + case FadeIn: + case FadeOut: m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2); ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen); - if (mode == FADEIN) + if (mode == FadeIn) m_visualTip->setPos(rect.x() + ((ClipItem *) clip)->fadeIn(), rect.y()); else m_visualTip->setPos(rect.right() - ((ClipItem *) clip)->fadeOut(), rect.y()); m_animation->setScaleAt(.5, 2, 2); break; - case RESIZESTART: - case RESIZEEND: + case ResizeStart: + case ResizeEnd: polygon << QPoint(0, - size * 2); - if (mode == RESIZESTART) + if (mode == ResizeStart) polygon << QPoint(size * 2, 0); else polygon << QPoint(- size * 2, 0); @@ -7466,17 +7466,17 @@ void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode m_visualTip = new QGraphicsPolygonItem(polygon); ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - if (mode == RESIZESTART) + if (mode == ResizeStart) m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2); else m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2); m_animation->setScaleAt(.5, 2, 1); break; - case TRANSITIONSTART: - case TRANSITIONEND: + case TransitionStart: + case TransitionEnd: polygon << QPoint(0, - size * 2); - if (mode == TRANSITIONSTART) + if (mode == TransitionStart) polygon << QPoint(size * 2, 0); else polygon << QPoint(- size * 2, 0); @@ -7486,7 +7486,7 @@ void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode m_visualTip = new QGraphicsPolygonItem(polygon); ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor); ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen); - if (mode == TRANSITIONSTART) + if (mode == TransitionStart) m_visualTip->setPos(rect.x(), rect.bottom()); else m_visualTip->setPos(rect.right(), rect.bottom()); @@ -7514,9 +7514,9 @@ bool CustomTrackView::hasAudio(int track) const for (int i = 0; i < collisions.count(); ++i) { item = collisions.at(i); if (!item->isEnabled()) continue; - if (item->type() == AVWIDGET) { + if (item->type() == AVWidget) { ClipItem *clip = static_cast (item); - if (!clip->isVideoOnly() && (clip->clipType() == AUDIO || clip->clipType() == AV || clip->clipType() == PLAYLIST)) return true; + if (!clip->isVideoOnly() && (clip->clipType() == Audio || clip->clipType() == AV || clip->clipType() == Playlist)) return true; } } return false; @@ -7672,14 +7672,14 @@ void CustomTrackView::updateTrackNames(int track, bool added) int audioTracks = 0; for (int i = max - 1; i >= 0; --i) { TrackInfo info = tracks.at(i); - if (info.type == VIDEOTRACK) + if (info.type == VideoTrack) videoTracks++; else audioTracks++; if (i <= docTrack) { - QString type = (info.type == VIDEOTRACK ? "Video " : "Audio "); - int typeNumber = (info.type == VIDEOTRACK ? videoTracks : audioTracks); + QString type = (info.type == VideoTrack ? "Video " : "Audio "); + int typeNumber = (info.type == VideoTrack ? videoTracks : audioTracks); if (added) { if (i == docTrack || info.trackName == type + QString::number(typeNumber - 1)) { @@ -7734,7 +7734,7 @@ void CustomTrackView::slotRefreshThumbs(const QString &id, bool resetThumbs) QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { - if (list.at(i)->type() == AVWIDGET) { + if (list.at(i)->type() == AVWidget) { clip = static_cast (list.at(i)); if (clip->clipProducer() == id) { clip->refreshClip(true, resetThumbs); @@ -7781,10 +7781,10 @@ void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPo } -void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) +void CustomTrackView::slotImportClipKeyframes(GraphicsRectItem type) { ClipItem *item = NULL; - if (type == TRANSITIONWIDGET) { + if (type == TransitionWidget) { // We want to import keyframes to a transition if (!m_selectionGroup) { emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); @@ -7793,7 +7793,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) // Make sure there is no collision QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); ++i) { - if (children.at(i)->type() == AVWIDGET) { + if (children.at(i)->type() == AVWidget) { item = (ClipItem*) children.at(i); break; } diff --git a/src/customtrackview.h b/src/customtrackview.h index d8d8ad4e..4d5184a2 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -103,7 +103,7 @@ public: bool checkTrackHeight(); void updateSceneFrameWidth(); //QList tracksList() const; - void setTool(PROJECTTOOL tool); + void setTool(ProjectTool tool); ClipItem *cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack = EffectsList(), bool execute = true); void slotSeekToPreviousSnap(); void slotSeekToNextSnap(); @@ -296,7 +296,7 @@ public slots: void updateSnapPoints(AbstractClipItem *selected, QList offsetList = QList (), bool skipSelectedItems = false); void slotAddEffect(ClipItem *clip, const QDomElement &effect); - void slotImportClipKeyframes(GRAPHICSRECTITEM type); + void slotImportClipKeyframes(GraphicsRectItem type); /** @brief Get effect parameters ready for MLT*/ static void adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, MltVideoProfile profile, const QString &prefix = QString()); @@ -326,8 +326,8 @@ private: QGraphicsLineItem *m_cursorLine; ItemInfo m_dragItemInfo; ItemInfo m_selectionGroupInfo; - OPERATIONTYPE m_operationMode; - OPERATIONTYPE m_moveOpMode; + OperationType m_operationMode; + OperationType m_moveOpMode; AbstractClipItem *m_dragItem; Guide *m_dragGuide; QUndoStack *m_commandStack; @@ -372,7 +372,7 @@ private: bool m_clipDrag; int m_findIndex; - PROJECTTOOL m_tool; + ProjectTool m_tool; QCursor m_razorCursor; QCursor m_spacerCursor; /** list containing items currently copied in the timeline */ @@ -429,7 +429,7 @@ private: * @param clip clip to display the tip on * @param mode operation mode for which the tip should be displayed * @param size size of the tip */ - void setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode, const double size); + void setTipAnimation(AbstractClipItem *clip, OperationType mode, const double size); /** @brief Takes care of updating effects and attached transitions during a resize from start. * @param item Item to resize @@ -528,7 +528,7 @@ signals: /** @brief Cursor position changed, repaint ruler.*/ void updateRuler(); /** @brief Send data from a clip to be imported as keyframes for effect / transition.*/ - void importKeyframes(GRAPHICSRECTITEM type, const QString&, int maximum); + void importKeyframes(GraphicsRectItem type, const QString&, int maximum); }; #endif diff --git a/src/definitions.cpp b/src/definitions.cpp index 2112faf9..7b852bfe 100644 --- a/src/definitions.cpp +++ b/src/definitions.cpp @@ -10,3 +10,186 @@ QDebug operator << (QDebug qd, const ItemInfo &info) qd << "\tCrop duration: " << info.cropDuration.toString(); return qd.maybeSpace(); } + + +MltVideoProfile::MltVideoProfile() : + frame_rate_num(0), + frame_rate_den(0), + width(0), + height(0), + progressive(0), + sample_aspect_num(0), + sample_aspect_den(0), + display_aspect_num(0), + display_aspect_den(0), + colorspace(0) +{ +} + +bool MltVideoProfile::operator==(const MltVideoProfile &point) const +{ + if (!description.isEmpty() && point.description == description) { + return true; + } + return point.frame_rate_num == frame_rate_num && + point.frame_rate_den == frame_rate_den && + point.width == width && + point.height == height && + point.progressive == progressive && + point.sample_aspect_num == sample_aspect_num && + point.sample_aspect_den == sample_aspect_den && + point.display_aspect_den == display_aspect_den && + point.colorspace == colorspace; +} + +bool MltVideoProfile::operator!=(const MltVideoProfile &other) const { + return !(*this == other); +} + + +EffectInfo::EffectInfo() {isCollapsed = false; groupIndex = -1; groupIsCollapsed = false;} + +QString EffectInfo::toString() const { + QStringList data; + // effect collapsed state: 0 = effect not collapsed, 1 = effect collapsed, + // 2 = group collapsed - effect not, 3 = group and effect collapsed + int collapsedState = (int) isCollapsed; + if (groupIsCollapsed) collapsedState += 2; + data << QString::number(collapsedState) << QString::number(groupIndex) << groupName; + return data.join(QLatin1String("/")); +} + +void EffectInfo::fromString(QString value) { + if (value.isEmpty()) return; + QStringList data = value.split(QLatin1String("/")); + isCollapsed = data.at(0).toInt() == 1 || data.at(0).toInt() == 3; + groupIsCollapsed = data.at(0).toInt() >= 2; + if (data.count() > 1) groupIndex = data.at(1).toInt(); + if (data.count() > 2) groupName = data.at(2); +} + + +EffectParameter::EffectParameter(const QString &name, const QString &value): m_name(name), m_value(value) {} + +QString EffectParameter::name() const { + return m_name; +} + +QString EffectParameter::value() const { + return m_value; +} + +void EffectParameter::setValue(const QString &value) { + m_value = value; +} + + +EffectsParameterList::EffectsParameterList(): QList < EffectParameter >() {} + +bool EffectsParameterList::hasParam(const QString &name) const { + for (int i = 0; i < size(); ++i) + if (at(i).name() == name) return true; + return false; +} + +void EffectsParameterList::setParamValue(const QString &name, const QString &value) { + bool found = false; + for (int i = 0; i < size(); ++i) + if (at(i).name() == name) { + // update value + replace(i, EffectParameter(name, value)); + found = true; + } + if (!found) addParam(name, value); +} + +QString EffectsParameterList::paramValue(const QString &name, const QString &defaultValue) const { + for (int i = 0; i < size(); ++i) { + if (at(i).name() == name) return at(i).value(); + } + return defaultValue; +} + +void EffectsParameterList::addParam(const QString &name, const QString &value) { + if (name.isEmpty()) return; + append(EffectParameter(name, value)); +} + +void EffectsParameterList::removeParam(const QString &name) { + for (int i = 0; i < size(); ++i) + if (at(i).name() == name) { + removeAt(i); + break; + } +} + + +CommentedTime::CommentedTime(): t(GenTime(0)), type(0) {} + + +CommentedTime::CommentedTime(const GenTime &time, const QString &comment, int markerType) + : t(time), c(comment), type(markerType) { } + +QString CommentedTime::comment() const { + return (c.isEmpty() ? i18n("Marker") : c); +} + +GenTime CommentedTime::time() const { + return t; +} + +void CommentedTime::setComment(const QString &comm) { + c = comm; +} + +void CommentedTime::setMarkerType(int t) { + type = t; +} + +int CommentedTime::markerType() const { + return type; +} + +QColor CommentedTime::markerColor(int type) { + switch (type) { + case 0: + return Qt::red; + break; + case 1: + return Qt::blue; + break; + case 2: + return Qt::green; + break; + case 3: + return Qt::yellow; + break; + default: + return Qt::cyan; + break; + } +} + +bool CommentedTime::operator>(CommentedTime op) const { + return t > op.time(); +} + +bool CommentedTime::operator<(CommentedTime op) const { + return t < op.time(); +} + +bool CommentedTime::operator>=(CommentedTime op) const { + return t >= op.time(); +} + +bool CommentedTime::operator<=(CommentedTime op) const { + return t <= op.time(); +} + +bool CommentedTime::operator==(CommentedTime op) const { + return t == op.time(); +} + +bool CommentedTime::operator!=(CommentedTime op) const { + return t != op.time(); +} diff --git a/src/definitions.h b/src/definitions.h index 67b99440..d5fe0d66 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -32,32 +32,83 @@ const int MAXCLIPDURATION = 15000; - namespace Kdenlive { -enum MONITORID { noMonitor, clipMonitor, projectMonitor, recordMonitor, stopmotionMonitor, dvdMonitor }; + +enum MonitorId { + NoMonitor, + ClipMonitor, + ProjectMonitor, + RecordMonitor, + StopMotionMonitor, + DvdMonitor +}; + const int DefaultThumbHeight = 100; -/*const QString clipMonitor("clipMonitor"); - const QString recordMonitor("recordMonitor"); - const QString projectMonitor("projectMonitor"); - const QString stopmotionMonitor("stopmotionMonitor");*/ +/* +const QString clipMonitor("clipMonitor"); +const QString recordMonitor("recordMonitor"); +const QString projectMonitor("projectMonitor"); +const QString stopmotionMonitor("stopmotionMonitor"); +*/ + } -enum OPERATIONTYPE { NONE = 0, MOVE = 1, RESIZESTART = 2, RESIZEEND = 3, FADEIN = 4, FADEOUT = 5, TRANSITIONSTART = 6, TRANSITIONEND = 7, MOVEGUIDE = 8, KEYFRAME = 9, SEEK = 10, SPACER = 11, RUBBERSELECTION = 12, SCROLLTIMELINE = 13}; -enum CLIPTYPE { UNKNOWN = 0, AUDIO = 1, VIDEO = 2, AV = 3, COLOR = 4, IMAGE = 5, TEXT = 6, SLIDESHOW = 7, VIRTUAL = 8, PLAYLIST = 9 }; +enum OperationType { + None = 0, + MoveOperation = 1, + ResizeStart = 2, + ResizeEnd = 3, + FadeIn = 4, + FadeOut = 5, + TransitionStart = 6, + TransitionEnd = 7, + MoveGuide = 8, + KeyFrame = 9, + Seek = 10, + Spacer = 11, + RubberSelection = 12, + ScrollTimeline = 13 +}; + +enum ClipType { + Unknown = 0, + Audio = 1, + Video = 2, + AV = 3, + Color = 4, + Image = 5, + Text = 6, + SlideShow = 7, + Virtual = 8, + Playlist = 9 +}; -enum PROJECTITEMTYPE { PROJECTCLIPTYPE = QTreeWidgetItem::UserType, PROJECTFOLDERTYPE, PROJECTSUBCLIPTYPE }; +enum ProjectItemType { + ProjectClipType = QTreeWidgetItem::UserType, + ProjectFoldeType, + ProjectSubclipType +}; -enum GRAPHICSRECTITEM { AVWIDGET = 70000 , LABELWIDGET , TRANSITIONWIDGET , GROUPWIDGET}; +enum GraphicsRectItem { + AVWidget = 70000, + LabelWidget, + TransitionWidget, + GroupWidget +}; -enum PROJECTTOOL { SELECTTOOL = 0 , RAZORTOOL = 1 , SPACERTOOL = 2 }; +enum ProjectTool { + SelectTool = 0, + RazorTool = 1, + SpacerTool = 2 +}; -enum TRANSITIONTYPE { +enum TransitionType { /** TRANSITIONTYPE: between 0-99: video trans, 100-199: video+audio trans, 200-299: audio trans */ - LUMA_TRANSITION = 0, - COMPOSITE_TRANSITION = 1, - PIP_TRANSITION = 2, - LUMAFILE_TRANSITION = 3, - MIX_TRANSITION = 200 + LumaTransition = 0, + CompositeTransition = 1, + PipTransition = 2, + LumaFileTransition = 3, + MixTransition = 200 }; enum MessageType { @@ -68,13 +119,24 @@ enum MessageType { MltError }; -enum TRACKTYPE { AUDIOTRACK = 0, VIDEOTRACK = 1 }; +enum TrackType { + AudioTrack = 0, + VideoTrack = 1 +}; -enum CLIPJOBSTATUS { NOJOB = 0, JOBWAITING = -1, JOBWORKING = -2, JOBDONE = -3, JOBCRASHED = -4, JOBABORTED = -5}; +enum ClipJobStatus { + NoJob = 0, + JobWaiting = -1, + JobWorking = -2, + JobDone = -3, + JobCrashed = -4, + JobAborted = -5 +}; class TrackInfo { + public: - TRACKTYPE type; + TrackType type; QString trackName; bool isMute; bool isBlind; @@ -82,7 +144,7 @@ public: EffectsList effectsList; int duration; TrackInfo() : - type(VIDEOTRACK), + type(VideoTrack), isMute(0), isBlind(0), isLocked(0), @@ -138,33 +200,9 @@ public: int display_aspect_num; int display_aspect_den; int colorspace; - MltVideoProfile() : - frame_rate_num(0), - frame_rate_den(0), - width(0), - height(0), - progressive(0), - sample_aspect_num(0), - sample_aspect_den(0), - display_aspect_num(0), - display_aspect_den(0), - colorspace(0) {} - bool operator==(const MltVideoProfile& point) const - { - if (!description.isEmpty() && point.description == description) return true; - return point.frame_rate_num == frame_rate_num && - point.frame_rate_den == frame_rate_den && - point.width == width && - point.height == height && - point.progressive == progressive && - point.sample_aspect_num == sample_aspect_num && - point.sample_aspect_den == sample_aspect_den && - point.display_aspect_den == display_aspect_den && - point.colorspace == colorspace; - } - bool operator!=(const MltVideoProfile &other) const { - return !(*this == other); - } + MltVideoProfile(); + bool operator==(const MltVideoProfile& point) const; + bool operator!=(const MltVideoProfile &other) const; }; /**) @@ -176,43 +214,22 @@ public: class EffectInfo { public: - EffectInfo() {isCollapsed = false; groupIndex = -1; groupIsCollapsed = false;} + EffectInfo(); bool isCollapsed; bool groupIsCollapsed; int groupIndex; QString groupName; - QString toString() const { - QStringList data; - // effect collapsed state: 0 = effect not collapsed, 1 = effect collapsed, - // 2 = group collapsed - effect not, 3 = group and effect collapsed - int collapsedState = (int) isCollapsed; - if (groupIsCollapsed) collapsedState += 2; - data << QString::number(collapsedState) << QString::number(groupIndex) << groupName; - return data.join(QLatin1String("/")); - } - void fromString(QString value) { - if (value.isEmpty()) return; - QStringList data = value.split(QLatin1String("/")); - isCollapsed = data.at(0).toInt() == 1 || data.at(0).toInt() == 3; - groupIsCollapsed = data.at(0).toInt() >= 2; - if (data.count() > 1) groupIndex = data.at(1).toInt(); - if (data.count() > 2) groupName = data.at(2); - } + QString toString() const; + void fromString(QString value); }; class EffectParameter { public: - EffectParameter(const QString &name, const QString &value): m_name(name), m_value(value) {} - QString name() const { - return m_name; - } - QString value() const { - return m_value; - } - void setValue(const QString &value) { - m_value = value; - } + EffectParameter(const QString &name, const QString &value); + QString name() const; + QString value() const; + void setValue(const QString &value); private: QString m_name; @@ -225,108 +242,40 @@ private: class EffectsParameterList: public QList < EffectParameter > { public: - EffectsParameterList(): QList < EffectParameter >() {} - bool hasParam(const QString &name) const { - for (int i = 0; i < size(); ++i) - if (at(i).name() == name) return true; - return false; - } - void setParamValue(const QString &name, const QString &value) { - bool found = false; - for (int i = 0; i < size(); ++i) - if (at(i).name() == name) { - // update value - replace(i, EffectParameter(name, value)); - found = true; - } - if (!found) addParam(name, value); - } - - QString paramValue(const QString &name, const QString &defaultValue = QString()) const { - for (int i = 0; i < size(); ++i) { - if (at(i).name() == name) return at(i).value(); - } - return defaultValue; - } - void addParam(const QString &name, const QString &value) { - if (name.isEmpty()) return; - append(EffectParameter(name, value)); - } - void removeParam(const QString &name) { - for (int i = 0; i < size(); ++i) - if (at(i).name() == name) { - removeAt(i); - break; - } - } + EffectsParameterList(); + bool hasParam(const QString &name) const; + void setParamValue(const QString &name, const QString &value); + + QString paramValue(const QString &name, const QString &defaultValue = QString()) const; + void addParam(const QString &name, const QString &value); + void removeParam(const QString &name); }; class CommentedTime { public: - CommentedTime(): t(GenTime(0)), type(0) {} - CommentedTime(const GenTime &time, const QString& comment, int markerType = 0) - : t(time), c(comment), type(markerType) { } - - QString comment() const { - return (c.isEmpty() ? i18n("Marker") : c); - } - GenTime time() const { - return t; - } - void setComment(const QString &comm) { - c = comm; - } - void setMarkerType(int t) { - type = t; - } - int markerType() const { - return type; - } - static QColor markerColor(int type) { - switch (type) { - case 0: - return Qt::red; - break; - case 1: - return Qt::blue; - break; - case 2: - return Qt::green; - break; - case 3: - return Qt::yellow; - break; - default: - return Qt::cyan; - break; - } - } + CommentedTime(); + CommentedTime(const GenTime &time, const QString& comment, int markerType = 0); + + QString comment() const; + GenTime time() const; + void setComment(const QString &comm); + void setMarkerType(int t); + int markerType() const; + static QColor markerColor(int type); /* Implementation of > operator; Works identically as with basic types. */ - bool operator>(CommentedTime op) const { - return t > op.time(); - } + bool operator>(CommentedTime op) const; /* Implementation of < operator; Works identically as with basic types. */ - bool operator<(CommentedTime op) const { - return t < op.time(); - } + bool operator<(CommentedTime op) const; /* Implementation of >= operator; Works identically as with basic types. */ - bool operator>=(CommentedTime op) const { - return t >= op.time(); - } + bool operator>=(CommentedTime op) const; /* Implementation of <= operator; Works identically as with basic types. */ - bool operator<=(CommentedTime op) const { - return t <= op.time(); - } + bool operator<=(CommentedTime op) const; /* Implementation of == operator; Works identically as with basic types. */ - bool operator==(CommentedTime op) const { - return t == op.time(); - } + bool operator==(CommentedTime op) const; /* Implementation of != operator; Works identically as with basic types. */ - bool operator!=(CommentedTime op) const { - return t != op.time(); - } + bool operator!=(CommentedTime op) const; private: GenTime t; @@ -336,5 +285,4 @@ private: QDebug operator << (QDebug qd, const ItemInfo &info); - #endif diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 5065936d..ad777818 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -58,7 +58,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin m_properties() { int type = xml.attribute("type").toInt(); - m_clipType = (CLIPTYPE) type; + m_clipType = (ClipType) type; if (m_placeHolder) xml.removeAttribute("placeholder"); QDomNamedNodeMap attributes = xml.attributes(); for (int i = 0; i < attributes.count(); ++i) { @@ -140,7 +140,7 @@ QPoint DocClipBase::zone() const bool DocClipBase::hasAudioThumb() const { - if (m_clipType == AUDIO || m_clipType == AV || m_clipType == PLAYLIST) return true; + if (m_clipType == Audio || m_clipType == AV || m_clipType == Playlist) return true; return false; } @@ -175,12 +175,12 @@ const QString &DocClipBase::getId() const return m_id; } -const CLIPTYPE & DocClipBase::clipType() const +const ClipType & DocClipBase::clipType() const { return m_clipType; } -void DocClipBase::setClipType(CLIPTYPE type) +void DocClipBase::setClipType(ClipType type) { m_clipType = type; m_properties.insert("type", QString::number((int) type)); @@ -189,7 +189,7 @@ void DocClipBase::setClipType(CLIPTYPE type) KUrl DocClipBase::fileURL() const { QString res = m_properties.value("resource"); - if (m_clipType != COLOR && !res.isEmpty()) return KUrl(res); + if (m_clipType != Color && !res.isEmpty()) return KUrl(res); return KUrl(); } @@ -231,7 +231,7 @@ const GenTime &DocClipBase::duration() const const GenTime DocClipBase::maxDuration() const { - if (m_clipType == COLOR || m_clipType == IMAGE || m_clipType == TEXT || (m_clipType == SLIDESHOW && m_properties.value("loop") == "1")) { + if (m_clipType == Color || m_clipType == Image || m_clipType == Text || (m_clipType == SlideShow && m_properties.value("loop") == "1")) { /*const GenTime dur(15000, KdenliveSettings::project_fps()); return dur;*/ return GenTime(); @@ -303,44 +303,44 @@ const QString DocClipBase::shortInfo() const { QString info; - if (m_clipType == AV || m_clipType == VIDEO || m_clipType == IMAGE || m_clipType == PLAYLIST) { + if (m_clipType == AV || m_clipType == Video || m_clipType == Image || m_clipType == Playlist) { info = m_properties.value("frame_size") + " "; if (m_properties.contains("fps")) { info.append(i18n("%1 fps", m_properties.value("fps").left(5))); } if (!info.simplified().isEmpty()) info.prepend(" - "); } - else if (m_clipType == AUDIO) { + else if (m_clipType == Audio) { info = " - " + m_properties.value("frequency") + i18n("Hz"); } QString tip = ""; switch (m_clipType) { - case AUDIO: + case Audio: tip.append(i18n("Audio clip") + "" + info + "
" + fileURL().path()); break; - case VIDEO: + case Video: tip.append(i18n("Mute video clip") + "" + info + "
" + fileURL().path()); break; case AV: tip.append(i18n("Video clip") + "" + info + "
" + fileURL().path()); break; - case COLOR: + case Color: tip.append(i18n("Color clip")); break; - case IMAGE: + case Image: tip.append(i18n("Image clip") + "" + info + "
" + fileURL().path()); break; - case TEXT: + case Text: if (!fileURL().isEmpty() && getProperty("xmldata").isEmpty()) tip.append(i18n("Template text clip") + "
" + fileURL().path()); else tip.append(i18n("Text clip") + "
" + fileURL().path()); break; - case SLIDESHOW: + case SlideShow: tip.append(i18n("Slideshow clip") + "
" + fileURL().directory()); break; - case VIRTUAL: + case Virtual: tip.append(i18n("Virtual clip")); break; - case PLAYLIST: + case Playlist: tip.append(i18n("Playlist clip") + "" + info + "
" + fileURL().path()); break; default: @@ -577,7 +577,7 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readProp delete[] tmp; } else if (m_thumbProd && !m_thumbProd->hasProducer()) { - if (m_clipType != AUDIO) { + if (m_clipType != Audio) { if (!id.endsWith("_audio")) m_thumbProd->setProducer(producer); } @@ -639,7 +639,7 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readProp } else delete producer; } - if (updated && readPropertiesFromProducer && (m_clipType != COLOR && m_clipType != IMAGE && m_clipType != TEXT)) + if (updated && readPropertiesFromProducer && (m_clipType != Color && m_clipType != Image && m_clipType != Text)) setDuration(GenTime(producer->get_length(), KdenliveSettings::project_fps())); } @@ -740,13 +740,13 @@ Mlt::Producer *DocClipBase::getCloneProducer() { Mlt::Producer *source = NULL; Mlt::Producer *prod = NULL; - if (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST) { + if (m_clipType != Audio && m_clipType != AV && m_clipType != Playlist) { source = getProducer(); if (!source) return NULL; } - if (m_clipType == COLOR) { + if (m_clipType == Color) { prod = new Mlt::Producer(*(source->profile()), 0, QString("colour:" + QString(source->get("resource"))).toUtf8().constData()); - } else if (m_clipType == TEXT) { + } else if (m_clipType == Text) { prod = new Mlt::Producer(*(source->profile()), 0, QString("kdenlivetitle:" + QString(source->get("resource"))).toUtf8().constData()); if (prod && prod->is_valid() && m_properties.contains("xmldata")) prod->set("xmldata", m_properties.value("xmldata").toUtf8().constData()); @@ -771,7 +771,7 @@ Mlt::Producer *DocClipBase::getCloneProducer() if (m_properties.contains("duration")) prod->set("length", m_properties.value("duration").toInt()); if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt()); } - if (m_clipType == AUDIO) { + if (m_clipType == Audio) { prod->set("_audioclip", 1); } } @@ -782,7 +782,7 @@ Mlt::Producer *DocClipBase::getCloneProducer() Mlt::Producer *DocClipBase::getProducer(int track) { QMutexLocker locker(&m_producerMutex); - if (track == -1 || (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST)) { + if (track == -1 || (m_clipType != Audio && m_clipType != AV && m_clipType != Playlist)) { if (m_baseTrackProducers.count() == 0) { return NULL; } @@ -823,7 +823,7 @@ Mlt::Producer *DocClipBase::cloneProducer(Mlt::Producer *source) // Xml producer sometimes loses the correct url url = m_properties.value("resource"); } - if (m_clipType == SLIDESHOW || KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) { + if (m_clipType == SlideShow || KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) { result = new Mlt::Producer(*(source->profile()), url.toUtf8().constData()); } if (result == NULL || !result->is_valid()) { @@ -896,7 +896,7 @@ const char *DocClipBase::producerProperty(const char *name) const void DocClipBase::slotRefreshProducer() { if (m_baseTrackProducers.count() == 0) return; - if (m_clipType == SLIDESHOW) { + if (m_clipType == SlideShow) { setProducerProperty("ttl", getProperty("ttl").toInt()); //m_clipProducer->set("id", getProperty("id")); if (!getProperty("animation").isEmpty()) { @@ -1032,7 +1032,7 @@ void DocClipBase::setProperties(QMap properties) while (i.hasNext()) { i.next(); setProperty(i.key(), i.value()); - if (m_clipType == SLIDESHOW && keys.contains(i.key())) refreshProducer = true; + if (m_clipType == SlideShow && keys.contains(i.key())) refreshProducer = true; } if (properties.contains("proxy")) { QString value = properties.value("proxy"); @@ -1073,7 +1073,7 @@ void DocClipBase::clearProperty(const QString &key) void DocClipBase::getFileHash(const QString &url) { - if (m_clipType == SLIDESHOW) return; + if (m_clipType == SlideShow) return; QFile file(url); if (file.open(QIODevice::ReadOnly)) { // write size and hash only if resource points to a file QByteArray fileData; @@ -1106,9 +1106,9 @@ bool DocClipBase::checkHash() const QString DocClipBase::getClipHash() const { QString hash; - if (m_clipType == SLIDESHOW) hash = QCryptographicHash::hash(m_properties.value("resource").toAscii().data(), QCryptographicHash::Md5).toHex(); - else if (m_clipType == COLOR) hash = QCryptographicHash::hash(m_properties.value("colour").toAscii().data(), QCryptographicHash::Md5).toHex(); - else if (m_clipType == TEXT) hash = QCryptographicHash::hash(QString("title" + getId() + m_properties.value("xmldata")).toUtf8().data(), QCryptographicHash::Md5).toHex(); + if (m_clipType == SlideShow) hash = QCryptographicHash::hash(m_properties.value("resource").toAscii().data(), QCryptographicHash::Md5).toHex(); + else if (m_clipType == Color) hash = QCryptographicHash::hash(m_properties.value("colour").toAscii().data(), QCryptographicHash::Md5).toHex(); + else if (m_clipType == Text) hash = QCryptographicHash::hash(QString("title" + getId() + m_properties.value("xmldata")).toUtf8().data(), QCryptographicHash::Md5).toHex(); else { if (m_properties.contains("file_hash")) hash = m_properties.value("file_hash"); if (hash.isEmpty()) hash = getHash(fileURL().path()); diff --git a/src/docclipbase.h b/src/docclipbase.h index 1b21a583..7701f074 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -92,9 +92,9 @@ public: void setDuration(const GenTime &dur); /** returns clip type (audio, text, image,...) */ - const CLIPTYPE & clipType() const; + const ClipType & clipType() const; /** set clip type (audio, text, image,...) */ - void setClipType(CLIPTYPE type); + void setClipType(ClipType type); /** remove tmp file if the clip has one (for example text clips) */ void removeTmpFile() const; @@ -219,7 +219,7 @@ private: // Private attributes QList m_videoTrackProducers; QList m_audioTrackProducers; QList m_toDeleteProducers; - CLIPTYPE m_clipType; + ClipType m_clipType; /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */ QList < CommentedTime > m_snapMarkers; diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index da32ec34..1e4434ea 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -89,8 +89,8 @@ bool DocumentChecker::hasErrorInClips() for (int i = 0; i < max; ++i) { e = m_info.item(i).toElement(); clipType = e.attribute("type").toInt(); - if (clipType == COLOR) continue; - if (clipType != TEXT && clipType != IMAGE && clipType != SLIDESHOW) { + if (clipType == Color) continue; + if (clipType != Text && clipType != Image && clipType != SlideShow) { QString id = e.attribute("id"); int duration = e.attribute("duration").toInt(); int mltDuration = -1; @@ -126,7 +126,7 @@ bool DocumentChecker::hasErrorInClips() } } - if (clipType == TEXT) { + if (clipType == Text) { //TODO: Check is clip template is missing (xmltemplate) or hash changed QStringList images = TitleWidget::extractImageList(e.attribute("xmldata")); QStringList fonts = TitleWidget::extractFontList(e.attribute("xmldata")); @@ -149,13 +149,13 @@ bool DocumentChecker::hasErrorInClips() } } } - if (clipType == SLIDESHOW) resource = KUrl(resource).directory(); + if (clipType == SlideShow) resource = KUrl(resource).directory(); if (!KIO::NetAccess::exists(KUrl(resource), KIO::NetAccess::SourceSide, 0)) { // Missing clip found m_missingClips.append(e); } else { // Check if the clip has changed - if (clipType != SLIDESHOW && e.hasAttribute("file_hash")) { + if (clipType != SlideShow && e.hasAttribute("file_hash")) { if (e.attribute("file_hash") != DocClipBase::getHash(e.attribute("resource"))) e.removeAttribute("file_hash"); } @@ -210,19 +210,19 @@ bool DocumentChecker::hasErrorInClips() case AV: clipType = i18n("Video clip"); break; - case VIDEO: + case Video: clipType = i18n("Mute video clip"); break; - case AUDIO: + case Audio: clipType = i18n("Audio clip"); break; - case PLAYLIST: + case Playlist: clipType = i18n("Playlist clip"); break; - case IMAGE: + case Image: clipType = i18n("Image clip"); break; - case SLIDESHOW: + case SlideShow: clipType = i18n("Slideshow clip"); break; case TITLE_IMAGE_ELEMENT: @@ -294,19 +294,19 @@ bool DocumentChecker::hasErrorInClips() case AV: clipType = i18n("Video clip"); break; - case VIDEO: + case Video: clipType = i18n("Mute video clip"); break; - case AUDIO: + case Audio: clipType = i18n("Audio clip"); break; - case PLAYLIST: + case Playlist: clipType = i18n("Playlist clip"); break; - case IMAGE: + case Image: clipType = i18n("Image clip"); break; - case SLIDESHOW: + case SlideShow: clipType = i18n("Slideshow clip"); break; default: @@ -609,7 +609,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m void DocumentChecker::slotEditItem(QTreeWidgetItem *item, int) { int t = item->data(0, typeRole).toInt(); - if (t == TITLE_FONT_ELEMENT || t == UNKNOWN) return; + if (t == TITLE_FONT_ELEMENT || t == Unknown) return; //|| t == TITLE_IMAGE_ELEMENT) { KUrl url = KUrlRequesterDialog::getUrl(item->text(1), m_dialog, i18n("Enter new location for file")); diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp index abd91749..ef8e0694 100644 --- a/src/documentvalidator.cpp +++ b/src/documentvalidator.cpp @@ -504,7 +504,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) markers.insertAfter(mark, QDomNode()); } prod.removeChild(m); - } else if (prod.attribute("type").toInt() == TEXT) { + } else if (prod.attribute("type").toInt() == Text) { // convert title clip if (m.toElement().tagName() == "textclip") { QDomDocument tdoc; @@ -617,7 +617,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) if (wproducer.attribute("id") == "black") continue; // We have to do slightly different things, depending on the type kDebug() << "Converting producer element with type" << wproducer.attribute("type"); - if (wproducer.attribute("type").toInt() == TEXT) { + if (wproducer.attribute("type").toInt() == Text) { kDebug() << "Found TEXT element in producer" << endl; QDomElement kproducer = wproducer.cloneNode(true).toElement(); kproducer.setTagName("kdenlive_producer"); @@ -787,7 +787,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) QDomNodeList kproducerNodes = m_doc.elementsByTagName("kdenlive_producer"); for (int i = 0; i < kproducerNodes.count() && convert != KMessageBox::No; ++i) { QDomElement kproducer = kproducerNodes.at(i).toElement(); - if (kproducer.attribute("type").toInt() == TEXT) { + if (kproducer.attribute("type").toInt() == Text) { QDomDocument data; data.setContent(kproducer.attribute("xmldata")); QDomNodeList items = data.firstChild().childNodes(); @@ -835,7 +835,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) QDomNodeList kproducerNodes = m_doc.elementsByTagName("kdenlive_producer"); for (int i = 0; i < kproducerNodes.count(); ++i) { QDomElement kproducer = kproducerNodes.at(i).toElement(); - if (kproducer.attribute("type").toInt() == TEXT) { + if (kproducer.attribute("type").toInt() == Text) { QString data = kproducer.attribute("xmldata"); QString datafile = kproducer.attribute("resource"); if (!datafile.endsWith(".kdenlivetitle")) { diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp index 8b239ca9..d997e15b 100644 --- a/src/dvdwizardchapters.cpp +++ b/src/dvdwizardchapters.cpp @@ -154,7 +154,7 @@ void DvdWizardChapters::createMonitor(DVDFORMAT format) { QString profile = DvdWizardVob::getDvdProfile(format); if (m_monitor == NULL) { - m_monitor = new Monitor(Kdenlive::dvdMonitor, m_manager, profile, this); + m_monitor = new Monitor(Kdenlive::DvdMonitor, m_manager, profile, this); //m_monitor->start(); QVBoxLayout *vbox = new QVBoxLayout; vbox->addWidget(m_monitor); @@ -189,7 +189,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); adjustSize(); updateGeometry(); - m_manager->activateMonitor(Kdenlive::dvdMonitor); + m_manager->activateMonitor(Kdenlive::DvdMonitor); m_monitor->refreshMonitor(); } diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h index 4e6c8ae5..fce6c317 100644 --- a/src/effectstack/effectstackview2.h +++ b/src/effectstack/effectstackview2.h @@ -232,7 +232,7 @@ signals: void showComments(bool show); void startFilterJob(const ItemInfo &info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap &extraParams); void addEffect(ClipItem*,const QDomElement &); - void importClipKeyframes(GRAPHICSRECTITEM = AVWIDGET); + void importClipKeyframes(GraphicsRectItem = AVWidget); }; #endif diff --git a/src/effectstackedit.h b/src/effectstackedit.h index 552f20a7..67606b07 100644 --- a/src/effectstackedit.h +++ b/src/effectstackedit.h @@ -79,7 +79,7 @@ signals: void effectStateChanged(bool enabled); /** @brief Start an MLT filter job on this clip. */ void startFilterJob(const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap &); - void importClipKeyframes(GRAPHICSRECTITEM = AVWIDGET); + void importClipKeyframes(GraphicsRectItem = AVWidget); }; #endif diff --git a/src/folderprojectitem.cpp b/src/folderprojectitem.cpp index 4a868f33..7f16d144 100644 --- a/src/folderprojectitem.cpp +++ b/src/folderprojectitem.cpp @@ -26,7 +26,7 @@ FolderProjectItem::FolderProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) : - QTreeWidgetItem(parent, strings, PROJECTFOLDERTYPE), + QTreeWidgetItem(parent, strings, ProjectFoldeType), m_groupName(strings.at(0)), m_clipId(clipId) { diff --git a/src/folderprojectitem.h b/src/folderprojectitem.h index 9d277a2f..c49dfaae 100644 --- a/src/folderprojectitem.h +++ b/src/folderprojectitem.h @@ -44,7 +44,7 @@ public: /** Make sure folders appear on top of the tree widget */ virtual bool operator<(const QTreeWidgetItem &other)const { int column = treeWidget()->sortColumn(); - if (other.type() == PROJECTFOLDERTYPE) + if (other.type() == ProjectFoldeType) return text(column).toLower() < other.text(column).toLower(); else return true; } diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 19678333..73fc711f 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -56,7 +56,7 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, const QList setHidden(smallTracks); buttonAudio->setHidden(smallTracks); buttonLock->setHidden(smallTracks); diff --git a/src/headertrack.h b/src/headertrack.h index 6d208982..79006916 100644 --- a/src/headertrack.h +++ b/src/headertrack.h @@ -48,7 +48,7 @@ protected: private: int m_index; - TRACKTYPE m_type; + TrackType m_type; bool m_isSelected; QString m_name; diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index ffd73333..3fe26a4c 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -246,9 +246,9 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup if (e.tagName() == "trackinfo") { TrackInfo projectTrack; if (e.attribute("type") == "audio") - projectTrack.type = AUDIOTRACK; + projectTrack.type = AudioTrack; else - projectTrack.type = VIDEOTRACK; + projectTrack.type = VideoTrack; projectTrack.isMute = e.attribute("mute").toInt(); projectTrack.isBlind = e.attribute("blind").toInt(); projectTrack.isLocked = e.attribute("locked").toInt(); @@ -422,7 +422,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) // Better default names for tracks: Audio 1 etc. instead of blank numbers for (int i = 0; i < audiotracks; ++i) { TrackInfo audioTrack; - audioTrack.type = AUDIOTRACK; + audioTrack.type = AudioTrack; audioTrack.isMute = false; audioTrack.isBlind = true; audioTrack.isLocked = false; @@ -434,7 +434,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) } for (int i = 0; i < videotracks; ++i) { TrackInfo videoTrack; - videoTrack.type = VIDEOTRACK; + videoTrack.type = VideoTrack; videoTrack.isMute = false; videoTrack.isBlind = false; videoTrack.isLocked = false; @@ -531,7 +531,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const QList &tracks) for (int i = 1; i < total; ++i) { QDomElement track = doc.createElement("track"); track.setAttribute("producer", "playlist" + QString::number(i)); - if (tracks.at(i - 1).type == AUDIOTRACK) { + if (tracks.at(i - 1).type == AudioTrack) { track.setAttribute("hide", "video"); } else if (tracks.at(i - 1).isBlind) track.setAttribute("hide", "video"); @@ -731,7 +731,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & QDomElement tracksinfo = sceneList.createElement("tracksinfo"); foreach(const TrackInfo & info, m_tracksList) { QDomElement trackinfo = sceneList.createElement("trackinfo"); - if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio"); + if (info.type == AudioTrack) trackinfo.setAttribute("type", "audio"); trackinfo.setAttribute("mute", info.isMute); trackinfo.setAttribute("blind", info.isBlind); trackinfo.setAttribute("locked", info.isLocked); @@ -853,7 +853,7 @@ void KdenliveDoc::moveProjectData(const KUrl &url) KUrl::List cacheUrls; for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); - if (clip->clipType() == TEXT) { + if (clip->clipType() == Text) { // the image for title clip must be moved KUrl oldUrl = clip->fileURL(); KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "titles/" + oldUrl.fileName()); @@ -1096,14 +1096,14 @@ bool KdenliveDoc::addClip(QDomElement elem, const QString &clipId, bool createCl elem.setAttribute("id", producerId); QString path = elem.attribute("resource"); QString extension; - if (elem.attribute("type").toInt() == SLIDESHOW) { + if (elem.attribute("type").toInt() == SlideShow) { extension = KUrl(path).fileName(); path = KUrl(path).directory(); } if (elem.hasAttribute("_missingsource")) { // Clip has proxy but missing original source } - else if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) { + else if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != Text && !elem.hasAttribute("placeholder")) { kDebug() << "// FOUND MISSING CLIP: " << path << ", TYPE: " << elem.attribute("type").toInt(); const QString size = elem.attribute("file_size"); const QString hash = elem.attribute("file_hash"); @@ -1115,7 +1115,7 @@ bool KdenliveDoc::addClip(QDomElement elem, const QString &clipId, bool createCl else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); } else { - if (elem.attribute("type").toInt() == SLIDESHOW) { + if (elem.attribute("type").toInt() == SlideShow) { int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path)); @@ -1145,7 +1145,7 @@ bool KdenliveDoc::addClip(QDomElement elem, const QString &clipId, bool createCl elem.setAttribute("placeholder", '1'); } if (!newpath.isEmpty()) { - if (elem.attribute("type").toInt() == SLIDESHOW) + if (elem.attribute("type").toInt() == SlideShow) newpath.append('/' + extension); elem.setAttribute("resource", newpath); setNewClipResource(clipId, newpath); @@ -1435,7 +1435,7 @@ QPoint KdenliveDoc::getTracksCount() const int audio = 0; int video = 0; foreach(const TrackInfo & info, m_tracksList) { - if (info.type == VIDEOTRACK) video++; + if (info.type == VideoTrack) video++; else audio++; } return QPoint(video, audio); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ae9c289d..ea651f6f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -234,7 +234,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); - m_clipMonitor = new Monitor(Kdenlive::clipMonitor, m_monitorManager, QString(), m_timelineArea); + m_clipMonitor = new Monitor(Kdenlive::ClipMonitor, m_monitorManager, QString(), m_timelineArea); m_clipMonitorDock->setWidget(m_clipMonitor); // Connect the project list @@ -252,13 +252,13 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); - m_projectMonitor = new Monitor(Kdenlive::projectMonitor, m_monitorManager, QString()); + m_projectMonitor = new Monitor(Kdenlive::ProjectMonitor, m_monitorManager, QString()); m_projectMonitorDock->setWidget(m_projectMonitor); #ifndef Q_WS_MAC m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); m_recMonitorDock->setObjectName("record_monitor"); - m_recMonitor = new RecMonitor(Kdenlive::recordMonitor, m_monitorManager); + m_recMonitor = new RecMonitor(Kdenlive::RecordMonitor, m_monitorManager); m_recMonitorDock->setWidget(m_recMonitor); connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); connect(m_recMonitor, SIGNAL(addProjectClipList(KUrl::List)), this, SLOT(slotAddProjectClipList(KUrl::List))); @@ -1985,7 +1985,7 @@ void MainWindow::newFile(bool showProjectSettings, bool force) connectDocument(trackView, doc); } else m_timelineArea->setTabBarHidden(false); - m_monitorManager->activateMonitor(Kdenlive::clipMonitor); + m_monitorManager->activateMonitor(Kdenlive::ClipMonitor); m_closeAction->setEnabled(m_timelineArea->count() > 1); } @@ -2622,7 +2622,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_effectStack, SIGNAL(displayMessage(QString,int)), this, SLOT(slotGotProgressInfo(QString,int))); disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition*,QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition*,QDomElement))); disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); - disconnect(m_transitionConfig, SIGNAL(importClipKeyframes(GRAPHICSRECTITEM)), m_activeTimeline->projectView() , SLOT(slotImportClipKeyframes(GRAPHICSRECTITEM))); + disconnect(m_transitionConfig, SIGNAL(importClipKeyframes(GraphicsRectItem)), m_activeTimeline->projectView() , SLOT(slotImportClipKeyframes(GraphicsRectItem))); disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(slotActivateMonitor())); disconnect(m_activeTimeline, SIGNAL(zoneMoved(int,int)), this, SLOT(slotZoneMoved(int,int))); @@ -2651,7 +2651,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); connect(trackView->projectView(), SIGNAL(forceClipProcessing(QString)), m_projectList, SLOT(slotForceProcessing(QString))); - connect(trackView->projectView(), SIGNAL(importKeyframes(GRAPHICSRECTITEM,QString,int)), this, SLOT(slotProcessImportKeyframes(GRAPHICSRECTITEM,QString,int))); + connect(trackView->projectView(), SIGNAL(importKeyframes(GraphicsRectItem,QString,int)), this, SLOT(slotProcessImportKeyframes(GraphicsRectItem,QString,int))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); @@ -2702,13 +2702,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView(), SLOT(seekCursorPos(int))); - connect(m_effectStack, SIGNAL(importClipKeyframes(GRAPHICSRECTITEM)), trackView->projectView(), SLOT(slotImportClipKeyframes(GRAPHICSRECTITEM))); + connect(m_effectStack, SIGNAL(importClipKeyframes(GraphicsRectItem)), trackView->projectView(), SLOT(slotImportClipKeyframes(GraphicsRectItem))); connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); connect(m_effectStack, SIGNAL(displayMessage(QString,int)), this, SLOT(slotGotProgressInfo(QString,int))); // Transition config signals connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition*,QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition*,QDomElement))); - connect(m_transitionConfig, SIGNAL(importClipKeyframes(GRAPHICSRECTITEM)), trackView->projectView() , SLOT(slotImportClipKeyframes(GRAPHICSRECTITEM))); + connect(m_transitionConfig, SIGNAL(importClipKeyframes(GraphicsRectItem)), trackView->projectView() , SLOT(slotImportClipKeyframes(GraphicsRectItem))); connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(seekCursorPos(int))); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(slotActivateMonitor())); @@ -2748,7 +2748,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha // Make sure monitor is visible so that it is painted black on startup show(); - m_monitorManager->activateMonitor(Kdenlive::clipMonitor, true); + m_monitorManager->activateMonitor(Kdenlive::ClipMonitor, true); // set tool to select tool m_buttonSelectTool->setChecked(true); } @@ -3079,7 +3079,7 @@ void MainWindow::slotRemoveSpace() void MainWindow::slotInsertTrack(int ix) { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); if (m_activeTimeline) { if (ix == -1) ix = m_activeTimeline->projectView()->selectedTrack(); m_activeTimeline->projectView()->slotInsertTrack(ix); @@ -3090,7 +3090,7 @@ void MainWindow::slotInsertTrack(int ix) void MainWindow::slotDeleteTrack(int ix) { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); if (m_activeTimeline) { if (ix == -1) ix = m_activeTimeline->projectView()->selectedTrack(); m_activeTimeline->projectView()->slotDeleteTrack(ix); @@ -3101,7 +3101,7 @@ void MainWindow::slotDeleteTrack(int ix) void MainWindow::slotConfigTrack(int ix) { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); if (m_activeTimeline) m_activeTimeline->projectView()->slotConfigTracks(ix); if (m_activeDocument) @@ -3110,7 +3110,7 @@ void MainWindow::slotConfigTrack(int ix) void MainWindow::slotSelectTrack() { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); if (m_activeTimeline) { m_activeTimeline->projectView()->slotSelectClipsInTrack(); } @@ -3118,7 +3118,7 @@ void MainWindow::slotSelectTrack() void MainWindow::slotSelectAllTracks() { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); if (m_activeTimeline) m_activeTimeline->projectView()->slotSelectAllClips(); } @@ -3317,7 +3317,7 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress, Messa void MainWindow::slotShowClipProperties(DocClipBase *clip) { - if (clip->clipType() == TEXT) { + if (clip->clipType() == Text) { QString titlepath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; if (!clip->getProperty("resource").isEmpty() && clip->getProperty("xmldata").isEmpty()) { // template text clip @@ -3424,7 +3424,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) // any type of clip but a title ClipProperties *dia = new ClipProperties(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); - if (clip->clipType() == AV || clip->clipType() == VIDEO || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { + if (clip->clipType() == AV || clip->clipType() == Video || clip->clipType() == Playlist || clip->clipType() == SlideShow) { // request clip thumbnails connect(m_activeDocument->clipManager(), SIGNAL(gotClipPropertyThumbnail(QString,QImage)), dia, SLOT(slotGotThumbnail(QString,QImage))); connect(dia, SIGNAL(requestThumb(QString,QList)), m_activeDocument->clipManager(), SLOT(slotRequestThumbs(QString,QList))); @@ -3473,7 +3473,7 @@ void MainWindow::slotShowClipProperties(const QList &cliplist, c for (int i = 0; i < cliplist.count(); ++i) { DocClipBase *clip = cliplist.at(i); - if (clip->clipType() == IMAGE) + if (clip->clipType() == Image) new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newImageProps), newImageProps, true, command); else new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newProps), newProps, true, command); @@ -3572,11 +3572,11 @@ void MainWindow::slotZoneEnd() void MainWindow::slotChangeTool(QAction * action) { if (action == m_buttonSelectTool) - slotSetTool(SELECTTOOL); + slotSetTool(SelectTool); else if (action == m_buttonRazorTool) - slotSetTool(RAZORTOOL); + slotSetTool(RazorTool); else if (action == m_buttonSpacerTool) - slotSetTool(SPACERTOOL); + slotSetTool(SpacerTool); } void MainWindow::slotChangeEdit(QAction * action) @@ -3592,16 +3592,16 @@ void MainWindow::slotChangeEdit(QAction * action) m_activeTimeline->projectView()->setEditMode(NORMALEDIT); } -void MainWindow::slotSetTool(PROJECTTOOL tool) +void MainWindow::slotSetTool(ProjectTool tool) { if (m_activeDocument && m_activeTimeline) { //m_activeDocument->setTool(tool); QString message; switch (tool) { - case SPACERTOOL: + case SpacerTool: message = i18n("Ctrl + click to use spacer on current track only"); break; - case RAZORTOOL: + case RazorTool: message = i18n("Click on a clip to cut it"); break; default: @@ -3984,11 +3984,11 @@ void MainWindow::slotUpdateClipType(QAction *action) void MainWindow::slotDvdWizard(const QString &url) { // We must stop the monitors since we create a new on in the dvd wizard - m_monitorManager->activateMonitor(Kdenlive::dvdMonitor); + m_monitorManager->activateMonitor(Kdenlive::DvdMonitor); QPointer w = new DvdWizard(m_monitorManager, url, this); w->exec(); delete w; - m_monitorManager->activateMonitor(Kdenlive::clipMonitor); + m_monitorManager->activateMonitor(Kdenlive::ClipMonitor); } void MainWindow::slotShowTimeline(bool show) @@ -4690,13 +4690,13 @@ void MainWindow::slotSaveTimelineClip() } } -void MainWindow::slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum) +void MainWindow::slotProcessImportKeyframes(GraphicsRectItem type, const QString& data, int maximum) { - if (type == AVWIDGET) { + if (type == AVWidget) { // This data should be sent to the effect stack m_effectStack->setKeyframes(data, maximum); } - else if (type == TRANSITIONWIDGET) { + else if (type == TransitionWidget) { // This data should be sent to the transition stack m_transitionConfig->setKeyframes(data, maximum); } @@ -4707,7 +4707,7 @@ void MainWindow::slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString void MainWindow::slotAlignPlayheadToMousePos() { - m_monitorManager->activateMonitor(Kdenlive::projectMonitor); + m_monitorManager->activateMonitor(Kdenlive::ProjectMonitor); m_activeTimeline->projectView()->slotAlignPlayheadToMousePos(); } diff --git a/src/mainwindow.h b/src/mainwindow.h index 486e887c..27e69ca6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -431,7 +431,7 @@ private slots: void slotActivateTransitionView(Transition *); void slotChangeTool(QAction * action); void slotChangeEdit(QAction * action); - void slotSetTool(PROJECTTOOL tool); + void slotSetTool(ProjectTool tool); void slotSnapForward(); void slotSnapRewind(); void slotClipStart(); @@ -563,7 +563,7 @@ private slots: /** @brief Save current timeline clip as mlt playlist. */ void slotSaveTimelineClip(); /** @brief Process keyframe data sent from a clip to effect / transition stack. */ - void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum); + void slotProcessImportKeyframes(GraphicsRectItem type, const QString& data, int maximum); /** @brief Move playhead to mouse curser position if defined key is pressed */ void slotAlignPlayheadToMousePos(); /** @brief Set MLT's consumer deinterlace method */ diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp index fd1abcef..1eb48042 100644 --- a/src/markerdialog.cpp +++ b/src/markerdialog.cpp @@ -72,18 +72,18 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, const CommentedTime &t, const Time int swidth = (int) (Kdenlive::DefaultThumbHeight * m_profile->width() / m_profile->height() + 0.5); switch (m_clip->clipType()) { - case VIDEO: + case Video: case AV: - case SLIDESHOW: - case PLAYLIST: + case SlideShow: + case Playlist: connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start())); break; - case IMAGE: - case TEXT: + case Image: + case Text: m_image = KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, Kdenlive::DefaultThumbHeight); p = QPixmap::fromImage(m_image); break; - case COLOR: + case Color: colour = colour.replace(0, 2, "#"); p.fill(QColor(colour.left(7))); break; diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index 296278a8..53cea103 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -78,7 +78,7 @@ static void rec_consumer_frame_preview(mlt_consumer, MltDeviceCapture * self, ml MltDeviceCapture::MltDeviceCapture(QString profile, VideoSurface *surface, QWidget *parent) : - AbstractRender(Kdenlive::recordMonitor, parent), + AbstractRender(Kdenlive::RecordMonitor, parent), doCapture(0), sendFrameForAnalysis(false), processingImage(false), diff --git a/src/monitor.cpp b/src/monitor.cpp index 8e86d23f..09487a96 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -48,7 +48,7 @@ #define SEEK_INACTIVE (-1) -Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile, QWidget *parent) : +Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QString profile, QWidget *parent) : AbstractMonitor(id, manager, parent) , render(NULL) , m_currentClip(NULL) @@ -86,7 +86,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil m_pauseIcon = KIcon("media-playback-pause"); - if (id != Kdenlive::dvdMonitor) { + if (id != Kdenlive::DvdMonitor) { m_toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); m_toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); } @@ -109,7 +109,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil playButton->setDefaultAction(m_playAction); - if (id != Kdenlive::dvdMonitor) { + if (id != Kdenlive::DvdMonitor) { QToolButton *configButton = new QToolButton(m_toolbar); m_configMenu = new QMenu(i18n("Misc..."), this); configButton->setIcon(KIcon("system-run")); @@ -117,7 +117,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); m_toolbar->addWidget(configButton); - if (id == Kdenlive::clipMonitor) { + if (id == Kdenlive::ClipMonitor) { m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); m_configMenu->addMenu(m_markerMenu); @@ -178,7 +178,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil // Monitor ruler m_ruler = new SmallRuler(this, render); - if (id == Kdenlive::dvdMonitor) m_ruler->setZone(-3, -2); + if (id == Kdenlive::DvdMonitor) m_ruler->setZone(-3, -2); layout->addWidget(m_ruler); connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int))); @@ -186,7 +186,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); - if (id != Kdenlive::clipMonitor) { + if (id != Kdenlive::ClipMonitor) { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int))); connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint))); @@ -196,7 +196,7 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil if (videoSurface) videoSurface->show(); - if (id == Kdenlive::projectMonitor) { + if (id == Kdenlive::ProjectMonitor) { m_effectWidget = new MonitorEditWidget(render, videoBox); connect(m_effectWidget, SIGNAL(showEdit(bool,bool)), this, SLOT(slotShowEffectScene(bool,bool))); m_toolbar->addAction(m_effectWidget->getVisibilityAction()); @@ -270,7 +270,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe } //TODO: add save zone to timeline monitor when fixed - if (m_id == Kdenlive::clipMonitor) { + if (m_id == Kdenlive::ClipMonitor) { m_contextMenu->addMenu(m_markerMenu); m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); QAction *extractZone = m_configMenu->addAction(KIcon("document-new"), i18n("Extract Zone"), this, SLOT(slotExtractCurrentZone())); @@ -279,7 +279,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); m_contextMenu->addAction(extractFrame); - if (m_id != Kdenlive::clipMonitor) { + if (m_id != Kdenlive::ClipMonitor) { QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool))); splitView->setCheckable(true); m_configMenu->addAction(splitView); @@ -1066,7 +1066,7 @@ void Monitor::slotSetSelectedClip(Transition* item) void Monitor::slotShowEffectScene(bool show, bool manuallyTriggered) { - if (m_id == Kdenlive::projectMonitor) { + if (m_id == Kdenlive::ProjectMonitor) { if (!m_effectWidget->getVisibilityAction()->isChecked()) show = false; if (m_effectWidget->isVisible() == show) diff --git a/src/monitor.h b/src/monitor.h index 40414dd7..dde2828b 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -68,7 +68,7 @@ class Monitor : public AbstractMonitor Q_OBJECT public: - Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0); + Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QString profile = QString(), QWidget *parent = 0); ~Monitor(); Render *render; AbstractRender *abstractRender(); diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp index 35ad43d8..b05b1da4 100644 --- a/src/monitormanager.cpp +++ b/src/monitormanager.cpp @@ -54,8 +54,8 @@ void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor, m_clipMonitor = clipMonitor; m_projectMonitor = projectMonitor; - connect(m_clipMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID))); - connect(m_projectMonitor->render, SIGNAL(activateMonitor(Kdenlive::MONITORID)), this, SLOT(activateMonitor(Kdenlive::MONITORID))); + connect(m_clipMonitor->render, SIGNAL(activateMonitor(Kdenlive::MonitorId)), this, SLOT(activateMonitor(Kdenlive::MonitorId))); + connect(m_projectMonitor->render, SIGNAL(activateMonitor(Kdenlive::MonitorId)), this, SLOT(activateMonitor(Kdenlive::MonitorId))); m_monitorsList.append(clipMonitor); m_monitorsList.append(projectMonitor); @@ -73,7 +73,7 @@ void MonitorManager::removeMonitor(AbstractMonitor *monitor) m_monitorsList.removeAll(monitor); } -AbstractMonitor* MonitorManager::monitor(Kdenlive::MONITORID monitorName) +AbstractMonitor* MonitorManager::monitor(Kdenlive::MonitorId monitorName) { AbstractMonitor *monitor = NULL; for (int i = 0; i < m_monitorsList.size(); ++i) { @@ -90,7 +90,7 @@ void MonitorManager::setConsumerProperty(const QString &name, const QString &val if (m_projectMonitor) m_projectMonitor->render->setConsumerProperty(name, value); } -bool MonitorManager::activateMonitor(Kdenlive::MONITORID name, bool forceRefresh) +bool MonitorManager::activateMonitor(Kdenlive::MonitorId name, bool forceRefresh) { if (m_clipMonitor == NULL || m_projectMonitor == NULL) return false; @@ -116,7 +116,7 @@ bool MonitorManager::activateMonitor(Kdenlive::MONITORID name, bool forceRefresh return (m_activeMonitor != NULL); } -bool MonitorManager::isActive(Kdenlive::MONITORID id) const +bool MonitorManager::isActive(Kdenlive::MonitorId id) const { return m_activeMonitor ? m_activeMonitor->id() == id: false; } @@ -124,9 +124,9 @@ bool MonitorManager::isActive(Kdenlive::MONITORID id) const void MonitorManager::slotSwitchMonitors(bool activateClip) { if (activateClip) - activateMonitor(Kdenlive::clipMonitor); + activateMonitor(Kdenlive::ClipMonitor); else - activateMonitor(Kdenlive::projectMonitor); + activateMonitor(Kdenlive::ProjectMonitor); } void MonitorManager::stopActiveMonitor() @@ -218,10 +218,10 @@ void MonitorManager::slotResetProfiles() return; } blockSignals(true); - Kdenlive::MONITORID active = m_activeMonitor ? m_activeMonitor->id() : Kdenlive::noMonitor; + Kdenlive::MonitorId active = m_activeMonitor ? m_activeMonitor->id() : Kdenlive::NoMonitor; m_clipMonitor->resetProfile(KdenliveSettings::current_profile()); m_projectMonitor->resetProfile(KdenliveSettings::current_profile()); - if (active != Kdenlive::noMonitor) activateMonitor(active); + if (active != Kdenlive::NoMonitor) activateMonitor(active); blockSignals(false); if (m_activeMonitor) m_activeMonitor->parentWidget()->raise(); emit checkColorScopes(); diff --git a/src/monitormanager.h b/src/monitormanager.h index b9f7de2c..aa243afe 100644 --- a/src/monitormanager.h +++ b/src/monitormanager.h @@ -43,7 +43,7 @@ public: /** Searches for a monitor with the given name. @return NULL, if no monitor could be found, or the monitor otherwise. */ - AbstractMonitor *monitor(Kdenlive::MONITORID monitorName); + AbstractMonitor *monitor(Kdenlive::MonitorId monitorName); void updateScopeSource(); void clearScopeSource(); /** @brief Returns current project's folder. */ @@ -57,8 +57,8 @@ public slots: /** @brief Activates a monitor. * @param name name of the monitor to activate */ - bool activateMonitor(Kdenlive::MONITORID, bool forceRefresh = false); - bool isActive(Kdenlive::MONITORID id) const; + bool activateMonitor(Kdenlive::MonitorId, bool forceRefresh = false); + bool isActive(Kdenlive::MonitorId id) const; void slotPlay(); void slotPause(); void slotPlayZone(); diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 3cb1150b..a4627557 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -36,7 +36,7 @@ const int JobStatusMessage = Qt::UserRole + 7; const int itemHeight = 38; ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip, const QSize &pixmapSize) : - QTreeWidgetItem(parent, PROJECTCLIPTYPE), + QTreeWidgetItem(parent, ProjectClipType), m_clip(clip), m_clipId(clip->getId()), m_pixmapSet(false) @@ -45,7 +45,7 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip, const QSize &p } ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip, const QSize &pixmapSize) : - QTreeWidgetItem(parent, PROJECTCLIPTYPE), + QTreeWidgetItem(parent, ProjectClipType), m_clip(clip), m_clipId(clip->getId()), m_pixmapSet(false) @@ -61,20 +61,20 @@ void ProjectItem::buildItem(const QSize &pixmapSize) else setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); QString name = m_clip->getProperty("name"); if (name.isEmpty()) name = KUrl(m_clip->getProperty("resource")).fileName(); - m_clipType = (CLIPTYPE) m_clip->getProperty("type").toInt(); + m_clipType = (ClipType) m_clip->getProperty("type").toInt(); switch(m_clipType) { - case AUDIO: + case Audio: setData(0, Qt::DecorationRole, KIcon("audio-x-generic").pixmap(pixmapSize)); m_pixmapSet = true; break; - case IMAGE: - case SLIDESHOW: + case Image: + case SlideShow: setData(0, Qt::DecorationRole, KIcon("image-x-generic").pixmap(pixmapSize)); break; default: setData(0, Qt::DecorationRole, KIcon("video-x-generic").pixmap(pixmapSize)); } - if (m_clipType != UNKNOWN) slotSetToolTip(); + if (m_clipType != Unknown) slotSetToolTip(); setText(0, name); setText(1, m_clip->description()); @@ -83,7 +83,7 @@ void ProjectItem::buildItem(const QSize &pixmapSize) if (duration != GenTime()) { durationText = Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()); } - if (m_clipType == PLAYLIST) { + if (m_clipType == Playlist) { // Check if the playlist xml contains a proxy inside, and inform user if (playlistHasProxies(m_clip->fileURL().path())) { durationText.prepend(i18n("Contains proxies") + " / "); @@ -124,7 +124,7 @@ const QString &ProjectItem::clipId() const return m_clipId; } -CLIPTYPE ProjectItem::clipType() const +ClipType ProjectItem::clipType() const { return m_clipType; } @@ -141,7 +141,7 @@ QDomElement ProjectItem::toXml() const const KUrl ProjectItem::clipUrl() const { - if (m_clipType != COLOR && m_clipType != VIRTUAL && m_clipType != UNKNOWN) + if (m_clipType != Color && m_clipType != Virtual && m_clipType != Unknown) return KUrl(m_clip->getProperty("resource")); else return KUrl(); } @@ -208,17 +208,17 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con m_clip->setProperties(attributes); m_clip->setMetadata(metadata); - if (m_clipType == UNKNOWN) { + if (m_clipType == Unknown) { QString cliptype = attributes.value("type"); - if (cliptype == "audio") m_clipType = AUDIO; - else if (cliptype == "video") m_clipType = VIDEO; + if (cliptype == "audio") m_clipType = Audio; + else if (cliptype == "video") m_clipType = Video; else if (cliptype == "av") m_clipType = AV; - else if (cliptype == "playlist") m_clipType = PLAYLIST; + else if (cliptype == "playlist") m_clipType = Playlist; else m_clipType = AV; m_clip->setClipType(m_clipType); slotSetToolTip(); - if (m_clipType == PLAYLIST) { + if (m_clipType == Playlist) { // Check if the playlist xml contains a proxy inside, and inform user if (playlistHasProxies(m_clip->fileURL().path())) { prefix = i18n("Contains proxies") + " / "; @@ -250,19 +250,19 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con } } -void ProjectItem::setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage) +void ProjectItem::setJobStatus(JOBTYPE jobType, ClipJobStatus status, int progress, const QString &statusMessage) { setData(0, JobTypeRole, jobType); if (progress > 0) setData(0, JobProgressRole, qMin(100, progress)); else { setData(0, JobProgressRole, status); - if ((status == JOBABORTED || status == JOBCRASHED || status == JOBDONE) || !statusMessage.isEmpty()) + if ((status == JobAborted || status == JobCrashed || status == JobDone) || !statusMessage.isEmpty()) setData(0, JobStatusMessage, statusMessage); slotSetToolTip(); } } -void ProjectItem::setConditionalJobStatus(CLIPJOBSTATUS status, JOBTYPE requestedJobType) +void ProjectItem::setConditionalJobStatus(ClipJobStatus status, JOBTYPE requestedJobType) { if (data(0, JobTypeRole).toInt() == requestedJobType) { setData(0, JobProgressRole, status); @@ -272,26 +272,26 @@ void ProjectItem::setConditionalJobStatus(CLIPJOBSTATUS status, JOBTYPE requeste bool ProjectItem::hasProxy() const { if (m_clip == NULL) return false; - if (m_clip->getProperty("proxy").size() < 2 || data(0, JobProgressRole).toInt() == JOBCRASHED) return false; + if (m_clip->getProperty("proxy").size() < 2 || data(0, JobProgressRole).toInt() == JobCrashed) return false; return true; } bool ProjectItem::isProxyReady() const { - return (data(0, JobProgressRole).toInt() == JOBDONE); + return (data(0, JobProgressRole).toInt() == JobDone); } bool ProjectItem::isJobRunning() const { int s = data(0, JobProgressRole).toInt(); - if (s == JOBWAITING || s == JOBWORKING || s > 0) return true; + if (s == JobWaiting || s == JobWorking || s > 0) return true; return false; } bool ProjectItem::isProxyRunning() const { int s = data(0, JobProgressRole).toInt(); - if ((s == JOBWORKING || s > 0) && data(0, JobTypeRole).toInt() == (int) PROXYJOB) return true; + if ((s == JobWorking || s > 0) && data(0, JobTypeRole).toInt() == (int) PROXYJOB) return true; return false; } diff --git a/src/projectitem.h b/src/projectitem.h index a917ca74..18917d96 100644 --- a/src/projectitem.h +++ b/src/projectitem.h @@ -55,7 +55,7 @@ public: const QString &clipId() const; const KUrl clipUrl() const; int clipMaxDuration() const; - CLIPTYPE clipType() const; + ClipType clipType() const; void changeDuration(int frames); DocClipBase *referencedClip(); void setProperties(const QMap &props); @@ -65,9 +65,9 @@ public: static int itemDefaultHeight(); void slotSetToolTip(); /** \brief Set the status of the clip job. */ - void setJobStatus(JOBTYPE jobType, CLIPJOBSTATUS status, int progress = 0, const QString &statusMessage = QString()); + void setJobStatus(JOBTYPE jobType, ClipJobStatus status, int progress = 0, const QString &statusMessage = QString()); /** \brief Set the status of a clip job if it is of the specified job type. */ - void setConditionalJobStatus(CLIPJOBSTATUS status, JOBTYPE requestedJobType); + void setConditionalJobStatus(ClipJobStatus status, JOBTYPE requestedJobType); /** \brief Returns the proxy status for this clip (true means there is a proxy clip). */ bool hasProxy() const; /** \brief Returns true if the proxy for this clip is ready. */ @@ -83,13 +83,13 @@ public: virtual bool operator<(const QTreeWidgetItem &other)const { int column = treeWidget()->sortColumn(); - if (other.type() != PROJECTFOLDERTYPE) + if (other.type() != ProjectFoldeType) return text(column).toLower() < other.text(column).toLower(); else return false; } private: - CLIPTYPE m_clipType; + ClipType m_clipType; DocClipBase *m_clip; QString m_clipId; bool m_pixmapSet; diff --git a/src/projectlist.cpp b/src/projectlist.cpp index dce5dacd..a024e06c 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -324,7 +324,7 @@ ProjectList::~ProjectList() { m_abortAllJobs = true; for (int i = 0; i < m_jobList.count(); ++i) { - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } m_closing = true; m_thumbnailQueue.clear(); @@ -454,14 +454,14 @@ void ProjectList::slotEditClip() { QList list = m_listView->selectedItems(); if (list.isEmpty()) return; - if (list.count() > 1 || list.at(0)->type() == PROJECTFOLDERTYPE) { + if (list.count() > 1 || list.at(0)->type() == ProjectFoldeType) { editClipSelection(list); return; } ProjectItem *item; - if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) + if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return; - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) + if (m_listView->currentItem()->type() == ProjectSubclipType) item = static_cast (m_listView->currentItem()->parent()); else item = static_cast (m_listView->currentItem()); @@ -494,7 +494,7 @@ void ProjectList::editClipSelection(QList list) ProjectItem *item; for (int i = 0; i < list.count(); ++i) { item = NULL; - if (list.at(i)->type() == PROJECTFOLDERTYPE) { + if (list.at(i)->type() == ProjectFoldeType) { // Add folder items to the list int ct = list.at(i)->childCount(); for (int j = 0; j < ct; j++) { @@ -502,7 +502,7 @@ void ProjectList::editClipSelection(QList list) } continue; } - else if (list.at(i)->type() == PROJECTSUBCLIPTYPE) + else if (list.at(i)->type() == ProjectSubclipType) item = static_cast (list.at(i)->parent()); else item = static_cast (list.at(i)); @@ -512,7 +512,7 @@ void ProjectList::editClipSelection(QList list) // check properties DocClipBase *clip = item->referencedClip(); if (clipList.contains(clip)) continue; - if (clip->clipType() == IMAGE) { + if (clip->clipType() == Image) { hasImages = true; if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) { if (transparency == "-") { @@ -535,7 +535,7 @@ void ProjectList::editClipSelection(QList list) } } } - if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT) + if (clip->clipType() != Color && clip->clipType() != Image && clip->clipType() != Text) allowDurationChange = false; if (allowDurationChange && commonDuration != 0) { if (commonDuration == -1) @@ -578,20 +578,20 @@ void ProjectList::editClipSelection(QList list) void ProjectList::slotOpenClip() { ProjectItem *item; - if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) + if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return; if (m_listView->currentItem()->type() == QTreeWidgetItem::UserType + 1) item = static_cast (m_listView->currentItem()->parent()); else item = static_cast (m_listView->currentItem()); if (item) { - if (item->clipType() == IMAGE) { + if (item->clipType() == Image) { if (KdenliveSettings::defaultimageapp().isEmpty()) KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open images in the Settings dialog")); else QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path()); } - if (item->clipType() == AUDIO) { + if (item->clipType() == Audio) { if (KdenliveSettings::defaultaudioapp().isEmpty()) KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open audio files in the Settings dialog")); else @@ -606,7 +606,7 @@ void ProjectList::cleanup() QTreeWidgetItemIterator it(m_listView); ProjectItem *item; while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { it++; continue; } @@ -625,7 +625,7 @@ void ProjectList::trashUnusedClips() QStringList ids; QStringList urls; while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { it++; continue; } @@ -642,7 +642,7 @@ void ProjectList::trashUnusedClips() // Check that we don't use the URL in another clip QTreeWidgetItemIterator it2(m_listView); while (*it2) { - if ((*it2)->type() != PROJECTCLIPTYPE) { + if ((*it2)->type() != ProjectClipType) { it2++; continue; } @@ -670,8 +670,8 @@ void ProjectList::slotReloadClip(const QString &id) } ProjectItem *item; for (int i = 0; i < selected.count(); ++i) { - if (selected.at(i)->type() != PROJECTCLIPTYPE) { - if (selected.at(i)->type() == PROJECTFOLDERTYPE) { + if (selected.at(i)->type() != ProjectClipType) { + if (selected.at(i)->type() == ProjectFoldeType) { for (int j = 0; j < selected.at(i)->childCount(); j++) selected.append(selected.at(i)->child(j)); } @@ -684,20 +684,20 @@ void ProjectList::slotReloadClip(const QString &id) kDebug()<<"//// TRYING TO RELOAD: "<clipId()<<", but it is busy"; continue; } - CLIPTYPE t = item->clipType(); - if (t == TEXT) { + ClipType t = item->clipType(); + if (t == Text) { if (clip && !clip->getProperty("xmltemplate").isEmpty()) regenerateTemplate(item); - } else if (t != COLOR && t != SLIDESHOW && clip && clip->checkHash() == false) { + } else if (t != Color && t != SlideShow && clip && clip->checkHash() == false) { item->referencedClip()->setPlaceHolder(true); item->setProperty("file_hash", QString()); - } else if (t == IMAGE) { + } else if (t == Image) { //clip->getProducer() clip->getProducer()->set("force_reload", 1); } QDomElement e = item->toXml(); // Make sure we get the correct producer length if it was adjusted in timeline - if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { + if (t == Color || t == Image || t == SlideShow || t == Text) { int length = QString(clip->producerProperty("length")).toInt(); if (length > 0 && !e.hasAttribute("length")) { e.setAttribute("length", length); @@ -789,7 +789,7 @@ bool ProjectList::hasMissingClips() bool missing = false; QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() == PROJECTCLIPTYPE && !((*it)->flags() & Qt::ItemIsDragEnabled)) { + if ((*it)->type() == ProjectClipType && !((*it)->flags() & Qt::ItemIsDragEnabled)) { missing = true; break; } @@ -810,7 +810,7 @@ void ProjectList::slotClipSelected() QTreeWidgetItem *item = m_listView->currentItem(); ProjectItem *clip = NULL; if (item) { - if (item->type() == PROJECTFOLDERTYPE) { + if (item->type() == ProjectFoldeType) { emit clipSelected(NULL); m_editButton->defaultAction()->setEnabled(item->childCount() > 0); m_deleteButton->defaultAction()->setEnabled(true); @@ -820,7 +820,7 @@ void ProjectList::slotClipSelected() m_transcodeAction->setEnabled(false); m_clipsActionsMenu->setEnabled(false); } else { - if (item->type() == PROJECTSUBCLIPTYPE) { + if (item->type() == ProjectSubclipType) { // this is a sub item, use base clip m_deleteButton->defaultAction()->setEnabled(true); clip = static_cast (item->parent()); @@ -848,10 +848,10 @@ void ProjectList::slotClipSelected() m_extractAudioAction->setEnabled(true); m_transcodeAction->setEnabled(true); m_clipsActionsMenu->setEnabled(true); - if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { + if (clip && clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); - } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) { + } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp())); m_openAction->setEnabled(true); } else { @@ -879,7 +879,7 @@ void ProjectList::slotClipSelected() void ProjectList::adjustProxyActions(ProjectItem *clip) const { if (!m_proxyAction) return; - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW || clip->clipType() == AUDIO) { + if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow || clip->clipType() == Audio) { m_proxyAction->setEnabled(false); return; } @@ -894,7 +894,7 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const void ProjectList::adjustStabilizeActions(ProjectItem *clip) const { - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == SLIDESHOW) { + if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == SlideShow) { m_clipsActionsMenu->setEnabled(false); return; } @@ -904,7 +904,7 @@ void ProjectList::adjustStabilizeActions(ProjectItem *clip) const void ProjectList::adjustTranscodeActions(ProjectItem *clip) const { - if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { + if (clip == NULL || clip->type() != ProjectClipType || clip->clipType() == Color || clip->clipType() == Text || clip->clipType() == Playlist || clip->clipType() == SlideShow) { m_transcodeAction->setEnabled(false); m_extractAudioAction->setEnabled(false); return; @@ -961,7 +961,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap setConditionalJobStatus(NOJOB, PROXYJOB); + clip->setConditionalJobStatus(NoJob, PROXYJOB); } if (properties.contains("name")) { monitorItemEditing(false); @@ -970,7 +970,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap clipId(), properties.value("name")); } if (properties.contains("description")) { - CLIPTYPE type = clip->clipType(); + ClipType type = clip->clipType(); monitorItemEditing(false); clip->setText(1, properties.value("description")); monitorItemEditing(true); @@ -987,7 +987,7 @@ void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap type() == PROJECTSUBCLIPTYPE) { + if (item->type() == ProjectSubclipType) { // this is a sub-item if (column == 1) { // user edited description @@ -999,7 +999,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) } return; } - if (item->type() == PROJECTFOLDERTYPE) { + if (item->type() == ProjectFoldeType) { if (column == 0) { FolderProjectItem *folder = static_cast (item); if (item->text(0) == folder->groupName()) return; @@ -1023,7 +1023,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) oldprops["description"] = clip->referencedClip()->getProperty("description"); newprops["description"] = item->text(1); - if (clip->clipType() == TEXT) { + if (clip->clipType() == Text) { // This is a text template clip, update the image /*oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata")); newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());*/ @@ -1071,13 +1071,13 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) m_clipsActionsMenu->setEnabled(enable); if (enable) { ProjectItem *clip = NULL; - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { + if (m_listView->currentItem()->type() == ProjectSubclipType) { clip = static_cast (item->parent()); m_extractAudioAction->setEnabled(false); m_transcodeAction->setEnabled(false); m_clipsActionsMenu->setEnabled(false); adjustProxyActions(clip); - } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { + } else if (m_listView->currentItem()->type() == ProjectClipType) { clip = static_cast (item); // Display relevant transcoding actions only adjustTranscodeActions(clip); @@ -1090,10 +1090,10 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) m_transcodeAction->setEnabled(false); m_clipsActionsMenu->setEnabled(false); } - if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { + if (clip && clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); - } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) { + } else if (clip && clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp())); m_openAction->setEnabled(true); } else { @@ -1117,12 +1117,12 @@ void ProjectList::slotRemoveClip() QUndoCommand *delCommand = new QUndoCommand(); delCommand->setText(i18n("Delete Clip Zone")); for (int i = 0; i < selected.count(); ++i) { - if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) { + if (selected.at(i)->type() == ProjectSubclipType) { // subitem SubProjectItem *sub = static_cast (selected.at(i)); ProjectItem *item = static_cast (sub->parent()); new AddClipCutCommand(this, item->clipId(), sub->zone().x(), sub->zone().y(), sub->description(), false, true, delCommand); - } else if (selected.at(i)->type() == PROJECTFOLDERTYPE) { + } else if (selected.at(i)->type() == ProjectFoldeType) { // folder FolderProjectItem *folder = static_cast (selected.at(i)); folderids[folder->groupName()] = folder->clipId(); @@ -1161,7 +1161,7 @@ void ProjectList::updateButtons() const if (!m_listView->currentItem()) m_listView->setCurrentItem(m_listView->topLevelItem(0)); QTreeWidgetItem *item = m_listView->currentItem(); - if (item && item->type() == PROJECTCLIPTYPE) { + if (item && item->type() == ProjectClipType) { m_editButton->defaultAction()->setEnabled(true); m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); @@ -1169,7 +1169,7 @@ void ProjectList::updateButtons() const m_clipsActionsMenu->setEnabled(true); return; } - else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { + else if (item && item->type() == ProjectFoldeType && item->childCount() > 0) { m_editButton->defaultAction()->setEnabled(true); } else m_editButton->defaultAction()->setEnabled(false); @@ -1376,7 +1376,7 @@ void ProjectList::slotGotProxy(const QString &proxyPath) ProjectItem *item; while (*it && !m_closing) { - if ((*it)->type() == PROJECTCLIPTYPE) { + if ((*it)->type() == ProjectClipType) { item = static_cast (*it); if (item->referencedClip()->getProperty("proxy") == proxyPath) slotGotProxy(item); @@ -1406,8 +1406,8 @@ void ProjectList::slotGotProxy(ProjectItem *item) QDomElement e = clip->toXML().cloneNode().toElement(); // Make sure we get the correct producer length if it was adjusted in timeline - CLIPTYPE t = item->clipType(); - if (t == COLOR || t == IMAGE || t == SLIDESHOW || t == TEXT) { + ClipType t = item->clipType(); + if (t == Color || t == Image || t == SlideShow || t == Text) { int length = QString(clip->producerProperty("length")).toInt(); if (length > 0 && !e.hasAttribute("length")) { e.setAttribute("length", length); @@ -1422,7 +1422,7 @@ void ProjectList::slotResetProjectList() m_listView->blockSignals(true); m_abortAllJobs = true; for (int i = 0; i < m_jobList.count(); ++i) { - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } m_closing = true; m_jobThreads.waitForFinished(); @@ -1546,7 +1546,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons while (*it) { emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - ct++) / max)); - if ((*it)->type() == PROJECTSUBCLIPTYPE) { + if ((*it)->type() == ProjectSubclipType) { // subitem SubProjectItem *sub = static_cast (*it); if (displayRatioChanged) { @@ -1558,7 +1558,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons } ++it; continue; - } else if ((*it)->type() == PROJECTFOLDERTYPE) { + } else if ((*it)->type() == ProjectFoldeType) { // folder ++it; continue; @@ -1569,7 +1569,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, cons bool replace = false; if (brokenClips.contains(item->clipId())) { // if this is a proxy clip, disable proxy - item->setConditionalJobStatus(NOJOB, PROXYJOB); + item->setConditionalJobStatus(NoJob, PROXYJOB); discardJobs(item->clipId(), PROXYJOB); clip->setProperty("proxy", "-"); replace = true; @@ -1851,7 +1851,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; emit displayMessage(i18n("Proxy clip unusable (duration is different from original)."), -2, ErrorMessage); } - slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings"); + slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy for %1. check parameters", item->text(0)), "project_settings"); QString path = item->referencedClip()->getProperty("proxy"); KUrl proxyFolder(m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"); @@ -1973,7 +1973,7 @@ QStringList ProjectList::getGroup() const { QStringList result; QTreeWidgetItem *item = m_listView->currentItem(); - while (item && item->type() != PROJECTFOLDERTYPE) + while (item && item->type() != ProjectFoldeType) item = item->parent(); if (item) { @@ -1990,7 +1990,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) m_listView->blockSignals(true); m_abortAllJobs = true; for (int i = 0; i < m_jobList.count(); ++i) { - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } m_closing = true; m_jobThreads.waitForFinished(); @@ -2045,7 +2045,7 @@ void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img) if (!item && framePos == 0) pItem = getItemById(id); if (!item && !pItem) return; if (item) { - if (item->type() == PROJECTCLIPTYPE) static_cast(item)->setPixmap(QPixmap::fromImage(img)); + if (item->type() == ProjectClipType) static_cast(item)->setPixmap(QPixmap::fromImage(img)); else item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); } else if (pItem) pItem->setPixmap(QPixmap::fromImage(img)); @@ -2070,7 +2070,7 @@ QDomElement ProjectList::producersList() doc.appendChild(prods); QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { // subitem ++it; continue; @@ -2142,8 +2142,8 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) ProjectItem *item = NULL; bool isSubItem = false; int frame; - if (it->type() == PROJECTFOLDERTYPE) return; - if (it->type() == PROJECTSUBCLIPTYPE) { + if (it->type() == ProjectFoldeType) return; + if (it->type() == ProjectSubclipType) { item = static_cast (it->parent()); frame = static_cast (it)->zone().x(); isSubItem = true; @@ -2162,10 +2162,10 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) int height = m_listView->iconSize().height(); int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5); int dwidth = (int)(height * m_render->dar() + 0.5); - if (clip->clipType() == IMAGE) { + if (clip->clipType() == Image) { img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height); } - else if (clip->clipType() != AUDIO) { + else if (clip->clipType() != Audio) { img = item->referencedClip()->extractImage(frame, dwidth, height); } if (!img.isNull()) { @@ -2192,8 +2192,8 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) void ProjectList::extractMetadata(DocClipBase *clip) { - CLIPTYPE t = clip->clipType(); - if (t != AV && t != VIDEO) { + ClipType t = clip->clipType(); + if (t != AV && t != Video) { // Currently, we only use exiftool on video files return; } @@ -2289,27 +2289,27 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce // Proxy stuff QString size = properties.value("frame_size"); if (!useProxy() && clip->getProperty("proxy").isEmpty()) { - item->setConditionalJobStatus(NOJOB, PROXYJOB); + item->setConditionalJobStatus(NoJob, PROXYJOB); discardJobs(clipId, PROXYJOB); } if (useProxy() && generateProxy() && clip->getProperty("proxy") == "-") { - item->setConditionalJobStatus(NOJOB, PROXYJOB); + item->setConditionalJobStatus(NoJob, PROXYJOB); discardJobs(clipId, PROXYJOB); } else if (useProxy() && !item->hasProxy() && !hasPendingJob(item, PROXYJOB)) { // proxy video and image clips int maxSize; - CLIPTYPE t = item->clipType(); - if (t == IMAGE) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); + ClipType t = item->clipType(); + if (t == Image) maxSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); else maxSize = m_doc->getDocumentProperty("proxyminsize").toInt(); - if ((((t == AV || t == VIDEO || t == PLAYLIST) && generateProxy()) || (t == IMAGE && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) { + if ((((t == AV || t == Video || t == Playlist) && generateProxy()) || (t == Image && generateImageProxy())) && (size.section('x', 0, 0).toInt() > maxSize || size.section('x', 1, 1).toInt() > maxSize)) { if (clip->getProperty("proxy").isEmpty()) { KUrl proxyPath = m_doc->projectFolder(); proxyPath.addPath("proxy/"); - proxyPath.addPath(clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); + proxyPath.addPath(clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension"))); QMap newProps; // insert required duration for proxy - if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out")); + if (t != Image) newProps.insert("proxy_out", clip->producerProperty("out")); newProps.insert("proxy", proxyPath.path()); QMap oldProps = clip->properties(); oldProps.insert("proxy", QString()); @@ -2336,7 +2336,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce m_listView->setCurrentItem(item); bool updatedProfile = false; if (item->parent()) { - if (item->parent()->type() == PROJECTFOLDERTYPE) + if (item->parent()->type() == ProjectFoldeType) static_cast (item->parent())->switchIcon(); } else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) { // this is the first clip loaded in project, check if we want to adjust project settings to the clip @@ -2368,7 +2368,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) { if (item == NULL) { - if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE) + if (m_listView->currentItem() && m_listView->currentItem()->type() != ProjectFoldeType) item = static_cast (m_listView->currentItem()); } if (item == NULL || item->referencedClip() == NULL) { @@ -2383,10 +2383,10 @@ bool ProjectList::adjustProjectProfileToItem(ProjectItem *item) if (height == 1088) height = 1080; double fps = item->referencedClip()->getProperty("fps").toDouble(); double par = item->referencedClip()->getProperty("aspect_ratio").toDouble(); - if (item->clipType() == IMAGE || item->clipType() == AV || item->clipType() == VIDEO) { - if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == IMAGE, m_doc->mltProfile()) == false) { + if (item->clipType() == Image || item->clipType() == AV || item->clipType() == Video) { + if (ProfilesDialog::matchProfile(width, height, fps, par, item->clipType() == Image, m_doc->mltProfile()) == false) { // get a list of compatible profiles - QMap suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == IMAGE); + QMap suggestedProfiles = ProfilesDialog::getProfilesFromProperties(width, height, fps, par, item->clipType() == Image); if (!suggestedProfiles.isEmpty()) { KDialog *dialog = new KDialog(this); dialog->setCaption(i18n("Change project profile")); @@ -2481,7 +2481,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id) ProjectItem *result = NULL; while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { // subitem ++it; continue; @@ -2512,7 +2512,7 @@ ProjectItem *ProjectList::getItemById(const QString &id) ProjectItem *item; QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { // subitem or folder ++it; continue; @@ -2530,7 +2530,7 @@ FolderProjectItem *ProjectList::getFolderItemByName(const QString &name) FolderProjectItem *item = NULL; QList hits = m_listView->findItems(name, Qt::MatchExactly, 0); for (int i = 0; i < hits.count(); ++i) { - if (hits.at(i)->type() == PROJECTFOLDERTYPE) { + if (hits.at(i)->type() == ProjectFoldeType) { item = static_cast(hits.at(i)); break; } @@ -2543,7 +2543,7 @@ FolderProjectItem *ProjectList::getFolderItemById(const QString &id) FolderProjectItem *item; QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() == PROJECTFOLDERTYPE) { + if ((*it)->type() == ProjectFoldeType) { item = static_cast(*it); if (item->clipId() == id) return item; @@ -2565,10 +2565,10 @@ void ProjectList::slotSelectClip(const QString &ix) m_extractAudioAction->setEnabled(true); m_transcodeAction->setEnabled(true); m_clipsActionsMenu->setEnabled(true); - if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { + if (clip->clipType() == Image && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); - } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) { + } else if (clip->clipType() == Audio && !KdenliveSettings::defaultaudioapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp())); m_openAction->setEnabled(true); } else { @@ -2580,8 +2580,8 @@ void ProjectList::slotSelectClip(const QString &ix) QString ProjectList::currentClipUrl() const { ProjectItem *item; - if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return QString(); - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { + if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return QString(); + if (m_listView->currentItem()->type() == ProjectSubclipType) { // subitem item = static_cast (m_listView->currentItem()->parent()); } else { @@ -2598,15 +2598,15 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const ProjectItem *item; QList list = m_listView->selectedItems(); for (int i = 0; i < list.count(); ++i) { - if (list.at(i)->type() == PROJECTFOLDERTYPE) + if (list.at(i)->type() == ProjectFoldeType) continue; - if (list.at(i)->type() == PROJECTSUBCLIPTYPE) { + if (list.at(i)->type() == ProjectSubclipType) { // subitem item = static_cast (list.at(i)->parent()); } else { item = static_cast (list.at(i)); } - if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT) + if (item == NULL || item->type() == Color || item->type() == SlideShow || item->type() == Text) continue; DocClipBase *clip = item->referencedClip(); if (!condition.isEmpty()) { @@ -2626,15 +2626,15 @@ QMap ProjectList::getConditionalIds(const QString &condition) ProjectItem *item; QList list = m_listView->selectedItems(); for (int i = 0; i < list.count(); ++i) { - if (list.at(i)->type() == PROJECTFOLDERTYPE) + if (list.at(i)->type() == ProjectFoldeType) continue; - if (list.at(i)->type() == PROJECTSUBCLIPTYPE) { + if (list.at(i)->type() == ProjectSubclipType) { // subitem item = static_cast (list.at(i)->parent()); } else { item = static_cast (list.at(i)); } - if (item == NULL || item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT) + if (item == NULL || item->type() == Color || item->type() == SlideShow || item->type() == Text) continue; DocClipBase *clip = item->referencedClip(); if (!condition.isEmpty()) { @@ -2736,7 +2736,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone) if (clip) { for (int i = 0; i < clip->childCount(); ++i) { QTreeWidgetItem *it = clip->child(i); - if (it->type() == PROJECTSUBCLIPTYPE) { + if (it->type() == ProjectSubclipType) { sub = static_cast (it); if (sub->zone() == zone) break; @@ -2750,7 +2750,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone) void ProjectList::slotUpdateClipCut(QPoint p) { - if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE) + if (!m_listView->currentItem() || m_listView->currentItem()->type() != ProjectSubclipType) return; SubProjectItem *sub = static_cast (m_listView->currentItem()); ProjectItem *item = static_cast (sub->parent()); @@ -2824,7 +2824,7 @@ QMap ProjectList::getProxies() ProjectItem *item; QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { ++it; continue; } @@ -2846,18 +2846,18 @@ void ProjectList::slotCreateProxy(const QString &id) if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return; QString path = item->referencedClip()->getProperty("proxy"); if (path.isEmpty()) { - slotUpdateJobStatus(item, PROXYJOB, JOBCRASHED, i18n("Failed to create proxy, empty path.")); + slotUpdateJobStatus(item, PROXYJOB, JobCrashed, i18n("Failed to create proxy, empty path.")); return; } if (QFileInfo(path).size() > 0) { // Proxy already created - setJobStatus(item, PROXYJOB, JOBDONE); + setJobStatus(item, PROXYJOB, JobDone); slotGotProxy(path); return; } QString sourcePath = item->clipUrl().path(); - if (item->clipType() == PLAYLIST) { + if (item->clipType() == Playlist) { // Special case: playlists use the special 'consumer' producer to support resizing sourcePath.prepend("consumer:"); } @@ -2868,7 +2868,7 @@ void ProjectList::slotCreateProxy(const QString &id) } m_jobList.append(job); - setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage()); slotCheckJobProcess(); } @@ -2941,7 +2941,7 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) return; } m_jobList.append(job); - setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage()); slotCheckJobProcess(); } @@ -3015,7 +3015,7 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, continue; } m_jobList.append(job); - setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage()); ++i; } delete d; @@ -3039,7 +3039,7 @@ void ProjectList::slotCheckJobProcess() m_jobMutex.lock(); int count = 0; for (int i = 0; i < m_jobList.count(); ++i) { - if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING) + if (m_jobList.at(i)->status() == JobWorking || m_jobList.at(i)->status() == JobWaiting) count ++; else { // remove finished jobs @@ -3060,7 +3060,7 @@ void ProjectList::slotAbortProxy(const QString &id, const QString &path) ProjectItem *item = getItemById(id); if (!item) return; if (!item->isProxyRunning()) slotGotProxy(item); - item->setConditionalJobStatus(NOJOB, PROXYJOB); + item->setConditionalJobStatus(NoJob, PROXYJOB); discardJobs(id, PROXYJOB); } @@ -3072,14 +3072,14 @@ void ProjectList::slotProcessJobs() int count = 0; m_jobMutex.lock(); for (int i = 0; i < m_jobList.count(); ++i) { - if (m_jobList.at(i)->status() == JOBWAITING) { + if (m_jobList.at(i)->status() == JobWaiting) { if (job == NULL) { - m_jobList.at(i)->setStatus(JOBWORKING); + m_jobList.at(i)->setStatus(JobWorking); job = m_jobList.at(i); } count++; } - else if (m_jobList.at(i)->status() == JOBWORKING) + else if (m_jobList.at(i)->status() == JobWorking) count ++; } // Set jobs count @@ -3094,7 +3094,7 @@ void ProjectList::slotProcessJobs() DocClipBase *currentClip = m_doc->clipManager()->getClipById(job->clipId()); //ProjectItem *processingItem = getItemById(job->clipId()); if (currentClip == NULL) { - job->setStatus(JOBDONE); + job->setStatus(JobDone); continue; } // Set clip status to started @@ -3104,8 +3104,8 @@ void ProjectList::slotProcessJobs() if (!destination.isEmpty()) { QFile file(destination); if (!file.open(QIODevice::WriteOnly)) { - emit updateJobStatus(job->clipId(), job->jobType, JOBCRASHED, i18n("Cannot write to path: %1", destination)); - job->setStatus(JOBCRASHED); + emit updateJobStatus(job->clipId(), job->jobType, JobCrashed, i18n("Cannot write to path: %1", destination)); + job->setStatus(JobCrashed); continue; } file.close(); @@ -3123,14 +3123,14 @@ void ProjectList::slotProcessJobs() connect(job, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int,int,stringMap,stringMap))); } job->startJob(); - if (job->status() == JOBDONE) { - emit updateJobStatus(job->clipId(), job->jobType, JOBDONE); + if (job->status() == JobDone) { + emit updateJobStatus(job->clipId(), job->jobType, JobDone); //TODO: replace with more generic clip replacement framework if (job->jobType == PROXYJOB) emit gotProxy(job->clipId()); if (job->addClipToProject()) { emit addClip(destination, QString(), QString()); } - } else if (job->status() == JOBCRASHED || job->status() == JOBABORTED) { + } else if (job->status() == JobCrashed || job->status() == JobAborted) { emit updateJobStatus(job->clipId(), job->jobType, job->status(), job->errorMessage(), QString(), job->logDetails()); } } @@ -3147,7 +3147,7 @@ void ProjectList::updateProxyConfig() command->setText(i18n("Update proxy settings")); QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; while (*it) { - if ((*it)->type() != PROJECTCLIPTYPE) { + if ((*it)->type() != ProjectClipType) { ++it; continue; } @@ -3156,8 +3156,8 @@ void ProjectList::updateProxyConfig() ++it; continue; } - CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN) && item->referencedClip() != NULL) { + ClipType t = item->clipType(); + if ((t == Video || t == AV || t == Unknown) && item->referencedClip() != NULL) { if (generateProxy() && useProxy() && !hasPendingJob(item, PROXYJOB)) { DocClipBase *clip = item->referencedClip(); if (clip->getProperty("frame_size").section('x', 0, 0).toInt() > m_doc->getDocumentProperty("proxyminsize").toInt()) { @@ -3180,7 +3180,7 @@ void ProjectList::updateProxyConfig() new EditClipCommand(this, item->clipId(), item->referencedClip()->currentProperties(newProps), newProps, true, command); } } - else if (t == IMAGE && item->referencedClip() != NULL) { + else if (t == Image && item->referencedClip() != NULL) { if (generateImageProxy() && useProxy()) { DocClipBase *clip = item->referencedClip(); int maxImageSize = m_doc->getDocumentProperty("proxyimageminsize").toInt(); @@ -3211,7 +3211,7 @@ void ProjectList::updateProxyConfig() void ProjectList::slotProcessLog(const QString &id, int progress, int type, const QString &message) { ProjectItem *item = getItemById(id); - setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message); + setJobStatus(item, (JOBTYPE) type, JobWorking, progress, message); } void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) @@ -3225,21 +3225,21 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) QList clipList; for (int i = 0; i < list.count(); ++i) { listItem = list.at(i); - if (listItem->type() == PROJECTFOLDERTYPE) { + if (listItem->type() == ProjectFoldeType) { for (int j = 0; j < listItem->childCount(); j++) { QTreeWidgetItem *sub = listItem->child(j); - if (sub->type() == PROJECTCLIPTYPE) { + if (sub->type() == ProjectClipType) { ProjectItem *item = static_cast (sub); if (!clipList.contains(item)) clipList.append(item); } } } - else if (listItem->type() == PROJECTSUBCLIPTYPE) { + else if (listItem->type() == ProjectSubclipType) { QTreeWidgetItem *sub = listItem->parent(); ProjectItem *item = static_cast (sub); if (!clipList.contains(item)) clipList.append(item); } - else if (listItem->type() == PROJECTCLIPTYPE) { + else if (listItem->type() == ProjectClipType) { ProjectItem *item = static_cast (listItem); if (!clipList.contains(item)) clipList.append(item); } @@ -3258,8 +3258,8 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) if (!doProxy) newProps.insert("proxy", "-"); for (int i = 0; i < clipList.count(); ++i) { ProjectItem *item = clipList.at(i); - CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { + ClipType t = item->clipType(); + if ((t == Video || t == AV || t == Unknown || t == Image || t == Playlist) && item->referencedClip()) { if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy() && item->referencedClip()->getProducer() != NULL)) continue; DocClipBase *clip = item->referencedClip(); if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { @@ -3270,7 +3270,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) //oldProps = clip->properties(); if (doProxy) { newProps.clear(); - QString path = proxydir + clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + QString path = proxydir + clip->getClipHash() + '.' + (t == Image ? "png" : m_doc->getDocumentProperty("proxyextension")); // insert required duration for proxy newProps.insert("proxy_out", clip->producerProperty("out")); newProps.insert("proxy", path); @@ -3303,7 +3303,7 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) QTreeWidgetItemIterator it(m_listView); ProjectItem *item; while (*it) { - if ((*it)->type() == PROJECTCLIPTYPE) { + if ((*it)->type() == ProjectClipType) { item = static_cast (*it); if (item->referencedClip()->getProperty("proxy") == proxyPath) { QMap props; @@ -3321,12 +3321,12 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) QFile::remove(proxyPath); } -void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS status, int progress, const QString &statusMessage) +void ProjectList::setJobStatus(ProjectItem *item, JOBTYPE jobType, ClipJobStatus status, int progress, const QString &statusMessage) { if (item == NULL || (m_abortAllJobs && m_closing)) return; monitorItemEditing(false); item->setJobStatus(jobType, status, progress, statusMessage); - if (status == JOBCRASHED) { + if (status == JobCrashed) { DocClipBase *clip = item->referencedClip(); if (!clip) { kDebug()<<"// PROXY CRASHED"; @@ -3357,7 +3357,7 @@ QStringList ProjectList::expandedFolders() const FolderProjectItem *item; QTreeWidgetItemIterator it(m_listView); while (*it) { - if ((*it)->type() != PROJECTFOLDERTYPE) { + if ((*it)->type() != ProjectFoldeType) { ++it; continue; } @@ -3389,7 +3389,7 @@ void ProjectList::slotCancelJobs() { m_abortAllJobs = true; for (int i = 0; i < m_jobList.count(); ++i) { - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } m_jobThreads.waitForFinished(); m_jobThreads.clearFutures(); @@ -3435,7 +3435,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) for (int i = 0; i < m_jobList.count(); ++i) { if (m_abortAllJobs) break; job = m_jobList.at(i); - if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JOBWAITING || job->status() == JOBWORKING)) return true; + if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JobWaiting || job->status() == JobWorking)) return true; } return false; @@ -3446,7 +3446,7 @@ void ProjectList::deleteJobsForClip(const QString &clipId) QMutexLocker lock(&m_jobMutex); for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->clipId() == clipId) { - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } } } @@ -3461,8 +3461,8 @@ void ProjectList::slotUpdateJobStatus(const QString id, int type, int status, co void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName, const QString details) { - item->setJobStatus((JOBTYPE) type, (CLIPJOBSTATUS) status); - if (status != JOBCRASHED) return; + item->setJobStatus((JOBTYPE) type, (ClipJobStatus) status); + if (status != JobCrashed) return; #if KDE_IS_VERSION(4,7,0) QList actions = m_infoMessage->actions(); if (m_infoMessage->isHidden()) { @@ -3527,7 +3527,7 @@ QStringList ProjectList::getPendingJobs(const QString &id) QStringList result; QMutexLocker lock(&m_jobMutex); for (int i = 0; i < m_jobList.count(); ++i) { - if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JOBWAITING || m_jobList.at(i)->status() == JOBWORKING)) { + if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JobWaiting || m_jobList.at(i)->status() == JobWorking)) { // discard this job result << m_jobList.at(i)->description; } @@ -3540,7 +3540,7 @@ void ProjectList::discardJobs(const QString &id, JOBTYPE type) { for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) { // discard this job - m_jobList.at(i)->setStatus(JOBABORTED); + m_jobList.at(i)->setStatus(JobAborted); } } } @@ -3559,7 +3559,7 @@ void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QStr } job->description = i18n("Filter %1", extraParams.value("finalfilter")); m_jobList.append(job); - setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage()); slotCheckJobProcess(); } @@ -3729,7 +3729,7 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo } job->description = description; m_jobList.append(job); - setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage()); + setJobStatus(item, job->jobType, JobWaiting, 0, job->statusMessage()); slotCheckJobProcess(); } } @@ -3738,9 +3738,9 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo void ProjectList::slotPrepareJobsMenu() { ProjectItem *item; - if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) + if (!m_listView->currentItem() || m_listView->currentItem()->type() == ProjectFoldeType) return; - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) + if (m_listView->currentItem()->type() == ProjectSubclipType) item = static_cast (m_listView->currentItem()->parent()); else item = static_cast (m_listView->currentItem()); diff --git a/src/projectlist.h b/src/projectlist.h index ca6a1026..4cb49734 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -307,7 +307,7 @@ private: * @param status The job status (see definitions.h) * @param progress The job progress (in percents) * @param statusMessage The job info message */ - void setJobStatus(ProjectItem *item, JOBTYPE jobType, CLIPJOBSTATUS status, int progress = 0, const QString &statusMessage = QString()); + void setJobStatus(ProjectItem *item, JOBTYPE jobType, ClipJobStatus status, int progress = 0, const QString &statusMessage = QString()); void monitorItemEditing(bool enable); /** @brief Get cached thumbnail for a project's clip or create it if no cache. */ void getCachedThumbnail(ProjectItem *item); diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index af26e4ca..af4f9bc2 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -154,7 +154,7 @@ void ProjectListView::contextMenuEvent(QContextMenuEvent * event) void ProjectListView::slotCollapsed(QTreeWidgetItem *item) { - if (item->type() == PROJECTFOLDERTYPE) { + if (item->type() == ProjectFoldeType) { blockSignals(true); static_cast (item)->switchIcon(); blockSignals(false); @@ -163,7 +163,7 @@ void ProjectListView::slotCollapsed(QTreeWidgetItem *item) void ProjectListView::slotExpanded(QTreeWidgetItem *item) { - if (item->type() == PROJECTFOLDERTYPE) { + if (item->type() == ProjectFoldeType) { blockSignals(true); static_cast (item)->switchIcon(); blockSignals(false); @@ -201,7 +201,7 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event) return; } ProjectItem *item; - if (it->type() == PROJECTFOLDERTYPE) { + if (it->type() == ProjectFoldeType) { if ((columnAt(event->pos().x()) == 0)) { QPixmap pix = qVariantValue(it->data(0, Qt::DecorationRole)); int offset = pix.width() + indentation(); @@ -212,7 +212,7 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event) } return; } - if (it->type() == PROJECTSUBCLIPTYPE) { + if (it->type() == ProjectSubclipType) { // subitem if ((columnAt(event->pos().x()) == 1)) { QTreeWidget::mouseDoubleClickEvent(event); @@ -224,7 +224,7 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event) if (!(item->flags() & Qt::ItemIsDragEnabled)) return; int column = columnAt(event->pos().x()); - if (column == 0 && (item->clipType() == SLIDESHOW || item->clipType() == TEXT || item->clipType() == COLOR || it->childCount() > 0)) { + if (column == 0 && (item->clipType() == SlideShow || item->clipType() == Text || item->clipType() == Color || it->childCount() > 0)) { QPixmap pix = qVariantValue(it->data(0, Qt::DecorationRole)); int offset = pix.width() + indentation(); if (item->parent()) offset += indentation(); @@ -239,7 +239,7 @@ void ProjectListView::mouseDoubleClickEvent(QMouseEvent * event) return; } } - if ((column == 1) && it->type() != PROJECTSUBCLIPTYPE) { + if ((column == 1) && it->type() != ProjectSubclipType) { QTreeWidget::mouseDoubleClickEvent(event); return; } @@ -252,7 +252,7 @@ void ProjectListView::dropEvent(QDropEvent *event) { FolderProjectItem *item = NULL; QTreeWidgetItem *it = itemAt(event->pos()); - while (it && it->type() != PROJECTFOLDERTYPE) { + while (it && it->type() != ProjectFoldeType) { it = it->parent(); } if (it) item = static_cast (it); @@ -276,7 +276,7 @@ void ProjectListView::dropEvent(QDropEvent *event) QString parentId = item->clipId(); foreach(QTreeWidgetItem *it, list) { // TODO allow dragging of folders ? - if (it->type() == PROJECTCLIPTYPE) { + if (it->type() == ProjectClipType) { if (it->parent()) clone = (ProjectItem*) it->parent()->takeChild(it->parent()->indexOfChild(it)); else clone = (ProjectItem*) takeTopLevelItem(indexOfTopLevelItem(it)); if (clone && item) { @@ -293,7 +293,7 @@ void ProjectListView::dropEvent(QDropEvent *event) const QList list = selectedItems(); ProjectItem *clone; foreach(QTreeWidgetItem *it, list) { - if (it->type() != PROJECTCLIPTYPE) continue; + if (it->type() != ProjectClipType) continue; QTreeWidgetItem *parent = it->parent(); if (parent/* && ((ProjectItem *) it)->clipId() < 10000*/) { kDebug() << "++ item parent: " << parent->text(1); @@ -366,12 +366,12 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) const QList list = selectedItems(); QStringList ids; foreach(const QTreeWidgetItem *item, list) { - if (item->type() == PROJECTFOLDERTYPE) { + if (item->type() == ProjectFoldeType) { const int children = item->childCount(); for (int i = 0; i < children; ++i) { ids.append(static_cast (item->child(i))->clipId()); } - } else if (item->type() == PROJECTSUBCLIPTYPE) { + } else if (item->type() == ProjectSubclipType) { const ProjectItem *parentclip = static_cast (item->parent()); const SubProjectItem *clickItem = static_cast (item); QPoint p = clickItem->zone(); @@ -461,8 +461,8 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, QRectF bounding; painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); int jobProgress = index.data(Qt::UserRole + 5).toInt(); - if (jobProgress != 0 && jobProgress != JOBDONE && jobProgress != JOBABORTED) { - if (jobProgress != JOBCRASHED) { + if (jobProgress != 0 && jobProgress != JobDone && jobProgress != JobAborted) { + if (jobProgress != JobCrashed) { // Draw job progress bar QColor color = option.palette.alternateBase().color(); color.setAlpha(150); @@ -472,7 +472,7 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, painter->drawRect(progress); painter->setBrush(option.palette.link()); progress.adjust(2, 2, -2, -2); - if (jobProgress == JOBWAITING) { + if (jobProgress == JobWaiting) { progress.setLeft(progress.right() - 2); painter->drawRect(progress); progress.moveLeft(progress.left() - 5); @@ -482,7 +482,7 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, progress.setWidth(progress.width() * jobProgress / 100); painter->drawRect(progress); } - } else if (jobProgress == JOBCRASHED) { + } else if (jobProgress == JobCrashed) { QString jobText = index.data(Qt::UserRole + 7).toString(); if (!jobText.isEmpty()) { QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, QLatin1Char(' ') + jobText + QLatin1Char(' ') ); diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index a844bf58..848a0718 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -206,7 +206,7 @@ void ProjectSettings::slotDeleteUnused() QList list = m_projectList->documentClipList(); for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); - if (clip->numReferences() == 0 && clip->clipType() != SLIDESHOW) { + if (clip->numReferences() == 0 && clip->clipType() != SlideShow) { KUrl url = clip->fileURL(); if (!url.isEmpty() && !toDelete.contains(url.path())) toDelete << url.path(); } @@ -308,7 +308,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); - if (clip->clipType() == SLIDESHOW) { + if (clip->clipType() == SlideShow) { QStringList subfiles = extractSlideshowUrls(clip->fileURL()); foreach(const QString & file, subfiles) { count++; @@ -317,19 +317,19 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) } else if (!clip->fileURL().isEmpty()) { //allFiles.append(clip->fileURL().path()); switch (clip->clipType()) { - case TEXT: + case Text: new QTreeWidgetItem(texts, QStringList() << clip->fileURL().path()); break; - case AUDIO: + case Audio: new QTreeWidgetItem(sounds, QStringList() << clip->fileURL().path()); break; - case IMAGE: + case Image: new QTreeWidgetItem(images, QStringList() << clip->fileURL().path()); break; - case PLAYLIST: + case Playlist: new QTreeWidgetItem(playlists, QStringList() << clip->fileURL().path()); break; - case UNKNOWN: + case Unknown: new QTreeWidgetItem(others, QStringList() << clip->fileURL().path()); break; default: @@ -338,7 +338,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) } count++; } - if (clip->clipType() == TEXT) { + if (clip->clipType() == Text) { QStringList imagefiles = TitleWidget::extractImageList(clip->getProperty("xmldata")); QStringList fonts = TitleWidget::extractFontList(clip->getProperty("xmldata")); foreach(const QString & file, imagefiles) { @@ -346,7 +346,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) new QTreeWidgetItem(images, QStringList() << file); } allFonts << fonts; - } else if (clip->clipType() == PLAYLIST) { + } else if (clip->clipType() == Playlist) { QStringList files = extractPlaylistUrls(clip->fileURL().path()); foreach(const QString & file, files) { count++; diff --git a/src/projecttree/abstractclipjob.cpp b/src/projecttree/abstractclipjob.cpp index 1956430a..82c8dd25 100644 --- a/src/projecttree/abstractclipjob.cpp +++ b/src/projecttree/abstractclipjob.cpp @@ -26,12 +26,12 @@ #include -AbstractClipJob::AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, const QStringList &) : +AbstractClipJob::AbstractClipJob(JOBTYPE type, ClipType cType, const QString &id, const QStringList &) : QObject(), clipType(cType), jobType(type), replaceClip(false), - m_jobStatus(NOJOB), + m_jobStatus(NoJob), m_clipId(id), m_addClipToProject(false), m_jobProcess(NULL) @@ -53,12 +53,12 @@ void AbstractClipJob::setAddClipToProject(bool add) m_addClipToProject = add; } -void AbstractClipJob::setStatus(CLIPJOBSTATUS status) +void AbstractClipJob::setStatus(ClipJobStatus status) { m_jobStatus = status; } -CLIPJOBSTATUS AbstractClipJob::status() +ClipJobStatus AbstractClipJob::status() { return m_jobStatus; } diff --git a/src/projecttree/abstractclipjob.h b/src/projecttree/abstractclipjob.h index d85fa4ed..553b36ad 100644 --- a/src/projecttree/abstractclipjob.h +++ b/src/projecttree/abstractclipjob.h @@ -33,16 +33,16 @@ class AbstractClipJob : public QObject Q_OBJECT public: - AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, const QStringList ¶meters); virtual ~ AbstractClipJob(); - CLIPTYPE clipType; + AbstractClipJob(JOBTYPE type, ClipType cType, const QString &id, const QStringList ¶meters); virtual ~ AbstractClipJob(); + ClipType clipType; JOBTYPE jobType; QString description; bool replaceClip; const QString clipId() const; const QString errorMessage() const; const QString logDetails() const; - CLIPJOBSTATUS status(); - virtual void setStatus(CLIPJOBSTATUS status); + ClipJobStatus status(); + virtual void setStatus(ClipJobStatus status); virtual const QString destination() const; virtual void startJob(); virtual stringMap cancelProperties(); @@ -54,7 +54,7 @@ public: void setAddClipToProject(bool add); protected: - CLIPJOBSTATUS m_jobStatus; + ClipJobStatus m_jobStatus; QString m_clipId; QString m_errorMessage; QString m_logDetails; diff --git a/src/projecttree/cutclipjob.cpp b/src/projecttree/cutclipjob.cpp index 26ff2bba..a5ed89f9 100644 --- a/src/projecttree/cutclipjob.cpp +++ b/src/projecttree/cutclipjob.cpp @@ -25,9 +25,9 @@ #include #include -CutClipJob::CutClipJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters) : AbstractClipJob(CUTJOB, cType, id, parameters) +CutClipJob::CutClipJob(ClipType cType, const QString &id, const QStringList ¶meters) : AbstractClipJob(CUTJOB, cType, id, parameters) { - m_jobStatus = JOBWAITING; + m_jobStatus = JobWaiting; m_dest = parameters.at(0); m_src = parameters.at(1); m_start = parameters.at(2); @@ -47,7 +47,7 @@ CutClipJob::CutClipJob(CLIPTYPE cType, const QString &id, const QStringList &par void CutClipJob::startJob() { // Special case: playlist clips (.mlt or .kdenlive project files) - if (clipType == AV || clipType == AUDIO || clipType == VIDEO) { + if (clipType == AV || clipType == Audio || clipType == Video) { QStringList parameters; parameters << "-i" << m_src; if (!m_start.isEmpty()) @@ -66,7 +66,7 @@ void CutClipJob::startJob() m_jobProcess->waitForStarted(); while (m_jobProcess->state() != QProcess::NotRunning) { processLogInfo(); - if (m_jobStatus == JOBABORTED) { + if (m_jobStatus == JobAborted) { m_jobProcess->close(); m_jobProcess->waitForFinished(); QFile::remove(m_dest); @@ -74,21 +74,21 @@ void CutClipJob::startJob() m_jobProcess->waitForFinished(400); } - if (m_jobStatus != JOBABORTED) { + if (m_jobStatus != JobAborted) { int result = m_jobProcess->exitStatus(); if (result == QProcess::NormalExit) { if (QFileInfo(m_dest).size() == 0) { // File was not created processLogInfo(); m_errorMessage.append(i18n("Failed to create file.")); - setStatus(JOBCRASHED); + setStatus(JobCrashed); } else { - setStatus(JOBDONE); + setStatus(JobDone); } } else if (result == QProcess::CrashExit) { // Proxy process crashed QFile::remove(m_dest); - setStatus(JOBCRASHED); + setStatus(JobCrashed); } } delete m_jobProcess; @@ -96,13 +96,13 @@ void CutClipJob::startJob() } else { m_errorMessage = i18n("Cannot process this clip type."); } - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } void CutClipJob::processLogInfo() { - if (!m_jobProcess || m_jobDuration == 0 || m_jobStatus == JOBABORTED) return; + if (!m_jobProcess || m_jobDuration == 0 || m_jobStatus == JobAborted) return; QString log = m_jobProcess->readAll(); if (!log.isEmpty()) m_logDetails.append(log + '\n'); int progress; @@ -141,11 +141,11 @@ const QString CutClipJob::statusMessage() { QString statusInfo; switch (m_jobStatus) { - case JOBWORKING: + case JobWorking: if (m_start.isEmpty()) statusInfo = i18n("Transcoding clip"); else statusInfo = i18n("Extracting clip cut"); break; - case JOBWAITING: + case JobWaiting: if (m_start.isEmpty()) statusInfo = i18n("Waiting - transcode clip"); else statusInfo = i18n("Waiting - cut clip"); break; diff --git a/src/projecttree/cutclipjob.h b/src/projecttree/cutclipjob.h index 7a51b1e6..448c1d7d 100644 --- a/src/projecttree/cutclipjob.h +++ b/src/projecttree/cutclipjob.h @@ -31,7 +31,7 @@ class CutClipJob : public AbstractClipJob Q_OBJECT public: - CutClipJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters); + CutClipJob(ClipType cType, const QString &id, const QStringList ¶meters); virtual ~ CutClipJob(); const QString destination() const; void startJob(); diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp index 294ff94f..2cc76586 100644 --- a/src/projecttree/meltjob.cpp +++ b/src/projecttree/meltjob.cpp @@ -35,7 +35,7 @@ static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame frame_ self->emitFrameNumber((int) frame.get_position()); } -MeltJob::MeltJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters, const QMap &extraParams) +MeltJob::MeltJob(ClipType cType, const QString &id, const QStringList ¶meters, const QMap &extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters), addClipToProject(0), m_consumer(NULL), @@ -46,7 +46,7 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, const QStringList ¶meter m_length(0), m_extra(extraParams) { - m_jobStatus = JOBWAITING; + m_jobStatus = JobWaiting; m_params = parameters; description = i18n("Process clip"); QString consum = m_params.at(5); @@ -64,7 +64,7 @@ void MeltJob::startJob() { if (m_url.isEmpty()) { m_errorMessage.append(i18n("No producer for this clip.")); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } int in = m_params.takeFirst().toInt(); @@ -86,7 +86,7 @@ void MeltJob::startJob() if (out != -1 && out <= in) { m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out)); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } if (m_extra.contains("producer_profile")) { @@ -113,7 +113,7 @@ void MeltJob::startJob() if (!m_producer || !m_producer->is_valid()) { // Clip was removed or something went wrong, Notify user? //m_errorMessage.append(i18n("Invalid clip")); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } if (m_extra.contains("producer_profile")) { @@ -134,7 +134,7 @@ void MeltJob::startJob() } if (!m_consumer || !m_consumer->is_valid()) { m_errorMessage.append(i18n("Cannot create consumer %1.", consumer)); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } @@ -154,7 +154,7 @@ void MeltJob::startJob() m_filter = new Mlt::Filter(*m_profile, filter.toUtf8().data()); if (!m_filter || !m_filter->is_valid()) { m_errorMessage = i18n("Filter %1 crashed", filter); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } list = filterParams.split(' ', QString::SkipEmptyParts); @@ -177,14 +177,14 @@ void MeltJob::startJob() m_consumer->run(); QMap jobResults; - if (m_jobStatus != JOBABORTED && m_extra.contains("key")) { + if (m_jobStatus != JobAborted && m_extra.contains("key")) { QString result = m_filter->get(m_extra.value("key").toUtf8().constData()); jobResults.insert(m_extra.value("key"), result); } - if (!jobResults.isEmpty() && m_jobStatus != JOBABORTED) { + if (!jobResults.isEmpty() && m_jobStatus != JobAborted) { emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra); } - if (m_jobStatus == JOBABORTED || m_jobStatus == JOBWORKING) m_jobStatus = JOBDONE; + if (m_jobStatus == JobAborted || m_jobStatus == JobWorking) m_jobStatus = JobDone; } @@ -212,10 +212,10 @@ const QString MeltJob::statusMessage() { QString statusInfo; switch (m_jobStatus) { - case JOBWORKING: + case JobWorking: statusInfo = description; break; - case JOBWAITING: + case JobWaiting: statusInfo = i18n("Waiting to process clip"); break; default: @@ -236,10 +236,10 @@ bool MeltJob::isProjectFilter() const return m_extra.contains("projecttreefilter"); } -void MeltJob::setStatus(CLIPJOBSTATUS status) +void MeltJob::setStatus(ClipJobStatus status) { m_jobStatus = status; - if (status == JOBABORTED && m_consumer) m_consumer->stop(); + if (status == JobAborted && m_consumer) m_consumer->stop(); } diff --git a/src/projecttree/meltjob.h b/src/projecttree/meltjob.h index 9349f3cf..b1a42686 100644 --- a/src/projecttree/meltjob.h +++ b/src/projecttree/meltjob.h @@ -40,14 +40,14 @@ class MeltJob : public AbstractClipJob Q_OBJECT public: - MeltJob(CLIPTYPE cType, const QString &id, const QStringList& parameters, const stringMap& extraParams = stringMap()); + MeltJob(ClipType cType, const QString &id, const QStringList& parameters, const stringMap& extraParams = stringMap()); virtual ~ MeltJob(); const QString destination() const; void startJob(); stringMap cancelProperties(); bool addClipToProject; const QString statusMessage(); - void setStatus(CLIPJOBSTATUS status); + void setStatus(ClipJobStatus status); void setProducer(Mlt::Producer *producer, const KUrl &url); void emitFrameNumber(int pos); /** Make the job work on a project tree clip. */ diff --git a/src/projecttree/proxyclipjob.cpp b/src/projecttree/proxyclipjob.cpp index ca565051..e9d1ceb5 100644 --- a/src/projecttree/proxyclipjob.cpp +++ b/src/projecttree/proxyclipjob.cpp @@ -27,12 +27,12 @@ #include #include -ProxyJob::ProxyJob(CLIPTYPE cType, const QString &id, const QStringList& parameters) +ProxyJob::ProxyJob(ClipType cType, const QString &id, const QStringList& parameters) : AbstractClipJob(PROXYJOB, cType, id, parameters), m_jobDuration(0), m_isFfmpegJob(true) { - m_jobStatus = JOBWAITING; + m_jobStatus = JobWaiting; description = i18n("proxy"); m_dest = parameters.at(0); m_src = parameters.at(1); @@ -47,7 +47,7 @@ void ProxyJob::startJob() { // Special case: playlist clips (.mlt or .kdenlive project files) m_jobDuration = 0; - if (clipType == PLAYLIST) { + if (clipType == Playlist) { // change FFmpeg params to MLT format m_isFfmpegJob = false; QStringList mltParameters; @@ -80,13 +80,13 @@ void ProxyJob::startJob() m_jobProcess->start(KdenliveSettings::rendererpath(), mltParameters); m_jobProcess->waitForStarted(); } - else if (clipType == IMAGE) { + else if (clipType == Image) { m_isFfmpegJob = false; // Image proxy QImage i(m_src); if (i.isNull()) { m_errorMessage.append(i18n("Cannot load image %1.", m_src)); - setStatus(JOBCRASHED); + setStatus(JobCrashed); return; } @@ -130,7 +130,7 @@ void ProxyJob::startJob() } else { proxy.save(m_dest); } - setStatus(JOBDONE); + setStatus(JobDone); return; } else { m_isFfmpegJob = true; @@ -150,7 +150,7 @@ void ProxyJob::startJob() } while (m_jobProcess->state() != QProcess::NotRunning) { processLogInfo(); - if (m_jobStatus == JOBABORTED) { + if (m_jobStatus == JobAborted) { emit cancelRunningJob(m_clipId, cancelProperties()); m_jobProcess->close(); m_jobProcess->waitForFinished(); @@ -159,21 +159,21 @@ void ProxyJob::startJob() m_jobProcess->waitForFinished(400); } - if (m_jobStatus != JOBABORTED) { + if (m_jobStatus != JobAborted) { int result = m_jobProcess->exitStatus(); if (result == QProcess::NormalExit) { if (QFileInfo(m_dest).size() == 0) { // File was not created processLogInfo(); m_errorMessage.append(i18n("Failed to create proxy clip.")); - setStatus(JOBCRASHED); + setStatus(JobCrashed); } - else setStatus(JOBDONE); + else setStatus(JobDone); } else if (result == QProcess::CrashExit) { // Proxy process crashed QFile::remove(m_dest); - setStatus(JOBCRASHED); + setStatus(JobCrashed); } } @@ -183,7 +183,7 @@ void ProxyJob::startJob() void ProxyJob::processLogInfo() { - if (!m_jobProcess || m_jobStatus == JOBABORTED) return; + if (!m_jobProcess || m_jobStatus == JobAborted) return; QString log = m_jobProcess->readAll(); if (!log.isEmpty()) m_logDetails.append(log + '\n'); @@ -239,10 +239,10 @@ const QString ProxyJob::statusMessage() { QString statusInfo; switch (m_jobStatus) { - case JOBWORKING: + case JobWorking: statusInfo = i18n("Creating proxy"); break; - case JOBWAITING: + case JobWaiting: statusInfo = i18n("Waiting - proxy"); break; default: diff --git a/src/projecttree/proxyclipjob.h b/src/projecttree/proxyclipjob.h index d35f2bdb..d56a3b90 100644 --- a/src/projecttree/proxyclipjob.h +++ b/src/projecttree/proxyclipjob.h @@ -30,7 +30,7 @@ class ProxyJob : public AbstractClipJob Q_OBJECT public: - ProxyJob(CLIPTYPE cType, const QString &id, const QStringList& parameters); + ProxyJob(ClipType cType, const QString &id, const QStringList& parameters); virtual ~ ProxyJob(); const QString destination() const; void startJob(); diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 72899913..e66a8f15 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -45,7 +45,7 @@ #include -RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent) : +RecMonitor::RecMonitor(Kdenlive::MonitorId name, MonitorManager *manager, QWidget *parent) : AbstractMonitor(name, manager, parent), m_isCapturing(false), m_didCapture(false), diff --git a/src/recmonitor.h b/src/recmonitor.h index b5d767a5..72e3ce45 100644 --- a/src/recmonitor.h +++ b/src/recmonitor.h @@ -56,7 +56,7 @@ class RecMonitor : public AbstractMonitor, public Ui::RecMonitor_UI Q_OBJECT public: - explicit RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent = 0); + explicit RecMonitor(Kdenlive::MonitorId name, MonitorManager *manager, QWidget *parent = 0); ~RecMonitor(); AbstractRender *abstractRender(); diff --git a/src/renderer.cpp b/src/renderer.cpp index 87c03c48..13bf0020 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -111,7 +111,7 @@ void Render::consumer_gl_frame_show(mlt_consumer consumer, Render * self, mlt_fr emit self->mltFrameReceived(new Mlt::Frame(frame_ptr)); } -Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) : +Render::Render(Kdenlive::MonitorId rendererName, int winid, QString profile, QWidget *parent) : AbstractRender(rendererName, parent), requestedSeekPosition(SEEK_INACTIVE), showFrameSemaphore(1), @@ -227,7 +227,7 @@ void Render::buildConsumer(const QString &profileName) m_blackClip = new Mlt::Producer(*m_mltProfile, "colour:black"); m_blackClip->set("id", "black"); m_blackClip->set("mlt_type", "producer"); - if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor && m_winid != 0) { + if (KdenliveSettings::external_display() && m_name != Kdenlive::ClipMonitor && m_winid != 0) { // Use blackmagic card for video output int device = KdenliveSettings::blackmagic_output_device(); if (device >= 0) { @@ -267,7 +267,7 @@ void Render::buildConsumer(const QString &profileName) if (m_winid == 0) { // OpenGL monitor if (!m_mltConsumer) { - if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor) { + if (KdenliveSettings::external_display() && m_name != Kdenlive::ClipMonitor) { int device = KdenliveSettings::blackmagic_output_device(); if (device >= 0) { QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); @@ -731,10 +731,10 @@ void Render::processFileProperties() } KUrl url(path); Mlt::Producer *producer = NULL; - CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt(); - if (type == COLOR) { + ClipType type = (ClipType)info.xml.attribute("type").toInt(); + if (type == Color) { producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + info.xml.attribute("colour")).toUtf8().constData()); - } else if (type == TEXT) { + } else if (type == Text) { producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + info.xml.attribute("resource")).toUtf8().constData()); if (producer && producer->is_valid() && info.xml.hasAttribute("xmldata")) producer->set("xmldata", info.xml.attribute("xmldata").toUtf8().constData()); @@ -837,7 +837,7 @@ void Render::processFileProperties() if (info.xml.hasAttribute("out")) clipOut = info.xml.attribute("out").toInt(); // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger - if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) { + if (type == Color || type == Text || type == Image || type == SlideShow) { int length; if (info.xml.hasAttribute("length")) { length = info.xml.attribute("length").toInt(); @@ -892,7 +892,7 @@ void Render::processFileProperties() filePropertyMap["duration"] = QString::number(duration); //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime(); - if (type == SLIDESHOW) { + if (type == SlideShow) { int ttl = info.xml.hasAttribute("ttl") ? info.xml.attribute("ttl").toInt() : 0; if (ttl) producer->set("ttl", ttl); if (!info.xml.attribute("animation").isEmpty()) { @@ -1459,7 +1459,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); - if (m_name == Kdenlive::clipMonitor) { + if (m_name == Kdenlive::ClipMonitor) { Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y()); Mlt::Playlist list; list.insert_at(0, prod, 0); @@ -1632,7 +1632,7 @@ void Render::switchPlay(bool play) return; if (m_isZoneMode) resetZoneMode(); if (play && m_paused) { - if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); + if (m_name == Kdenlive::ClipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); m_paused = false; m_mltProducer->set_speed(1.0); if (m_mltConsumer->is_stopped()) { diff --git a/src/renderer.h b/src/renderer.h index e6548d76..8b7d1b5a 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -109,7 +109,7 @@ class Render: public AbstractRender * @param rendererName A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - Render(Kdenlive::MONITORID rendererName, int winid, QString profile = QString(), QWidget *parent = 0); + Render(Kdenlive::MonitorId rendererName, int winid, QString profile = QString(), QWidget *parent = 0); /** @brief Destroy the MLT Renderer. */ virtual ~Render(); @@ -363,7 +363,7 @@ private: * * Useful to identify the renderers by what they do - e.g. background * rendering, workspace monitor, etc. */ - Kdenlive::MONITORID m_name; + Kdenlive::MonitorId m_name; Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; Mlt::Profile *m_mltProfile; @@ -481,7 +481,7 @@ signals: void addClip(const KUrl &, stringMap); void checkSeeking(); /** @brief Activate current monitor. */ - void activateMonitor(Kdenlive::MONITORID); + void activateMonitor(Kdenlive::MonitorId); void mltFrameReceived(Mlt::Frame *); public slots: diff --git a/src/scopes/scopemanager.cpp b/src/scopes/scopemanager.cpp index cb76f7dd..b192beaf 100644 --- a/src/scopes/scopemanager.cpp +++ b/src/scopes/scopemanager.cpp @@ -203,7 +203,7 @@ void ScopeManager::slotUpdateActiveRenderer() m_lastConnectedRenderer = m_monitorManager->activeRenderer(); // DVD monitor shouldn't be monitored or will cause crash on deletion - if (m_monitorManager->isActive(Kdenlive::dvdMonitor)) m_lastConnectedRenderer = NULL; + if (m_monitorManager->isActive(Kdenlive::DvdMonitor)) m_lastConnectedRenderer = NULL; // Connect new renderer if (m_lastConnectedRenderer != NULL) { @@ -289,16 +289,16 @@ void ScopeManager::checkActiveColourScopes() // Notify monitors whether frames are still required Monitor *monitor; - monitor = static_cast( m_monitorManager->monitor(Kdenlive::projectMonitor) ); + monitor = static_cast( m_monitorManager->monitor(Kdenlive::ProjectMonitor) ); if (monitor != NULL) { if (monitor->effectSceneDisplayed()) monitor->render->sendFrameForAnalysis = true; else monitor->render->sendFrameForAnalysis = imageStillRequested; } - monitor = static_cast( m_monitorManager->monitor(Kdenlive::clipMonitor) ); + monitor = static_cast( m_monitorManager->monitor(Kdenlive::ClipMonitor) ); if (monitor != NULL) { monitor->render->sendFrameForAnalysis = imageStillRequested; } - RecMonitor *recMonitor = static_cast( m_monitorManager->monitor(Kdenlive::recordMonitor) ); + RecMonitor *recMonitor = static_cast( m_monitorManager->monitor(Kdenlive::RecordMonitor) ); if (recMonitor != NULL) { recMonitor->analyseFrames(imageStillRequested); } } diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index ccf55383..120e208f 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -93,7 +93,7 @@ void MyLabel::paintEvent(QPaintEvent* event) StopmotionMonitor::StopmotionMonitor(MonitorManager *manager, QWidget *parent) : - AbstractMonitor(Kdenlive::stopmotionMonitor, manager, parent), + AbstractMonitor(Kdenlive::StopMotionMonitor, manager, parent), m_captureDevice(NULL) { createVideoSurface(); @@ -117,9 +117,9 @@ AbstractRender *StopmotionMonitor::abstractRender() return m_captureDevice; } -Kdenlive::MONITORID StopmotionMonitor::id() const +Kdenlive::MonitorId StopmotionMonitor::id() const { - return Kdenlive::stopmotionMonitor; + return Kdenlive::StopMotionMonitor; } @@ -491,7 +491,7 @@ void StopmotionWidget::slotLive(bool isOn) connect(m_captureDevice, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString))); } - m_manager->activateMonitor(Kdenlive::stopmotionMonitor); + m_manager->activateMonitor(Kdenlive::StopMotionMonitor); QString producer = createProducer(profile, service, resource); if (m_captureDevice->slotStartPreview(producer, true)) { if (m_showOverlay->isChecked()) { diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h index 338b6fad..1c1ff876 100644 --- a/src/stopmotion/stopmotion.h +++ b/src/stopmotion/stopmotion.h @@ -64,7 +64,7 @@ public: StopmotionMonitor(MonitorManager *manager, QWidget *parent); ~StopmotionMonitor(); AbstractRender *abstractRender(); - Kdenlive::MONITORID id() const; + Kdenlive::MonitorId id() const; void setRender(MltDeviceCapture *render); private: diff --git a/src/subprojectitem.cpp b/src/subprojectitem.cpp index b03ed5ca..ae6388b0 100644 --- a/src/subprojectitem.cpp +++ b/src/subprojectitem.cpp @@ -33,7 +33,7 @@ const int DurationRole = Qt::UserRole + 1; const int itemHeight = 30; SubProjectItem::SubProjectItem(double display_ratio, QTreeWidgetItem * parent, int in, int out, const QString &description) : - QTreeWidgetItem(parent, PROJECTSUBCLIPTYPE), m_in(in), m_out(out), m_description(description) + QTreeWidgetItem(parent, ProjectSubclipType), m_in(in), m_out(out), m_description(description) { setSizeHint(0, QSize((int) (itemHeight * display_ratio) + 2, itemHeight + 2)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); diff --git a/src/subprojectitem.h b/src/subprojectitem.h index 6831682a..5332e1db 100644 --- a/src/subprojectitem.h +++ b/src/subprojectitem.h @@ -52,7 +52,7 @@ public: /** Make sure folders appear on top of the tree widget */ virtual bool operator<(const QTreeWidgetItem &other)const { int column = treeWidget()->sortColumn(); - if (other.type() != PROJECTFOLDERTYPE) + if (other.type() != ProjectFoldeType) return text(column).toLower() < other.text(column).toLower(); else return false; } diff --git a/src/trackdialog.cpp b/src/trackdialog.cpp index b11b91a2..80047b0a 100644 --- a/src/trackdialog.cpp +++ b/src/trackdialog.cpp @@ -35,7 +35,7 @@ TrackDialog::TrackDialog(KdenliveDoc *doc, QWidget * parent) : setupUi(this); for (int i = 0; i < doc->tracksCount(); ++i) { TrackInfo info = doc->trackInfoAt(doc->tracksCount() - i - 1); - comboTracks->addItem(info.type == VIDEOTRACK ? videoIcon : audioIcon, + comboTracks->addItem(info.type == VideoTrack ? videoIcon : audioIcon, info.trackName.isEmpty() ? QString::number(i) : info.trackName + " (" + QString::number(i) + ')'); } } diff --git a/src/tracksconfigdialog.cpp b/src/tracksconfigdialog.cpp index f709d00c..d2736dea 100644 --- a/src/tracksconfigdialog.cpp +++ b/src/tracksconfigdialog.cpp @@ -110,10 +110,10 @@ const QList TracksConfigDialog::tracksList() info.trackName = table->item(i, 0)->text(); QTableWidgetItem *item = table->item(i, 1); if (item->text() == i18n("Audio")) { - info.type = AUDIOTRACK; + info.type = AudioTrack; info.isBlind = true; } else { - info.type = VIDEOTRACK; + info.type = VideoTrack; info.isBlind = (table->item(i, 2)->checkState() == Qt::Checked); } info.isMute = (table->item(i, 3)->checkState() == Qt::Checked); @@ -140,7 +140,7 @@ void TracksConfigDialog::setupOriginal(int selected) table->setItem(i, 0, new QTableWidgetItem(info.trackName)); QTableWidgetItem *item1 = new QTableWidgetItem(i18n("Video")); - if (info.type == AUDIOTRACK) + if (info.type == AudioTrack) item1->setText(i18n("Audio")); table->setItem(i, 1, item1); table->openPersistentEditor(item1); @@ -148,7 +148,7 @@ void TracksConfigDialog::setupOriginal(int selected) QTableWidgetItem *item2 = new QTableWidgetItem(""); item2->setFlags(item2->flags() & ~Qt::ItemIsEditable); item2->setCheckState(info.isBlind ? Qt::Checked : Qt::Unchecked); - if (info.type == AUDIOTRACK) + if (info.type == AudioTrack) item2->setFlags(item2->flags() & ~Qt::ItemIsEnabled); table->setItem(i, 2, item2); diff --git a/src/trackview.cpp b/src/trackview.cpp index 5cc9453c..6209421c 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -399,7 +399,7 @@ void TrackView::parseDocument(const QDomDocument &doc) kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id"); tractor.removeChild(transitions.item(i)); --i; - } else if (m_trackview->canBePastedTo(transitionInfo, TRANSITIONWIDGET)) { + } else if (m_trackview->canBePastedTo(transitionInfo, TransitionWidget)) { Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); if (forceTrack) tr->setForcedTrack(true, a_track); m_scene->addItem(tr); @@ -648,7 +648,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const Q // Found correct producer m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n'); QString prodId = clip->getId(); - if (clip->clipType() == PLAYLIST || clip->clipType() == AV || clip->clipType() == AUDIO) { + if (clip->clipType() == Playlist || clip->clipType() == AV || clip->clipType() == Audio) { // We need producer for the track prodId.append('_' + QString::number(ix)); } @@ -712,9 +712,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const Q producerXml.setAttribute("mlt_type", type); producerXml.setAttribute("resource", resource); producerXml.setAttribute("duration", length); - if (service == "colour") producerXml.setAttribute("type", COLOR); - else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", IMAGE); - else if (service == "kdenlivetitle") producerXml.setAttribute("type", TEXT); + if (service == "colour") producerXml.setAttribute("type", Color); + else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", Image); + else if (service == "kdenlivetitle") producerXml.setAttribute("type", Text); else producerXml.setAttribute("type", AV); clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id); m_doc->clipManager()->addClip(clip); diff --git a/src/transition.cpp b/src/transition.cpp index b2d76e72..f29c7744 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -203,7 +203,7 @@ void Transition::paint(QPainter *painter, int Transition::type() const { - return TRANSITIONWIDGET; + return TransitionWidget; } //virtual @@ -291,17 +291,17 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value } -OPERATIONTYPE Transition::operationMode(const QPointF &pos) +OperationType Transition::operationMode(const QPointF &pos) { - if (isItemLocked()) return NONE; + if (isItemLocked()) return None; const double scale = projectScene()->scale().x(); double maximumOffset = 6 / scale; QRectF rect = sceneBoundingRect(); - if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return RESIZESTART; - else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return RESIZEEND; - return MOVE; + if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return ResizeStart; + else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return ResizeEnd; + return MoveOperation; } //static diff --git a/src/transition.h b/src/transition.h index 90e690e4..4f937818 100644 --- a/src/transition.h +++ b/src/transition.h @@ -55,7 +55,7 @@ public: int transitionEndTrack() const; QString transitionTag() const; QStringList transitionInfo() const; - OPERATIONTYPE operationMode(const QPointF &pos); + OperationType operationMode(const QPointF &pos); static int itemHeight(); static int itemOffset(); //const QMap < QString, QString > transitionParameters() const; @@ -94,10 +94,10 @@ private: int m_transitionTrack; /** @brief Returns the display name for a transition type. */ - QString getTransitionName(const TRANSITIONTYPE & type); + QString getTransitionName(const TransitionType & type); /** @brief Returns the transition type for a given name. */ - TRANSITIONTYPE getTransitionForName(const QString & type); + TransitionType getTransitionForName(const QString & type); }; #endif diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 4a641b10..b21203bf 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -95,7 +95,7 @@ void TransitionSettings::updateTrackList() KIcon audioIcon("kdenlive-show-audio"); for (int i = limit; i < m_tracks.count(); ++i) { int ix = m_tracks.count() - i - 1; - transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon, + transitionTrack->addItem(m_tracks.at(ix).type == VideoTrack ? videoIcon : audioIcon, m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')', m_tracks.count() - i); } diff --git a/src/transitionsettings.h b/src/transitionsettings.h index e1cc0c52..0e2a6764 100644 --- a/src/transitionsettings.h +++ b/src/transitionsettings.h @@ -63,7 +63,7 @@ private slots: signals: void transitionUpdated(Transition *, const QDomElement&); void seekTimeline(int); - void importClipKeyframes(GRAPHICSRECTITEM = TRANSITIONWIDGET); + void importClipKeyframes(GraphicsRectItem = TransitionWidget); }; #endif diff --git a/src/widgets/archivewidget.cpp b/src/widgets/archivewidget.cpp index ae19130b..02bccd9e 100644 --- a/src/widgets/archivewidget.cpp +++ b/src/widgets/archivewidget.cpp @@ -119,26 +119,26 @@ ArchiveWidget::ArchiveWidget(const QString &projectName, const QDomDocument &doc for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); - CLIPTYPE t = clip->clipType(); + ClipType t = clip->clipType(); QString id = clip->getId(); - if (t == SLIDESHOW) { + if (t == SlideShow) { KUrl slideUrl = clip->fileURL(); //TODO: Slideshow files slideUrls.insert(id, slideUrl.path()); } - else if (t == IMAGE) imageUrls.insert(id, clip->fileURL().path()); - else if (t == TEXT) { + else if (t == Image) imageUrls.insert(id, clip->fileURL().path()); + else if (t == Text) { QStringList imagefiles = TitleWidget::extractImageList(clip->getProperty("xmldata")); QStringList fonts = TitleWidget::extractFontList(clip->getProperty("xmldata")); extraImageUrls << imagefiles; allFonts << fonts; - } else if (t == PLAYLIST) { + } else if (t == Playlist) { playlistUrls.insert(id, clip->fileURL().path()); QStringList files = ProjectSettings::extractPlaylistUrls(clip->fileURL().path()); otherUrls << files; } else if (!clip->fileURL().isEmpty()) { - if (t == AUDIO) audioUrls.insert(id, clip->fileURL().path()); + if (t == Audio) audioUrls.insert(id, clip->fileURL().path()); else { videoUrls.insert(id, clip->fileURL().path()); // Check if we have a proxy -- 2.39.2