From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 24 Feb 2008 21:15:27 +0000 (+0000)
Subject: Fix location of audiothumbs
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c870cfe9a399db7049d5a3460057f80ce0a49971;p=kdenlive

Fix location of audiothumbs

svn path=/branches/KDE4/; revision=1923
---

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 6d00f9af..32beb352 100644
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -415,7 +415,7 @@ void DocClipBase::slotGetAudioThumbs(){
 		if (m_audioTimer!=NULL)
 			m_audioTimer->start(2000);
 		double lengthInFrames=duration().frames(/*framesPerSecond()*/25);
-		m_thumbProd->getAudioThumbs(fileURL(), 2, 0, lengthInFrames /*must be number of frames*/, 20);	
+		m_thumbProd->getAudioThumbs( 2, 0, lengthInFrames /*must be number of frames*/, 20);	
 	}
 }
 
diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index e1bed87d..5e40db6e 100644
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -139,6 +139,9 @@ KThumb::KThumb(KUrl url, int width, int height, QObject * parent, const char *na
 {
   kDebug()<<"+++++++++++  CREATING THMB PROD FOR: "<<url;
   m_profile = new Mlt::Profile((char*) qstrdup(KdenliveSettings::current_profile().toUtf8()));
+  QCryptographicHash context(QCryptographicHash::Sha1);
+  context.addData((KFileItem(m_url,"text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data());	
+  m_thumbFile = KdenliveSettings::currenttmpfolder() + context.result().toHex() + ".thumb";
 }
 
 KThumb::~KThumb()
@@ -318,7 +321,7 @@ void KThumb::removeAudioThumb()
 	f.remove();
 }
 
-void KThumb::getAudioThumbs(KUrl url, int channel, double frame, double frameLength, int arrayWidth){
+void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth){
 	
 	if ((thumbProducer.isRunning () && thumbProducer.isWorking()) || channel == 0) {
 	    return;
@@ -328,15 +331,6 @@ void KThumb::getAudioThumbs(KUrl url, int channel, double frame, double frameLen
        //FIXME: Hardcoded!!! 
 	int m_frequency = 48000;
 	int m_channels = channel;
-	m_thumbFile="/tmp/testfile";
-	if (m_url != url) {
-		m_url = url;
-		QCryptographicHash context(QCryptographicHash::Sha1);
-		context.addData((KFileItem(m_url,"text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data());
-		
-		m_thumbFile = KdenliveSettings::currenttmpfolder() + context.result().toHex() + ".thumb";
-		
-	}
 	
 	QFile f(m_thumbFile);
 	if (f.open( QIODevice::ReadOnly )) {
@@ -362,7 +356,6 @@ void KThumb::getAudioThumbs(KUrl url, int channel, double frame, double frameLen
 		if (thumbProducer.isRunning()) return;
 		thumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
 		thumbProducer.start(QThread::LowestPriority );
-		
 	}
 }
 
diff --git a/src/kthumb.h b/src/kthumb.h
index 1e663aa3..ffdf310a 100644
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                         krender.h  -  description
+                         kthumb.h  -  description
                             -------------------
    begin                : Fri Nov 22 2002
    copyright            : (C) 2002 by Jason Wood
@@ -79,7 +79,7 @@ public slots:
 	void getThumbs(KUrl url, int startframe, int endframe, int width, int height);*/
 	void stopAudioThumbs();
 	void removeAudioThumb();
-	void getAudioThumbs(KUrl url, int channel, double frame, double frameLength, int arrayWidth);
+	void getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth);
 
 private:
 	MyThread thumbProducer;