X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=1745b66eab3e4fc87e7930377980ad5cd4a0c1ce;hb=f50f57860f9858437eb97803d8d1c7b26680ed08;hp=5e40db6ef58f0e8c6f2782c95b3081f7363a8117;hpb=c870cfe9a399db7049d5a3460057f80ce0a49971;p=kdenlive

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 5e40db6e..1745b66e 100644
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -4,7 +4,7 @@
   begin                : Fri Nov 22 2002
   copyright            : (C) 2002 by Jason Wood
   email                : jasonwood@blueyonder.co.uk
-  copyright            : (C) 2005 Lcio Fl�io Corr�	
+  copyright            : (C) 2005 Lcio Fl�io Corr�
   email                : lucio.correa@gmail.com
   copyright            : (C) Marco Gittler
   email                : g.marco@freenet.de
@@ -20,217 +20,251 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qapplication.h>
+#include "kthumb.h"
+#include "clipmanager.h"
+#include "renderer.h"
+#include "kdenlivesettings.h"
+
+#include <mlt++/Mlt.h>
 
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kdenlivesettings.h>
 #include <kfileitem.h>
 #include <kmessagebox.h>
-
-#include <mlt++/Mlt.h>
+#include <KStandardDirs>
 
 #include <qxml.h>
-#include <qimage.h>
-
-#include <QThread>
+#include <QImage>
 #include <QApplication>
-#include <QCryptographicHash>
 
+void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
+{
+    stop_me = false;
+    m_isWorking = false;
+    f.setFileName(target);
+    m_url = url;
+    m_frame = frame;
+    m_frameLength = frameLength;
+    m_frequency = frequency;
+    m_channels = channels;
+    m_arrayWidth = arrayWidth;
+}
 
-#include "renderer.h"
-#include "kthumb.h"
-#include "kdenlivesettings.h"
+bool MyThread::isWorking()
+{
+    return m_isWorking;
+}
+
+void MyThread::run()
+{
+    if (!f.open(QIODevice::WriteOnly)) {
+        kDebug() << "++++++++  ERROR WRITING TO FILE: " << f.fileName() << endl;
+        kDebug() << "++++++++  DISABLING AUDIO THUMBS" << endl;
+        KdenliveSettings::setAudiothumbnails(false);
+        return;
+    }
+    m_isWorking = true;
+    Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().data());
+    Mlt::Producer m_producer(prof, m_url.path().toUtf8().data());
 
-void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
-    {
-	stop_me = false;
-	m_isWorking = false;
-	f.setFileName(target);
-	m_url = url;
-	m_frame = frame;
-	m_frameLength = frameLength;
-	m_frequency = frequency;
-	m_channels = channels;
-	m_arrayWidth = arrayWidth;
 
+    if (KdenliveSettings::normaliseaudiothumbs()) {
+        Mlt::Filter m_convert(prof, "volume");
+        m_convert.set("gain", "normalise");
+        m_producer.attach(m_convert);
     }
 
-    bool MyThread::isWorking()
-    {
-	return m_isWorking;
+    int last_val = 0;
+    int val = 0;
+    kDebug() << "for " << m_frame << " " << m_frameLength << " " << m_producer.is_valid();
+    for (int z = (int) m_frame; z < (int)(m_frame + m_frameLength) && m_producer.is_valid(); z++) {
+        if (stop_me) break;
+        val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0);
+        if (last_val != val && val > 1) {
+            emit audioThumbProgress(val);
+            last_val = val;
+        }
+        m_producer.seek(z);
+        Mlt::Frame *mlt_frame = m_producer.get_frame();
+        if (mlt_frame && mlt_frame->is_valid()) {
+            double m_framesPerSecond = mlt_producer_get_fps(m_producer.get_producer());
+            int m_samples = mlt_sample_calculator(m_framesPerSecond, m_frequency, mlt_frame_get_position(mlt_frame->get_frame()));
+            mlt_audio_format m_audioFormat = mlt_audio_pcm;
+            qint16* m_pcm = static_cast<qint16*>(mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples));
+
+            for (int c = 0; c < m_channels; c++) {
+                QByteArray m_array;
+                m_array.resize(m_arrayWidth);
+                for (int i = 0; i < m_array.size(); i++) {
+                    m_array[i] = ((*(m_pcm + c + i * m_samples / m_array.size())) >> 9) + 127 / 2 ;
+                }
+                f.write(m_array);
+
+            }
+        } else {
+            f.write(QByteArray(m_arrayWidth, '\x00'));
+        }
+        delete mlt_frame;
     }
+    //kDebug() << "done";
+    f.close();
+    m_isWorking = false;
+    if (stop_me) {
+        f.remove();
+    } else emit audioThumbOver();
+}
 
-    void MyThread::run()
-    {
-		
-		 if (!f.open( QIODevice::WriteOnly )) {
-			kDebug()<<"++++++++  ERROR WRITING TO FILE: "<<f.fileName()<<endl;
-			kDebug()<<"++++++++  DISABLING AUDIO THUMBS"<<endl;
-			//TODO KdenliveSettings::setAudiothumbnails(false);
-			return;
-		}
-		m_isWorking = true;
-		Mlt::Profile prof((char*) KdenliveSettings::current_profile().data());
-		Mlt::Producer m_producer(prof, m_url.path().toAscii().data());
-		
-
-		/*TODO if (KdenliveSettings::normaliseaudiothumbs()) {
-    		    Mlt::Filter m_convert("volume");
-    		    m_convert.set("gain", "normalise");
-    		    m_producer.attach(m_convert);
-		}*/
-
-		/*TODO if (qApp->mainWidget()) 
-		    QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(-1, 10005));
-	*/
-		int last_val = 0;
-		int val = 0;
-		kDebug() << "for " << m_frame << " " << m_frameLength << " " << m_producer.is_valid();
-		for (int z=(int) m_frame;z<(int) (m_frame+m_frameLength) && m_producer.is_valid();z++){
-			if (stop_me) break;
-			val=(int)((z-m_frame)/(m_frame+m_frameLength)*100.0);
-			if (last_val!=val & val > 1){
-				//TODO QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(val, 10005));
-				last_val=val;
-			}
-				m_producer.seek( z );
-				Mlt::Frame *mlt_frame = m_producer.get_frame();
-				if ( mlt_frame->is_valid() )
-				{
-					double m_framesPerSecond = mlt_producer_get_fps( m_producer.get_producer() ); //mlt_frame->get_double( "fps" );
-					int m_samples = mlt_sample_calculator( m_framesPerSecond, m_frequency, mlt_frame_get_position(mlt_frame->get_frame()) );
-					mlt_audio_format m_audioFormat = mlt_audio_pcm;
-				
-					int16_t* m_pcm = mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples ); 
-
-					for (int c=0;c< m_channels;c++){
-						QByteArray m_array;
-						m_array.resize(m_arrayWidth);
-						for (uint i = 0; i < m_array.size(); i++){
-							m_array[i] =  ( (*( m_pcm + c + i * m_samples / m_array.size() )) >> 9 ) +127/2 ;
-						}
-						f.write(m_array);
-						
-					}
-				} else{
-					f.write(QByteArray(m_arrayWidth,'\x00'));
-				}
-				if (mlt_frame)
-					delete mlt_frame;
-		}
-		f.close();
-		m_isWorking = false;
-		if (stop_me) {
-		    f.remove();
-		   //TODO  QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(-1, 10005));
-		}
-		//TODO else QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(0, 10005));
+KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) :
+        QObject(parent),
+        m_audioThumbProducer(),
+        m_url(url),
+        m_thumbFile(),
+        m_dar(1),
+        m_producer(NULL),
+        m_clipManager(clipManager),
+        m_id(id)
+{
+    m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+    connect(&m_audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
+    connect(&m_audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
+
+}
+
+KThumb::~KThumb()
+{
+    if (m_audioThumbProducer.isRunning()) {
+        m_audioThumbProducer.stop_me = true;
+        m_audioThumbProducer.wait();
+        slotAudioThumbOver();
     }
+}
 
+void KThumb::setProducer(Mlt::Producer *producer)
+{
+    m_producer = producer;
+    // FIXME: the profile() call leaks an object, but trying to free
+    // it leads to a double-free in Profile::~Profile()
+    m_dar = producer->profile()->dar();
+}
 
-#define _S(a)           (a)>255 ? 255 : (a)<0 ? 0 : (a)
-#define _R(y,u,v) (0x2568*(y)                          + 0x3343*(u)) /0x2000
-#define _G(y,u,v) (0x2568*(y) - 0x0c92*(v) - 0x1a1e*(u)) /0x2000
-#define _B(y,u,v) (0x2568*(y) + 0x40cf*(v))                                          /0x2000
+void KThumb::clearProducer()
+{
+    m_producer = NULL;
+}
 
-KThumb::KThumb(KUrl url, int width, int height, QObject * parent, const char *name):QObject(parent), m_url(url), m_width(width), m_height(height)
+bool KThumb::hasProducer() const
 {
-  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";
+    return m_producer != NULL;
 }
 
-KThumb::~KThumb()
+void KThumb::updateThumbUrl(const QString &hash)
 {
-    if (m_profile) delete m_profile;
-    if (thumbProducer.isRunning ()) thumbProducer.exit();
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
 }
 
+void KThumb::updateClipUrl(KUrl url, const QString &hash)
+{
+    m_url = url;
+    if (m_producer) {
+        char *tmp = Render::decodedString(url.path());
+        m_producer->set("resource", tmp);
+        delete[] tmp;
+    }
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+}
 
 //static
 QPixmap KThumb::getImage(KUrl url, int width, int height)
 {
     if (url.isEmpty()) return QPixmap();
-    QPixmap pix(width, height);
-  kDebug()<<"+++++++++++  GET THMB IMG FOR: "<<url;
-    char *tmp = Render::decodedString(url.path());
-    Mlt::Profile prof((char*) KdenliveSettings::current_profile().data());
-    Mlt::Producer m_producer(prof, tmp);
-    delete tmp;
+    return getImage(url, 0, width, height);
+}
 
-    if (m_producer.is_blank()) {
-	pix.fill(Qt::black);
-	return pix;
+void KThumb::extractImage(int frame, int frame2)
+{
+    // kDebug() << "//extract thumb: " << frame << ", " << frame2;
+    if (!KdenliveSettings::videothumbnails() || m_producer == NULL) return;
+
+    const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
+    const int theight = KdenliveSettings::trackheight();
+
+    if (frame != -1) {
+        QPixmap pix = getFrame(m_producer, frame, twidth, theight);
+        emit thumbReady(frame, pix);
     }
-    Mlt::Frame * m_frame;
-    mlt_image_format format = mlt_image_rgb24a;
-    Mlt::Filter m_convert(prof, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_producer.attach(m_convert);
-    //m_producer.seek(frame);
-    m_frame = m_producer.get_frame();
-    if (m_frame && m_frame->is_valid()) {
-      uint8_t *thumb = m_frame->get_image(format, width, height);
-      QImage image(thumb, width, height, QImage::Format_ARGB32);
-      if (!image.isNull()) {
-	pix = pix.fromImage(image);
-      }
-      else pix.fill(Qt::black);
+    if (frame2 != -1) {
+        QPixmap pix = getFrame(m_producer, frame2, twidth, theight);
+        emit thumbReady(frame2, pix);
     }
-    if (m_frame) delete m_frame;
-    return pix;
 }
 
-void KThumb::extractImage(int frame, int frame2)
+QPixmap KThumb::extractImage(int frame, int width, int height)
 {
-    if (m_url.isEmpty()) return;
-    QPixmap pix(m_width, m_height);
-    char *tmp = Render::decodedString(m_url.path());
-    Mlt::Producer m_producer(*m_profile, tmp);
-    delete tmp;
+    return getFrame(m_producer, frame, width, height);
+}
 
-    if (m_producer.is_blank()) {
-	pix.fill(Qt::black);
-	emit thumbReady(frame, pix);
-	return;
+//static
+QPixmap KThumb::getImage(KUrl url, int frame, int width, int height)
+{
+    char *tmp = Render::decodedString(KdenliveSettings::current_profile());
+    Mlt::Profile profile(tmp);
+    delete[] tmp;
+    QPixmap pix(width, height);
+    if (url.isEmpty()) return pix;
+
+    tmp = Render::decodedString(url.path());
+    //"<mlt><playlist><producer resource=\"" + url.path() + "\" /></playlist></mlt>");
+    //Mlt::Producer producer(profile, "xml-string", tmp);
+    Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
+    delete[] tmp;
+
+    pix = getFrame(producer, frame, width, height);
+    delete producer;
+    return pix;
+}
+
+
+//static
+QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
+{
+    QPixmap p(width, height);
+    if (producer == NULL) {
+        p.fill(Qt::red);
+        return p;
     }
-    Mlt::Frame * m_frame;
-    mlt_image_format format = mlt_image_rgb24a;
-    Mlt::Filter m_convert(*m_profile, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_producer.attach(m_convert);
-    if (frame != -1) {
-      m_producer.seek(frame);
-      m_frame = m_producer.get_frame();
-      if (m_frame && m_frame->is_valid()) {
-	uint8_t *thumb = m_frame->get_image(format, m_width, m_height);
-	QImage image(thumb, m_width, m_height, QImage::Format_ARGB32);
-	if (!image.isNull()) {
-	  pix = pix.fromImage(image);
-	}
-	else pix.fill(Qt::black);
-      }
-      if (m_frame) delete m_frame;
-      emit thumbReady(frame, pix);
+
+    if (producer->is_blank()) {
+        p.fill(Qt::black);
+        return p;
     }
-    if (frame2 == -1) return;
-    m_producer.seek(frame2);
-    m_frame = m_producer.get_frame();
-    if (m_frame && m_frame->is_valid()) {
-      uint8_t *thumb = m_frame->get_image(format, m_width, m_height);
-      QImage image(thumb, m_width, m_height, QImage::Format_ARGB32);
-      if (!image.isNull()) {
-	pix = pix.fromImage(image);
-      }
-      else pix.fill(Qt::black);
+
+    producer->seek(framepos);
+    Mlt::Frame *frame = producer->get_frame();
+    if (!frame) {
+        kDebug() << "///// BROKEN FRAME";
+        p.fill(Qt::red);
+        return p;
     }
-    if (m_frame) delete m_frame;
-    emit thumbReady(frame2, pix);
 
+    /*Mlt::Producer parentProd(producer->parent());
+    Mlt::Service service(parentProd.get_service());
+    mlt_service_lock(service.get_service());*/
+
+    mlt_image_format format = mlt_image_rgb24a;
+    int frame_width = width;
+    int frame_height = height;
+    uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
+    QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
+    //mlt_service_unlock(service.get_service());
+
+    if (!image.isNull()) {
+        p = QPixmap::fromImage(image.rgbSwapped());
+    } else
+        p.fill(Qt::red);
+
+    delete frame;
+    return p;
 }
 /*
 void KThumb::getImage(KUrl url, int frame, int width, int height)
@@ -243,8 +277,8 @@ void KThumb::getImage(KUrl url, int frame, int width, int height)
     image.fill(Qt::black);
 
     if (m_producer.is_blank()) {
-	emit thumbReady(frame, image);
-	return;
+ emit thumbReady(frame, image);
+ return;
     }
     Mlt::Filter m_convert("avcolour_space");
     m_convert.set("forced", mlt_image_rgb24a);
@@ -255,9 +289,9 @@ void KThumb::getImage(KUrl url, int frame, int width, int height)
     width = width - 2;
     height = height - 2;
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width + 2, height + 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width + 2, height + 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(frame, image);
@@ -273,9 +307,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     image.fill(Qt::black);
 
     if (m_producer.is_blank()) {
-	emit thumbReady(startframe, image);
-	emit thumbReady(endframe, image);
-	return;
+ emit thumbReady(startframe, image);
+ emit thumbReady(endframe, image);
+ return;
     }
     Mlt::Filter m_convert("avcolour_space");
     m_convert.set("forced", mlt_image_rgb24a);
@@ -287,9 +321,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     height = height - 2;
 
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(startframe, image);
@@ -299,9 +333,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     m_frame = m_producer.get_frame();
 
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(endframe, image);
@@ -309,55 +343,80 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
 */
 void KThumb::stopAudioThumbs()
 {
-	if (thumbProducer.isRunning ()) thumbProducer.stop_me = true;
+    if (m_audioThumbProducer.isRunning()) {
+        m_audioThumbProducer.stop_me = true;
+        slotAudioThumbOver();
+    }
 }
 
-
 void KThumb::removeAudioThumb()
 {
-	if (m_thumbFile.isEmpty()) return;
-	stopAudioThumbs();
-	QFile f(m_thumbFile);
-	f.remove();
+    if (m_thumbFile.isEmpty()) return;
+    stopAudioThumbs();
+    QFile f(m_thumbFile);
+    f.remove();
 }
 
-void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth){
-	
-	if ((thumbProducer.isRunning () && thumbProducer.isWorking()) || channel == 0) {
-	    return;
-	}
-	
-	QMap <int, QMap <int, QByteArray> > storeIn;
-       //FIXME: Hardcoded!!! 
-	int m_frequency = 48000;
-	int m_channels = channel;
-	
-	QFile f(m_thumbFile);
-	if (f.open( QIODevice::ReadOnly )) {
-		QByteArray channelarray = f.readAll();
-		f.close();
-		if (channelarray.size() != arrayWidth*(frame+frameLength)*m_channels) {
-			kDebug()<<"--- BROKEN THUMB FOR: "<<m_url.fileName()<<" ---------------------- "<<endl;
-			f.remove();
-			return;
-		}
-		kDebug() << "reading audio thumbs from file";
-		for (int z=(int) frame;z<(int) (frame+frameLength);z++) {
-			for (int c=0;c< m_channels;c++){
-				QByteArray m_array(arrayWidth,'\x00');
-				for (int i = 0; i < arrayWidth; i++)
-					m_array[i] = channelarray[z*arrayWidth*m_channels + c*arrayWidth + i];
-				storeIn[z][c] = m_array;
-			}
-		}
-		emit audioThumbReady(storeIn);
-	}
-	else {
-		if (thumbProducer.isRunning()) return;
-		thumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
-		thumbProducer.start(QThread::LowestPriority );
-	}
+void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth)
+{
+    if (channel == 0) {
+        slotAudioThumbOver();
+        return;
+    }
+    if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) {
+        return;
+    }
+
+    QMap <int, QMap <int, QByteArray> > storeIn;
+    //FIXME: Hardcoded!!!
+    int m_frequency = 48000;
+    int m_channels = channel;
+
+    QFile f(m_thumbFile);
+    if (f.open(QIODevice::ReadOnly)) {
+        QByteArray channelarray = f.readAll();
+        f.close();
+        if (channelarray.size() != arrayWidth*(frame + frameLength)*m_channels) {
+            kDebug() << "--- BROKEN THUMB FOR: " << m_url.fileName() << " ---------------------- " << endl;
+            f.remove();
+            slotAudioThumbOver();
+            return;
+        }
+        kDebug() << "reading audio thumbs from file";
+        for (int z = (int) frame; z < (int)(frame + frameLength); z++) {
+            for (int c = 0; c < m_channels; c++) {
+                QByteArray m_array(arrayWidth, '\x00');
+                for (int i = 0; i < arrayWidth; i++)
+                    m_array[i] = channelarray[z*arrayWidth*m_channels + c*arrayWidth + i];
+                storeIn[z][c] = m_array;
+            }
+        }
+        emit audioThumbReady(storeIn);
+        slotAudioThumbOver();
+    } else {
+        if (m_audioThumbProducer.isRunning()) return;
+        m_audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
+        m_audioThumbProducer.start(QThread::LowestPriority);
+        kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................";
+    }
+}
+
+void KThumb::slotAudioThumbProgress(const int progress)
+{
+    m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress);
+}
+
+void KThumb::slotAudioThumbOver()
+{
+    m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), -1);
+    m_clipManager->endAudioThumbsGeneration(m_id);
+}
+
+void KThumb::askForAudioThumbs(const QString &id)
+{
+    m_clipManager->askForAudioThumb(id);
 }
 
 
+#include "kthumb.moc"