Embed shaders into the binary.

[nageru] / main.cpp

diff --git a/main.cpp b/main.cpp
index 04a7d54ddc43f75491c5edd8175aa7a5e0c86a5a..1d29735f92a2180f8734e4793571a15befbe50c8 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
        main_window.show();
 
        global_httpd->add_endpoint("/queue_status", bind(&MainWindow::get_queue_status, &main_window), HTTPD::NO_CORS_POLICY);
-       global_httpd->start(DEFAULT_HTTPD_PORT);
+       global_httpd->start(global_flags.http_port);
 
        init_jpeg_vaapi();
 
@@ -146,7 +146,8 @@ int main(int argc, char **argv)
 
 void load_existing_frames()
 {
-       DIR *dir = opendir("frames/");
+       string frame_dir = global_flags.working_directory + "/frames";
+       DIR *dir = opendir(frame_dir.c_str());
        if (dir == nullptr) {
                perror("frames/");
                start_pts = 0;
@@ -237,13 +238,13 @@ int record_thread_func()
 
                post_to_main_thread([pkt, pts] {
                        if (pkt.stream_index == 0) {
-                               global_mainwindow->ui->input1_display->setFrame(pkt.stream_index, pts, /*interpolated=*/false);
+                               global_mainwindow->ui->input1_display->setFrame(pkt.stream_index, pts);
                        } else if (pkt.stream_index == 1) {
-                               global_mainwindow->ui->input2_display->setFrame(pkt.stream_index, pts, /*interpolated=*/false);
+                               global_mainwindow->ui->input2_display->setFrame(pkt.stream_index, pts);
                        } else if (pkt.stream_index == 2) {
-                               global_mainwindow->ui->input3_display->setFrame(pkt.stream_index, pts, /*interpolated=*/false);
+                               global_mainwindow->ui->input3_display->setFrame(pkt.stream_index, pts);
                        } else if (pkt.stream_index == 3) {
-                               global_mainwindow->ui->input4_display->setFrame(pkt.stream_index, pts, /*interpolated=*/false);
+                               global_mainwindow->ui->input4_display->setFrame(pkt.stream_index, pts);
                        }
                });