if (!m_properties.contains("name")) m_properties.insert("name", url.fileName());
- //if (!url.isEmpty() && QFile::exists(url.path()))
- {
- m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash"));
- if (m_clipType == AV || m_clipType == AUDIO || m_clipType == PLAYLIST) slotCreateAudioTimer();
- }
- //kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType;
-}
-
-/*DocClipBase & DocClipBase::operator=(const DocClipBase & clip) {
- DocClipBase::operator=(clip);
- m_id = clip.getId();
- m_clipType = clip.clipType();
- m_name = clip.name();
- m_duration = clip.duration();
- m_audioThumbCreated = clip.audioThumbCreated();
- m_properties = clip.properties();
- return *this;
-}*/
+ m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash"));
+ if (m_clipType == AV || m_clipType == AUDIO || m_clipType == PLAYLIST) slotCreateAudioTimer();
+}
DocClipBase::~DocClipBase()
{
- kDebug() << "CLIP " << m_id << " DELETED******************************";
delete m_thumbProd;
if (m_audioTimer) {
m_audioTimer->stop();
delete m_audioTimer;
}
- /*kDebug() <<" * * *CNT "<<m_baseTrackProducers.count();
- if (m_baseTrackProducers.count() > 0) kDebug()<<"YOYO: "<<m_baseTrackProducers.at(0)->get_out()<<", CUT: "<<m_baseTrackProducers.at(0)->is_cut();*/
qDeleteAll(m_baseTrackProducers);
m_baseTrackProducers.clear();
qDeleteAll(m_audioTrackProducers);
void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readPropertiesFromProducer)
{
- if (m_placeHolder && producer) {
+ if (producer == NULL) return;
+ if (reset) QMutexLocker locker(&m_producerMutex);
+ if (m_placeHolder || !producer->is_valid()) {
char *tmp = qstrdup(i18n("Missing clip").toUtf8().constData());
producer->set("markup", tmp);
producer->set("bgcolour", "0xff0000ff");
producer->set("pad", "10");
delete[] tmp;
}
- if (producer == NULL /*|| (m_placeHolder && !reset)*/) return;
- if (m_thumbProd && (reset || !m_thumbProd->hasProducer())) m_thumbProd->setProducer(producer);
+ QString id = producer->get("id");
+ if (m_thumbProd) {
+ if (reset) m_thumbProd->setProducer(NULL);
+ if (!m_thumbProd->hasProducer()) {
+ if (m_clipType != AUDIO) {
+ if (!id.endsWith("_audio"))
+ m_thumbProd->setProducer(producer);
+ }
+ else m_thumbProd->setProducer(producer);
+ }
+ }
if (reset) {
// Clear all previous producers
kDebug() << "/+++++++++++++++ DELETE ALL PRODS " << producer->get("id");
deleteProducers(false);
}
- QString id = producer->get("id");
bool updated = false;
if (id.contains('_')) {
// this is a subtrack producer, insert it at correct place
Mlt::Producer *DocClipBase::audioProducer(int track)
{
+ QMutexLocker locker(&m_producerMutex);
if (m_audioTrackProducers.count() <= track) {
while (m_audioTrackProducers.count() - 1 < track) {
m_audioTrackProducers.append(NULL);
int i;
for (i = 0; i < m_audioTrackProducers.count(); i++)
if (m_audioTrackProducers.at(i) != NULL) break;
- if (i < m_audioTrackProducers.count()) {
- // Could not find a valid producer for that clip, check in
- return m_audioTrackProducers.at(i);
+ Mlt::Producer *base;
+ if (i >= m_audioTrackProducers.count()) {
+ // Could not find a valid producer for that clip
+ locker.unlock();
+ base = producer();
+ if (base == NULL) {
+ return NULL;
+ }
+ locker.relock();
}
-
- Mlt::Producer *base = producer();
+ else base = m_audioTrackProducers.at(i);
m_audioTrackProducers[track] = cloneProducer(base);
adjustProducerProperties(m_audioTrackProducers.at(track), QString(getId() + '_' + QString::number(track) + "_audio"), false, true);
}
Mlt::Producer *DocClipBase::videoProducer()
{
+ QMutexLocker locker(&m_producerMutex);
if (m_videoOnlyProducer == NULL) {
int i;
for (i = 0; i < m_baseTrackProducers.count(); i++)
Mlt::Producer *DocClipBase::producer(int track)
{
+ QMutexLocker locker(&m_producerMutex);
if (track == -1 || (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST)) {
- if (m_baseTrackProducers.count() == 0) return NULL;
+ if (m_baseTrackProducers.count() == 0) {
+ return NULL;
+ }
for (int i = 0; i < m_baseTrackProducers.count(); i++) {
- if (m_baseTrackProducers.at(i) != NULL)
+ if (m_baseTrackProducers.at(i) != NULL) {
return m_baseTrackProducers.at(i);
+ }
}
return NULL;
}
Mlt::Producer *DocClipBase::cloneProducer(Mlt::Producer *source)
{
Mlt::Producer *result = NULL;
- if (KIO::NetAccess::exists(KUrl(source->get("resource")), KIO::NetAccess::SourceSide, 0)) {
- result = new Mlt::Producer(*source->profile(), source->get("resource"));
+ QString url = source->get("resource");
+ if (KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) {
+ char *tmp = qstrdup(url.toUtf8().constData());
+ result = new Mlt::Producer(*source->profile(), tmp);
+ delete[] tmp;
}
- if (result == NULL) {
+ if (result == NULL || !result->is_valid()) {
// placeholder clip
QString txt = "+" + i18n("Missing clip") + ".txt";
char *tmp = qstrdup(txt.toUtf8().constData());
result = new Mlt::Producer(*source->profile(), tmp);
delete[] tmp;
- if (result == NULL)
+ if (result == NULL || !result->is_valid())
result = new Mlt::Producer(*source->profile(), "colour:red");
else {
result->set("bgcolour", "0xff0000ff");
bool refreshProducer = false;
QStringList keys;
keys << "luma_duration" << "luma_file" << "fade" << "ttl" << "softness" << "crop" << "animation";
+ QString oldProxy = m_properties.value("proxy");
while (i.hasNext()) {
i.next();
setProperty(i.key(), i.value());
if (m_clipType == SLIDESHOW && keys.contains(i.key())) refreshProducer = true;
}
+ if (properties.contains("proxy")) {
+ QString value = properties.value("proxy");
+ // If value is "-", that means user manually disabled proxy on this clip
+ if (value.isEmpty() || value == "-") {
+ // reset proxy
+ emit abortProxy(m_id, oldProxy);
+ }
+ else {
+ emit createProxy(m_id);
+ }
+ }
if (refreshProducer) slotRefreshProducer();
}
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");
- else hash = getHash(fileURL().path());
+ if (hash.isEmpty()) hash = getHash(fileURL().path());
}
return hash;
resetProducerProperty("set.force_full_luma");
} else setProducerProperty("set.force_full_luma", value.toInt());
}
- else if (key == "proxy") {
- // If value is "-", that means user manually disabled proxy on this clip
- if (value.isEmpty() || value == "-") {
- // reset proxy
- emit abortProxy(m_id);
- }
- else {
- emit createProxy(m_id);
- }
- }
}
QMap <QString, QString> DocClipBase::properties() const
}
+void DocClipBase::slotExtractImage(int frame, int frame2)
+{
+ if (m_thumbProd == NULL) return;
+ m_thumbProd->extractImage(frame, frame2);
+}
+
+QPixmap DocClipBase::extractImage(int frame, int width, int height)
+{
+ if (m_thumbProd == NULL) return QPixmap(width, height);
+ QMutexLocker locker(&m_producerMutex);
+ QPixmap p = m_thumbProd->extractImage(frame, width, height);
+ return p;
+}
+
projects / kdenlive / blobdiff