Fix some memory leaks on export.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 1ed95c3dc5ab8ed27577510eda88577d6e5efdb5..154537c7c4c05791c8532d8f35eb29536d3a46a2 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -514,6 +514,7 @@ void MainWindow::stop_clicked()
        fake_clip.pts_out = 0;
        playlist_clips->set_progress({});
        live_player->play(fake_clip);
+       ui->stop_btn->setEnabled(false);
 }
 
 void MainWindow::live_player_done()
@@ -523,21 +524,6 @@ void MainWindow::live_player_done()
        ui->stop_btn->setEnabled(false);
 }
 
-static string format_duration(double t)
-{
-       int t_ms = lrint(t * 1e3);
-
-       int ms = t_ms % 1000;
-       t_ms /= 1000;
-       int s = t_ms % 60;
-       t_ms /= 60;
-       int m = t_ms;
-
-       char buf[256];
-       snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms);
-       return buf;
-}
-
 void MainWindow::live_player_clip_progress(const map<uint64_t, double> &progress, double time_remaining)
 {
        playlist_clips->set_progress(progress);
@@ -1035,6 +1021,9 @@ void MainWindow::highlight_camera_input(int stream_idx)
 void MainWindow::set_output_status(const string &status)
 {
        ui->live_label->setText(QString::fromStdString("Current output (" + status + ")"));
+       if (live_player != nullptr) {
+               live_player->set_pause_status(status);
+       }
 
        lock_guard<mutex> lock(queue_status_mu);
        queue_status = status;