Allow refreshing usb devices

Author: floppyhammer

3rd/flint_gui

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20)
 # This should go before project declaration.
 if (WIN32)
     message("[aviateur] <${VCPKG_ROOT}> should be the vcpkg dir in which you have installed the dependency libs.")
-    set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+    set(CMAKE_TOOLCHAIN_FILE "D:/Dev/vcpkg/scripts/buildsystems/vcpkg.cmake")
 endif ()
 
 project(aviateur
@@ -27,7 +27,7 @@ file(GLOB_RECURSE SRC_LIST
         src/*.h
 )
 
-file(COPY gs.key openipc-logo-white.svg DESTINATION ${CMAKE_BINARY_DIR})
+file(COPY gs.key assets DESTINATION ${CMAKE_BINARY_DIR})
 
 add_executable(${PROJECT_NAME} ${SRC_LIST})
 

CMakeLists.txt

@@ -0,0 +1 @@
+Some icons are from [Godot](https://github.com/godotengine/godot).

assets/COPYRIGHT.md

@@ -190,6 +190,7 @@ class GuiInterface {
     std::vector<toolkit::AnyCallable<void>> rtpStreamCallbacks;
     std::vector<toolkit::AnyCallable<void>> bitrateUpdateCallbacks;
     std::vector<toolkit::AnyCallable<void>> decoderReadyCallbacks;
+    std::vector<toolkit::AnyCallable<void>> dongleUpdateCallbacks;
 
     void EmitLog(LogLevel level, std::string msg) {
         for (auto &callback : logCallbacks) {
@@ -269,4 +270,14 @@ class GuiInterface {
             }
         }
     }
+
+    void EmitDongleUpdate() {
+        for (auto &callback : dongleUpdateCallbacks) {
+            try {
+                callback.operator()<>();
+            } catch (std::bad_any_cast &) {
+                Instance().PutLog(LogLevel::Error, "Mismatched signal argument types!");
+            }
+        }
+    }
 };

assets/CaptureImage.svg

@@ -119,7 +119,7 @@ class MyRenderRect : public Flint::TextureRect {
         auto vbox = std::make_shared<Flint::VBoxContainer>();
         collapse_panel_->add_child(vbox);
 
-        logo_ = std::make_shared<Flint::VectorImage>("openipc-logo-white.svg");
+        logo_ = std::make_shared<Flint::VectorImage>("assets/openipc-logo-white.svg");
         texture = logo_;
 
         auto render_server = Flint::RenderServer::get_singleton();
@@ -187,6 +187,8 @@ class MyRenderRect : public Flint::TextureRect {
         auto capture_button = std::make_shared<Flint::Button>();
         vbox->add_child(capture_button);
         capture_button->set_text("Capture Frame");
+        auto icon = std::make_shared<Flint::VectorImage>("assets/CaptureImage.svg");
+        capture_button->set_icon_normal(icon);
         auto capture_callback = [this] {
             auto output_file = player_->captureJpeg();
             if (output_file.empty()) {
@@ -199,6 +201,8 @@ class MyRenderRect : public Flint::TextureRect {
 
         auto record_button = std::make_shared<Flint::Button>();
         vbox->add_child(record_button);
+        auto icon2 = std::make_shared<Flint::VectorImage>("assets/RecordVideo.svg");
+        record_button->set_icon_normal(icon2);
         record_button->set_text("Record MP4");
 
         auto record_button_raw = record_button.get();
@@ -322,7 +326,7 @@ class MyRenderRect : public Flint::TextureRect {
     void custom_update(double delta) override {
         player_->update(delta);
 
-        hw_status_label_->set_text("Hw Acc: " + std::string(player_->isHardwareAccelerated() ? "ON" : "OFF"));
+        hw_status_label_->set_text("Hw Decoding: " + std::string(player_->isHardwareAccelerated() ? "ON" : "OFF"));
 
         display_fps_label_->set_text("Display FPS: " + std::to_string(Flint::Engine::get_singleton()->get_fps_int()));
 
@@ -384,24 +388,29 @@ class MyControlPanel : public Flint::Panel {
     std::shared_ptr<Flint::MenuButton> dongle_menu_button_;
     std::shared_ptr<Flint::MenuButton> channel_button_;
     std::shared_ptr<Flint::MenuButton> channel_width_button_;
+    std::shared_ptr<Flint::Button> refresh_dongle_button_;
 
-    std::string vidPid = "";
+    std::string vidPid;
     int channel = 173;
     int channelWidthMode = 0;
     std::string keyPath = DEFAULT_KEY_NAME;
     std::string codec = "AUTO";
 
     std::shared_ptr<Flint::Button> play_button_;
 
-    void update_dongle_list(Flint::PopupMenu &menu) {
+    void update_dongle_list() {
+        auto menu = dongle_menu_button_->get_popup_menu().lock();
+
         auto dongles = GuiInterface::GetDongleList();
 
+        menu->clear_items();
+
         bool previous_device_exists = false;
-        for (auto dongle : dongles) {
+        for (const auto& dongle : dongles) {
             if (vidPid == dongle) {
                 previous_device_exists = true;
             }
-            menu.create_item(dongle);
+            menu->create_item(dongle);
         }
 
         if (!previous_device_exists) {
@@ -458,12 +467,19 @@ class MyControlPanel : public Flint::Panel {
             dongle_menu_button_->container_sizing.flag_h = Flint::ContainerSizingFlag::Fill;
             hbox_container->add_child(dongle_menu_button_);
 
-            auto dongle_menu = dongle_menu_button_->get_popup_menu();
-
             auto callback = [this](uint32_t) { vidPid = dongle_menu_button_->get_selected_item_text(); };
             dongle_menu_button_->connect_signal("item_selected", callback);
 
-            update_dongle_list(*dongle_menu.lock());
+            update_dongle_list();
+
+            refresh_dongle_button_ = std::make_shared<Flint::Button>();
+            auto icon = std::make_shared<Flint::VectorImage>("assets/Refresh.svg");
+            refresh_dongle_button_->set_icon_normal(icon);
+            refresh_dongle_button_->set_text("");
+            hbox_container->add_child(refresh_dongle_button_);
+
+            auto callback2 = [this]() { update_dongle_list(); };
+            refresh_dongle_button_->connect_signal("pressed", callback2);
         }
 
         {
@@ -605,6 +621,9 @@ int main() {
     // Redirect standard output to a file
     freopen("last_run_log.txt", "w", stdout);
 
+    // Initialize the default libusb context.
+    int rc = libusb_init(NULL);
+
     Flint::Logger::set_module_level("Aviateur", Flint::Logger::Level::Info);
 
     auto logCallback = [](LogLevel level, std::string msg) {
@@ -677,5 +696,7 @@ int main() {
 
     delete app;
 
+    libusb_exit(NULL);
+
     return EXIT_SUCCESS;
 }

assets/FPS.svg

@@ -21,8 +21,8 @@
 std::vector<std::string> WFBReceiver::GetDongleList() {
     std::vector<std::string> list;
 
-    libusb_context *find_ctx;
     // Initialize libusb
+    libusb_context *find_ctx;
     libusb_init(&find_ctx);
 
     // Get list of USB devices
@@ -88,25 +88,6 @@ bool WFBReceiver::Start(const std::string &vidPid, uint8_t channel, int channelW
 
     auto logger = std::make_shared<Logger>();
 
-    auto logCallback = [logger](LogLevel level, const std::string &msg) {
-        switch (level) {
-            case LogLevel::Info: {
-                logger->info(msg);
-            } break;
-            case LogLevel::Debug: {
-                logger->debug(msg);
-            } break;
-            case LogLevel::Warn: {
-                logger->warn(msg);
-            } break;
-            case LogLevel::Error: {
-                logger->error(msg);
-            } break;
-            default:;
-        }
-    };
-    // GuiInterface::Instance().logCallbacks.emplace_back(logCallback);
-
     int rc = libusb_init(&ctx);
     if (rc < 0) {
         GuiInterface::Instance().PutLog(LogLevel::Error, "Failed to initialize libusb");
@@ -118,7 +99,7 @@ bool WFBReceiver::Start(const std::string &vidPid, uint8_t channel, int channelW
     devHandle = libusb_open_device_with_vid_pid(ctx, wifiDeviceVid, wifiDevicePid);
     if (devHandle == nullptr) {
         GuiInterface::Instance().PutLog(LogLevel::Error,
-                                        "Cannot find device {:04x}:{:04x}",
+                                        "Cannot open device {:04x}:{:04x}",
                                         wifiDeviceVid,
                                         wifiDevicePid);
         libusb_exit(ctx);
@@ -137,7 +118,7 @@ bool WFBReceiver::Start(const std::string &vidPid, uint8_t channel, int channelW
         return false;
     }
 
-    usbThread = std::make_shared<std::thread>([=]() {
+    usbThread = std::make_shared<std::thread>([=, this]() {
         WiFiDriver wifi_driver{logger};
         try {
             rtlDevice = wifi_driver.CreateRtlDevice(devHandle);
@@ -161,7 +142,7 @@ bool WFBReceiver::Start(const std::string &vidPid, uint8_t channel, int channelW
             GuiInterface::Instance().PutLog(LogLevel::Error, "Failed to release interface");
         }
 
-        logger->info("USB thread stopped");
+        GuiInterface::Instance().PutLog(LogLevel::Info, "USB thread stopped");
 
         libusb_close(devHandle);
         libusb_exit(ctx);