clean up reindentation

[kdenlive] / src / kthumb.cpp

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 0e8435fdc599643356be9664e631ea7d1cb2873c..f4f9529a9cf885dce5101858b76709f12da0b8cd 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -78,7 +78,7 @@ void MyThread::run()
     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++) {
+    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) {
@@ -94,7 +94,7 @@ void MyThread::run()
 
             qint16* m_pcm = mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples);
 
-            for (int c = 0;c < m_channels;c++) {
+            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++) {
@@ -118,26 +118,25 @@ void MyThread::run()
 
 KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) :
         QObject(parent),
-        audioThumbProducer(),
+        m_audioThumbProducer(),
         m_url(url),
         m_thumbFile(),
         m_dar(1),
         m_producer(NULL),
         m_clipManager(clipManager),
-        m_id(id),
-        m_mainFrame(-1)
+        m_id(id)
 {
     m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
-    connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
-    connect(&audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
+    connect(&m_audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
+    connect(&m_audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
 
 }
 
 KThumb::~KThumb()
 {
-    if (audioThumbProducer.isRunning()) {
-        audioThumbProducer.stop_me = true;
-        audioThumbProducer.wait();
+    if (m_audioThumbProducer.isRunning()) {
+        m_audioThumbProducer.stop_me = true;
+        m_audioThumbProducer.wait();
         slotAudioThumbOver();
     }
 }
@@ -185,19 +184,21 @@ QPixmap KThumb::getImage(KUrl url, int width, int height)
 
 void KThumb::extractImage(int frame, int frame2)
 {
+    // kDebug() << "//extract thumb: " << frame << ", " << frame2;
     if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return;
 
     const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
     const int theight = KdenliveSettings::trackheight();
 
-    mlt_image_format format = mlt_image_yuv422;
     if (m_producer->is_blank()) {
         QPixmap pix(twidth, theight);
         pix.fill(Qt::black);
-        emit thumbReady(frame, pix);
+        if (frame != -1) emit thumbReady(frame, pix);
+        if (frame2 != -1) emit thumbReady(frame2, pix);
         return;
     }
     Mlt::Frame *mltFrame;
+    mlt_image_format format = mlt_image_yuv422;
     if (frame != -1) {
         //videoThumbProducer.getThumb(frame);
         m_producer->seek(frame);
@@ -237,7 +238,7 @@ void KThumb::extractImage(int frame, int frame2)
             kDebug() << "///// BROKEN FRAME";
             QPixmap p(twidth, theight);
             p.fill(Qt::red);
-            emit thumbReady(frame, p);
+            emit thumbReady(frame2, p);
             return;
         } else {
             int frame_width = 0;
@@ -271,13 +272,15 @@ QPixmap KThumb::extractImage(int frame, int width, int height)
 //static
 QPixmap KThumb::getImage(KUrl url, int frame, int width, int height)
 {
-    Mlt::Profile profile((char*) KdenliveSettings::current_profile().data());
+    char *tmp = Render::decodedString(KdenliveSettings::current_profile());
+    Mlt::Profile profile(tmp);
+    delete[] tmp;
     QPixmap pix(width, height);
     if (url.isEmpty()) return pix;
 
-    char *tmp = Render::decodedString(url.path());
-    //"<westley><playlist><producer resource=\"" + url.path() + "\" /></playlist></westley>");
-    //Mlt::Producer producer(profile, "westley-xml", tmp);
+    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;
 
@@ -297,13 +300,13 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) {
     Mlt::Profile profile((char*) KdenliveSettings::current_profile().data());
     QPixmap pix(width, height);
     QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
+    QDomElement mlt = doc.createElement("mlt");
     QDomElement play = doc.createElement("playlist");
-    doc.appendChild(westley);
-    westley.appendChild(play);
+    doc.appendChild(mlt);
+    mlt.appendChild(play);
     play.appendChild(doc.importNode(xml, true));
     char *tmp = Render::decodedString(doc.toString());
-    Mlt::Producer producer(profile, "westley-xml", tmp);
+    Mlt::Producer producer(profile, "xml-string", tmp);
     delete[] tmp;
 
     if (producer.is_blank()) {
@@ -429,8 +432,8 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
 */
 void KThumb::stopAudioThumbs()
 {
-    if (audioThumbProducer.isRunning()) {
-        audioThumbProducer.stop_me = true;
+    if (m_audioThumbProducer.isRunning()) {
+        m_audioThumbProducer.stop_me = true;
         slotAudioThumbOver();
     }
 }
@@ -449,7 +452,7 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
         slotAudioThumbOver();
         return;
     }
-    if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking())) {
+    if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) {
         return;
     }
 
@@ -469,8 +472,8 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
             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++) {
+        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];
@@ -480,9 +483,9 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
         emit audioThumbReady(storeIn);
         slotAudioThumbOver();
     } else {
-        if (audioThumbProducer.isRunning()) return;
-        audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
-        audioThumbProducer.start(QThread::LowestPriority);
+        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 << " ................................";
     }
 }