Commit 3f590fe1 authored by Nicolas Carion's avatar Nicolas Carion
Browse files

fix compilation

parent 128d2982
......@@ -76,28 +76,6 @@ public:
/** @brief Returns a pointer to the parent item (or NULL). */
AbstractProjectItem *parent() const;
/** @brief Removes the item from its current parent and adds it as a child to @param parent. */
virtual void setParent(AbstractProjectItem *parent);
/**
* @brief Adds a new child item and notifies the bin model about it (before and after).
* @param child project item which should be added as a child
*
* This function is called by setParent.
*/
virtual void addChild(AbstractProjectItem *child);
/**
* @brief Removes a child item and notifies the bin model about it (before and after).
* @param child project which sould be removed from the child list
*
* This function is called when a child's parent is changed through setParent
*/
virtual void removeChild(AbstractProjectItem *child);
/** @brief Returns the index this item has in its parent's child list. */
//TODO : this is redudant with TreeItem::row()
int index() const;
/** @brief Returns the type of this item (folder, clip, subclip, etc). */
PROJECTITEMTYPE itemType() const;
......
......@@ -565,8 +565,6 @@ Bin::Bin(QWidget *parent) :
m_proxyModel->setSourceModel(m_itemModel);
connect(m_itemModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), m_proxyModel, SLOT(slotDataChanged(const QModelIndex &, const
QModelIndex &)));
connect(m_itemModel, &QAbstractItemModel::rowsInserted, this, &Bin::rowsInserted);
connect(m_itemModel, &QAbstractItemModel::rowsRemoved, this, &Bin::rowsRemoved);
connect(m_proxyModel, &ProjectSortProxyModel::selectModel, this, &Bin::selectProxyModel);
connect(m_itemModel, SIGNAL(itemDropped(QStringList, QModelIndex)), this, SLOT(slotItemDropped(QStringList, QModelIndex)));
connect(m_itemModel, SIGNAL(itemDropped(QList<QUrl>, QModelIndex)), this, SLOT(slotItemDropped(QList<QUrl>, QModelIndex)));
......
......@@ -349,8 +349,6 @@ private slots:
/** @brief Update status for clip jobs */
void slotUpdateJobStatus(const QString &, int, int, const QString &label = QString(), const QString &actionName = QString(), const QString &details = QString());
void slotSetIconSize(int size);
void rowsInserted(const QModelIndex &parent, int start, int end);
void rowsRemoved(const QModelIndex &parent, int start, int end);
void selectProxyModel(const QModelIndex &id);
void autoSelect();
void slotSaveHeaders();
......
......@@ -216,7 +216,7 @@ QStringList ProjectClip::subClipIds() const
ProjectClip *ProjectClip::clipAt(int ix)
{
if (ix == index()) {
if (ix == row()) {
return this;
}
return nullptr;
......
......@@ -73,12 +73,6 @@ public:
/** @brief Returns column names in case we want to use columns in QTreeView */
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/** @brief Mandatory reimplementation from QAbstractItemModel */
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
/** @brief Mandatory reimplementation from QAbstractItemModel */
QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
/** @brief Mandatory reimplementation from QAbstractItemModel */
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
/** @brief Mandatory reimplementation from QAbstractItemModel */
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
/** @brief Returns the mimetype used for Drag actions */
QStringList mimeTypes() const Q_DECL_OVERRIDE;
......
......@@ -198,7 +198,7 @@ void BinController::loadBinPlaylist(Mlt::Tractor &tractor)
}
// If no Playlist found, create new one
if (!m_binPlaylist) {
m_binPlaylist = new Mlt::Playlist(*tractor.profile());
m_binPlaylist.reset(new Mlt::Playlist(*tractor.profile()));
m_binPlaylist->set("id", kPlaylistTrackId);
}
}
......
......@@ -35,6 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QFileInfo>
#include <KLocalizedString>
std::shared_ptr<Mlt::Producer> ClipController::mediaUnavailable;
ClipController::ClipController(std::shared_ptr<BinController> bincontroller, std::shared_ptr<Mlt::Producer> producer) :
selectedEffectIndex(1)
, m_audioThumbCreated(false)
......
......@@ -880,7 +880,7 @@ void ProjectManager::updateTimeline(Mlt::Tractor tractor) {
info.imageHeight = 0;
info.clipId = id;
info.replaceProducer = true;
pCore->bin()->slotProducerReady(info, pCore->binController()->getController(id));
pCore->bin()->slotProducerReady(info, pCore->binController()->getController(id).get());
}
pCore->binController()->setBinPlaylist(m_timelineWidget->tractor());
m_timelineWidget->buildFromMelt(tractor);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment