Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases 1 Wiki Activity

fix sdl camera destruction order
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / windows (push) Has been cancelled
Details
ContinuousDelivery / windows-asan (push) Has been cancelled
Details
ContinuousIntegration / linux (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / macos (push) Has been cancelled
Details
ContinuousIntegration / windows (push) Has been cancelled
Details
ContinuousDelivery / dumpsyms (push) Has been cancelled
Details
ContinuousDelivery / release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Green Sky 2025-04-04 14:33:05 +02:00
parent a800b82cff
commit 9b40c417a2
No known key found for this signature in database
GPG Key ID: DBE05085D874AB4A
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main_screen.cpp
View File

@ -39,6 +39,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_,
rmm(cs), rmm(cs),
msnj{cs, os, {}, {}}, msnj{cs, os, {}, {}},
mts(rmm), mts(rmm),
sdlvis(os),
sm(os), sm(os),
tc(conf, save_path, save_password), tc(conf, save_path, save_password),
tel(tc, std::cout), tel(tc, std::cout),
@ -69,8 +70,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_,
tdch(tpi), tdch(tpi),
tnui(tpi), tnui(tpi),
smui(os, sm), smui(os, sm),
dvt(os, sm, sdlrtu), dvt(os, sm, sdlrtu)
sdlvis(os)
{ {
tel.subscribeAll(); tel.subscribeAll();

5
src/main_screen.hpp
View File

@ -37,6 +37,7 @@
#include "./tox_dht_cap_histo.hpp" #include "./tox_dht_cap_histo.hpp"
#include "./tox_netprof_ui.hpp" #include "./tox_netprof_ui.hpp"
#include "./tox_friend_faux_offline_messaging.hpp" #include "./tox_friend_faux_offline_messaging.hpp"
#include "./frame_streams/sdl/sdl_video_input_service.hpp"
#include "./stream_manager_ui.hpp" #include "./stream_manager_ui.hpp"
#include "./debug_video_tap.hpp" #include "./debug_video_tap.hpp"
@ -45,8 +46,6 @@
#include "./tox_av_voip_model.hpp" #include "./tox_av_voip_model.hpp"
#endif #endif
#include "./frame_streams/sdl/sdl_video_input_service.hpp"
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
@ -67,6 +66,7 @@ struct MainScreen final : public Screen {
MessageSerializerNJ msnj; MessageSerializerNJ msnj;
MessageTimeSort mts; MessageTimeSort mts;
SDLVideoInputService sdlvis; // sm ends the threads and closes the devices
StreamManager sm; StreamManager sm;
ToxClient tc; ToxClient tc;
@ -105,7 +105,6 @@ struct MainScreen final : public Screen {
ToxNetprofUI tnui; ToxNetprofUI tnui;
StreamManagerUI smui; StreamManagerUI smui;
DebugVideoTap dvt; DebugVideoTap dvt;
SDLVideoInputService sdlvis;
PluginManager pm; // last, so it gets destroyed first PluginManager pm; // last, so it gets destroyed first