morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

use video_reset for callbacks that exit main_loop (no changes)

Browse Source
This commit is contained in:
F. Duncanh
2026-02-10 14:47:24 -05:00
parent 6a5dfc3fde
commit c7d1ca83f0
2 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/raop.h
View File

@@ -64,7 +64,9 @@ typedef enum reset_type_e {
RESET_TYPE_NOHOLD,
RESET_TYPE_RTP_SHUTDOWN,
RESET_TYPE_HLS_SHUTDOWN,
RESET_TYPE_HLS_EOS
RESET_TYPE_HLS_EOS,
RESET_TYPE_ON_VIDEO_PLAY,
RESET_TYPE_TEARDOWN_110
} reset_type_t;
struct raop_callbacks_s {

72
uxplay.cpp
View File

@@ -2111,20 +2111,18 @@ static bool check_blocked_client(char *deviceid) {
// Server callbacks
//to be simplified
extern "C" void video_reset(void *cls, reset_type_t type) {
LOGD("video_reset");
if (use_video) {
video_renderer_stop();
}
if (hls_support && (type == RESET_TYPE_HLS_SHUTDOWN || type == RESET_TYPE_NOHOLD)) {
switch (type) {
case RESET_TYPE_NOHOLD:
if (hls_support) {
url.erase();
raop_destroy_airplay_video(raop, -1);
}
if (type == RESET_TYPE_HLS_SHUTDOWN) {
raop_remove_hls_connections(raop);
preserve_connections = true;
}
if (use_video && (type == RESET_TYPE_NOHOLD || type == RESET_TYPE_HLS_EOS)) {
if (use_video) {
video_renderer_stop();
/* reset the video renderer immediately to avoid a timing issue if we wait for main_loop to reset */
video_renderer_destroy();
video_renderer_init(render_logger, server_name.c_str(), videoflip, video_parser.c_str(), rtp_pipeline.c_str(),
@@ -2134,12 +2132,57 @@ extern "C" void video_reset(void *cls, reset_type_t type) {
video_renderer_start();
close_window = false; // we already closed the window
}
if (type == RESET_TYPE_NOHOLD) {
preserve_connections = false; //we already closed all other connections
}
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_RTP_SHUTDOWN:
if (use_video) {
video_renderer_stop();
}
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_HLS_SHUTDOWN:
if (use_video) {
video_renderer_stop();
}
if (hls_support) {
url.erase();
raop_destroy_airplay_video(raop, -1);
}
raop_remove_hls_connections(raop);
preserve_connections = true;
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_HLS_EOS:
if (use_video) {
/* reset the video renderer immediately to avoid a timing issue if we wait for main_loop to reset */
video_renderer_stop();
video_renderer_destroy();
video_renderer_init(render_logger, server_name.c_str(), videoflip, video_parser.c_str(), rtp_pipeline.c_str(),
video_decoder.c_str(), video_converter.c_str(), videosink.c_str(),
videosink_options.c_str(), fullscreen, video_sync, h265_support,
render_coverart, playbin_version, NULL);
video_renderer_start();
close_window = false; // we already closed the window
}
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_TEARDOWN_110:
if (use_video) {
video_renderer_stop();
}
relaunch_video = true;
break;
case RESET_TYPE_ON_VIDEO_PLAY:
break;
default:
g_assert(FALSE);
break;
}
reset_loop = true;
}
@@ -2241,8 +2284,7 @@ extern "C" void conn_reset (void *cls, int reason) {
extern "C" void conn_teardown(void *cls, bool *teardown_96, bool *teardown_110) {
if (*teardown_110 && close_window) {
relaunch_video = true;
reset_loop = true;
video_reset(cls,RESET_TYPE_TEARDOWN_110);
}
}
@@ -2582,7 +2624,7 @@ extern "C" void on_video_play(void *cls, const char* location, const float start
relaunch_video = true;
preserve_connections = true;
LOGI("********************on_video_play: location = %s*** start position %f ********************", url.c_str(), start_position);
reset_loop = true;
video_reset(cls, RESET_TYPE_ON_VIDEO_PLAY);
}
extern "C" void on_video_scrub(void *cls, const float position) {