Commit 1fe4d0ad authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Don't mark cache job on audio as failure, allow seeking on clip monitor audio thumbnail

parent 95e827d2
Pipeline #10150 passed with stage
in 13 minutes and 22 seconds
......@@ -3270,6 +3270,10 @@ void Bin::showBinFrame(QModelIndex ix, int frame)
{
std::shared_ptr<AbstractProjectItem> item = m_itemModel->getBinItemByIndex(m_proxyModel->mapToSource(ix));
if (item) {
ClipType::ProducerType type = item->clipType();
if (type != ClipType::AV && type != ClipType::Video && type != ClipType::Playlist && type != ClipType::SlideShow) {
return;
}
if (item->itemType() == AbstractProjectItem::ClipItem) {
auto clip = std::static_pointer_cast<ProjectClip>(item);
if (clip && (clip->clipType() == ClipType::AV || clip->clipType() == ClipType::Video || clip->clipType() == ClipType::Playlist)) {
......
......@@ -63,8 +63,7 @@ bool CacheJob::startJob()
m_binClip = pCore->projectItemModel()->getClipByBinID(m_clipId);
if (m_binClip->clipType() != ClipType::Video && m_binClip->clipType() != ClipType::AV && m_binClip->clipType() != ClipType::Playlist) {
// Don't create thumbnail for audio clips
qDebug()<<"!!!!!!!!!!!\n\n WRONG CLIP TYPE\n\n!!!!!!!!!!";
m_done = false;
m_done = true;
return true;
}
m_prod = m_binClip->thumbProducer();
......
......@@ -349,8 +349,9 @@ void JobManager::slotManageFinishedJob(int id)
bid = it.first;
break;
}
qDebug() << "ERROR: Job " << id << " failed, BID: " << bid;
qDebug() << "ERROR: Job " << id << " failed, BID: " << bid<<", TYPE: "<<m_jobs.at(id)->m_type;
QPair<QString, QString> message = getJobMessageForClip(id, bid);
qDebug()<<"MESSAGE LOG: "<<message;
if (!message.first.isEmpty()) {
if (!message.second.isEmpty()) {
pCore->displayBinLogMessage(message.first, KMessageWidget::Warning, message.second);
......
......@@ -172,6 +172,16 @@ Item {
height: parent.height
x: controller.position * timeScale
}
MouseArea {
id: thumbMouseArea
anchors.fill: parent
onPressed: {
if (mouse.buttons === Qt.LeftButton) {
var pos = Math.max(mouseX, 0)
controller.requestSeekPosition(Math.min(pos / root.timeScale, root.duration));
}
}
}
}
Label {
id: clipNameLabel
......
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