summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
68f5099)
svn path=/trunk/kdenlive/; revision=4453
QObject(),
m_audioThumbsQueue(),
m_doc(doc),
QObject(),
m_audioThumbsQueue(),
m_doc(doc),
- m_audioThumbsEnabled(false),
m_generatingAudioId()
{
m_clipIdCounter = 1;
m_generatingAudioId()
{
m_clipIdCounter = 1;
void ClipManager::checkAudioThumbs()
{
void ClipManager::checkAudioThumbs()
{
- if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
- m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
- for (int i = 0; i < m_clipList.count(); i++) {
- if (m_audioThumbsEnabled) m_audioThumbsQueue.append(m_clipList.at(i)->getId());
- else m_clipList.at(i)->slotClearAudioCache();
- }
- if (m_audioThumbsEnabled) {
- if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
- } else {
+ if (!KdenliveSettings::audiothumbnails()) {
+ if (!m_generatingAudioId.isEmpty()) {
+ DocClipBase *clip = getClipById(m_generatingAudioId);
+ if (clip) clip->slotClearAudioCache();
+ }
m_audioThumbsQueue.clear();
m_generatingAudioId.clear();
m_audioThumbsQueue.clear();
m_generatingAudioId.clear();
+ return;
+ }
+
+ for (int i = 0; i < m_clipList.count(); i++) {
+ m_audioThumbsQueue.append(m_clipList.at(i)->getId());
+ if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
}
void ClipManager::askForAudioThumb(const QString &id)
}
void ClipManager::askForAudioThumb(const QString &id)
KdenliveDoc *m_doc;
int m_clipIdCounter;
int m_folderIdCounter;
KdenliveDoc *m_doc;
int m_clipIdCounter;
int m_folderIdCounter;
- bool m_audioThumbsEnabled;
QString m_generatingAudioId;
KDirWatch m_fileWatcher;
QString m_generatingAudioId;
KDirWatch m_fileWatcher;
void DocClipBase::slotCreateAudioTimer()
{
connect(m_thumbProd, SIGNAL(audioThumbReady(QMap <int, QMap <int, QByteArray> >)), this , SLOT(updateAudioThumbnail(QMap <int, QMap <int, QByteArray> >)));
void DocClipBase::slotCreateAudioTimer()
{
connect(m_thumbProd, SIGNAL(audioThumbReady(QMap <int, QMap <int, QByteArray> >)), this , SLOT(updateAudioThumbnail(QMap <int, QMap <int, QByteArray> >)));
- connect(this, SIGNAL(getAudioThumbs()), this , SLOT(slotGetAudioThumbs()));
m_audioTimer = new QTimer(this);
connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs()));
}
m_audioTimer = new QTimer(this);
connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs()));
}
QDomElement e = clip->toXML().cloneNode().toElement();
e.removeAttribute("file_hash");
m_infoQueue.insert(clip->getId(), e);
QDomElement e = clip->toXML().cloneNode().toElement();
e.removeAttribute("file_hash");
m_infoQueue.insert(clip->getId(), e);
- clip->askForAudioThumbs();
//m_render->getFileProperties(clip->toXML(), clip->getId(), true);
}
//m_render->getFileProperties(clip->toXML(), clip->getId(), true);
}
+ clip->askForAudioThumbs();
const QString parent = clip->getProperty("groupid");
ProjectItem *item = NULL;
if (!parent.isEmpty()) {
const QString parent = clip->getProperty("groupid");
ProjectItem *item = NULL;
if (!parent.isEmpty()) {