From 38d822620441b6b42968e20e3c35206300d0277c Mon Sep 17 00:00:00 2001
From: ArsenArsen <ArsenArsen@users.noreply.github.com>
Date: Wed, 5 Jul 2017 12:15:14 +0200
Subject: [PATCH] Add the ability to abort recording

Fixes #14
---
 mainwindow.cpp                    | 11 +++++++++--
 recording/recordingcontroller.cpp | 24 ++++++++++++++++++++++++
 recording/recordingcontroller.hpp |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9d9e0eb..3589a58 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -55,6 +55,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     QAction *picker = new QAction("Show color picker", this);
     QAction *rec = new QAction("Record screen", this);
     QAction *recoff = new QAction("Stop recording", this);
+    QAction *recabort = new QAction("Abort recording", this);
     menu->addActions({ quit, shtoggle, picker });
     menu->addSeparator();
     menu->addActions({ fullscreen, area, active });
@@ -62,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     menu->addAction(area);
 #endif
     menu->addSeparator();
-    menu->addActions({ rec, recoff });
+    menu->addActions({ rec, recoff, recabort });
     connect(quit, &QAction::triggered, this, &MainWindow::quit);
     connect(shtoggle, &QAction::triggered, this, &MainWindow::toggleVisible);
     connect(picker, &QAction::triggered, [] { ColorPickerScene::showPicker(); });
@@ -73,7 +74,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     connect(fullscreen, &QAction::triggered, this, [] { screenshotter::fullscreenDelayed(); });
     connect(area, &QAction::triggered, this, [] { screenshotter::areaDelayed(); });
     connect(rec, &QAction::triggered, this, &MainWindow::rec);
-    connect(recoff, &QAction::triggered, [this] { controller->end(); });
+    connect(recoff, &QAction::triggered, controller, &RecordingController::end);
+    connect(recabort, &QAction::triggered, controller, &RecordingController::abort);
     connect(ui->settings, &QPushButton::clicked, this, &MainWindow::on_actionSettings_triggered);
 
     tray->setContextMenu(menu);
@@ -83,6 +85,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     addHotkey("active", [] { screenshotter::active(); });
     addHotkey("picker", [] { ColorPickerScene::showPicker(); });
     addHotkey("recordingstop", [&] { controller->end(); });
+    addHotkey("recordingabort", [&] { controller->abort(); });
     addHotkey("recordingstart", [&] { this->rec(); });
 
     auto errors = UploaderSingleton::inst().errors();
@@ -163,3 +166,7 @@ void MainWindow::on_actionAbout_triggered() {
 void MainWindow::on_actionActive_window_triggered() {
     screenshotter::activeDelayed();
 }
+
+void MainWindow::on_actionAbort_triggered() {
+    controller->abort();
+}
diff --git a/recording/recordingcontroller.cpp b/recording/recordingcontroller.cpp
index 5320e70..3f55fbc 100644
--- a/recording/recordingcontroller.cpp
+++ b/recording/recordingcontroller.cpp
@@ -56,6 +56,30 @@ bool RecordingController::end() {
     return true;
 }
 
+bool RecordingController::abort() {
+    emit ended();
+    if (!isRunning()) return false;
+    area = QRect();
+    if (preview) {
+        preview->close();
+        preview->deleteLater();
+    }
+
+    preview = 0;
+    WorkerContext *c = new WorkerContext;
+    c->consumer = [&](QImage) {
+        _context->finalizer();
+        _context->postUploadTask();
+    };
+    c->targetFormat = QImage::Format_Alpha8;
+    c->pixmap = QPixmap(0, 0);
+    Worker::queue(c);
+
+    frame = 0;
+    time = 0;
+    return true;
+}
+
 void RecordingController::queue(_QueueContext arr) {
     QMutexLocker l(&lock);
     uploadQueue.enqueue(arr);
diff --git a/recording/recordingcontroller.hpp b/recording/recordingcontroller.hpp
index 96044d5..e4792c3 100644
--- a/recording/recordingcontroller.hpp
+++ b/recording/recordingcontroller.hpp
@@ -38,6 +38,7 @@ public slots:
     // Returns false if not running
     bool end();
     void queue(_QueueContext arr);
+    bool abort();
 private slots:
     void timeout();
     void startWithArea(QRect newArea);