It crashes, but it's the start of a new architecture

Zach Fox committed 10 years ago

Commit b6dd7951 parent ed1d0873 files · +27 −34Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

     }
 }
-uint8_t _currentAnimatedSnapshotFrame;
+#define SNAPSNOT_ANIMATED_WIDTH (900)
-GifWriter _animatedSnapshotGifWriter;
-#define SNAPSNOT_ANIMATED_WIDTH (640)
 #define SNAPSNOT_ANIMATED_FRAMERATE_FPS (20)
 #define SNAPSNOT_ANIMATED_FRAME_DELAY (100/SNAPSNOT_ANIMATED_FRAMERATE_FPS)
 #define SNAPSNOT_ANIMATED_DURATION_SECS (3)
         player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath()));
         player->play();
+        GifWriter _animatedSnapshotGifWriter;
+        uint8_t _currentAnimatedSnapshotFrame;
         QString path;
         // If this is a still snapshot...
         else if (!format.compare("animated"))
         {
             char* cstr;
-            connect(&animatedSnapshotTimer, &QTimer::timeout, this, &Application::animatedSnapshotTimerCb);
             _currentAnimatedSnapshotFrame = 0;
             // File path stuff
             path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
             string fname = path.toStdString();
             cstr = new char[fname.size() + 1];
             strcpy(cstr, fname.c_str());
-            // Start the GIF
-            QImage frame = (getActiveDisplayPlugin()->getScreenshot(1.91)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
-            GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
-            Application::animatedSnapshotTimerCb();
-            animatedSnapshotTimer.start(50);
-        }
-    });
-}
-void Application::animatedSnapshotTimerCb()
+            connect(&animatedSnapshotTimer, &QTimer::timeout, this, [&] {
-{
+                if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
-    if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
+                {
-    {
+                    animatedSnapshotTimer.stop();
-        animatedSnapshotTimer.stop();
+                    GifEnd(&_animatedSnapshotGifWriter);
-        GifEnd(&_animatedSnapshotGifWriter);
+                    emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false);
-        QString path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
+                    return;
-        path.append(QDir::separator());
+                }
-        path.append("test.gif");
-        emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false);
-        return;
-    }
-    QImage frame = (getActiveDisplayPlugin()->getScreenshot(1.91)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
+                QImage frame = (getActiveDisplayPlugin()->getScreenshot(aspectRatio)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
-    uint32_t frameNumBytes = frame.width() * frame.height() * 4;
+                if (_currentAnimatedSnapshotFrame == 0)
-    uint8_t* pixelArray = new uint8_t[frameNumBytes];
+                {
+                    GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
+                }
+                uint32_t frameNumBytes = frame.width() * frame.height() * 4;
+                uint8_t* pixelArray = new uint8_t[frameNumBytes];
-    GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
+                GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
-    _currentAnimatedSnapshotFrame++;
+                _currentAnimatedSnapshotFrame++;
-    delete[frameNumBytes] pixelArray;
+                delete[frameNumBytes] pixelArray;
+            });
+            animatedSnapshotTimer.start(SNAPSNOT_ANIMATED_FRAME_DELAY * 10);
+        }
+    });
 }
 void Application::shareSnapshot(const QString& path) {
     postLambdaEvent([path] {
         // not much to do here, everything is done in snapshot code...