Commit 97d40fb7 authored by Nicolas Carion's avatar Nicolas Carion

fix forgotten function rename + preparatory functions for bin clip link

parent 66da8a4b
......@@ -389,11 +389,6 @@ QPoint ProjectClip::zone() const
return QPoint(x, y);
}
void ProjectClip::resetProducerProperty(const QString &name)
{
resetProperty(name);
}
const QString ProjectClip::hash()
{
......@@ -1220,3 +1215,9 @@ void ProjectClip::disableEffects(bool disable)
{
ClipController::disableEffects(disable);
}
void ProjectClip::registerTimelineClip(std::weak_ptr<TimelineModel> timeline, int clipId)
{
Q_ASSERT(m_registeredClips.count(clipId) == 0);
m_registeredClips[clipId] = timeline;
}
......@@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "definitions.h"
#include "effects/effectstack/model/effectstackmodel.hpp"
#include "mltcontroller/clipcontroller.h"
#include "timeline2/model/timelinemodel.hpp"
#include <QUrl>
#include <QMutex>
......@@ -148,9 +149,6 @@ public:
/** @brief The clip hash created from the clip's resource. */
const QString hash();
/** @brief Reset a property on the MLT producer (=delete the property). */
void resetProducerProperty(const QString &name);
/** @brief Returns a list of all markers comments between in ant out frames. */
QStringList markersText(GenTime in, GenTime out) const;
......@@ -195,6 +193,15 @@ public:
/** @brief Returns true if this producer has audio and can be splitted on timeline*/
bool isSplittable() const;
protected:
friend class ClipModel;
/** @brief This is a call-back called by a ClipModel when it is created
@param timeline ptr to the pointer in which this ClipModel is inserted
@param clipId id of the inserted clip
*/
void registerTimelineClip(std::weak_ptr<TimelineModel> timeline, int clipId);
public slots:
void updateAudioThumbnail(const QVariantList &audioLevels);
/** @brief Extract image thumbnails for timeline. */
......@@ -227,6 +234,8 @@ private:
void doExtractImage();
void doExtractIntra();
std::map<int, std::weak_ptr<TimelineModel> > m_registeredClips;
private slots:
void updateFfmpegProgress();
......
......@@ -489,7 +489,7 @@ void ClipController::setProducerProperty(const QString &name, const QString &val
}
}
void ClipController::resetProperty(const QString &name)
void ClipController::resetProducerProperty(const QString &name)
{
//TODO: also set property on all track producers
m_masterProducer->parent().set(name.toUtf8().constData(), (char *)nullptr);
......
......@@ -114,7 +114,8 @@ public:
void setProducerProperty(const QString &name, const QString &value);
void setProducerProperty(const QString &name, int value);
void setProducerProperty(const QString &name, double value);
void resetProperty(const QString &name);
/** @brief Reset a property on the MLT producer (=delete the property). */
void resetProducerProperty(const QString &name);
/**
* @brief Returns the list of all properties starting with prefix. For subclips, the list is of this type:
......
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