[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: player: use lambda to static initialize smpte cbs

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
4ec531b2 by Thomas Guillem at 2025-12-03T13:44:31+01:00
qt: player: use lambda to static initialize smpte cbs

cf. 1f743fa704be9c2d4cc2f1ecd20d0100a06355ed

- - - - -
3f82b8c2 by Thomas Guillem at 2025-12-03T13:44:31+01:00
qt: player: use lambda to static initialize player cbs

cf. 1f743fa704be9c2d4cc2f1ecd20d0100a06355ed

- - - - -


1 changed file:

- modules/gui/qt/player/player_controller.cpp


Changes:

=====================================
modules/gui/qt/player/player_controller.cpp
=====================================
@@ -1032,43 +1032,40 @@ static void on_preparse_ended_callback(vlc_preparser_req *req,
 
 } //extern "C"
 
-static const struct vlc_player_cbs player_cbs = {
-    on_player_current_media_changed,
-    on_player_state_changed,
-    on_player_error_changed,
-    on_player_buffering,
-    nullptr, // on_player_rate_changed: handled by on_player_timer_update
-    on_player_capabilities_changed,
-    nullptr, // on_player_position_changed: handled by on_player_timer_update
-    nullptr, // on_player_length_changed: handled by on_player_timer_update
-    on_player_track_list_changed,
-    on_player_track_selection_changed,
-    on_player_track_delay_changed,
-    on_player_program_list_changed,
-    on_player_program_selection_changed,
-    on_player_titles_changed,
-    on_player_title_selection_changed,
-    on_player_chapter_selection_changed,
-    on_player_teletext_menu_changed,
-    on_player_teletext_enabled_changed,
-    on_player_teletext_page_changed,
-    on_player_teletext_transparency_changed,
-    on_player_category_delay_changed,
-    on_player_associated_subs_fps_changed,
-    on_player_renderer_changed,
-    on_player_record_changed,
-    on_player_signal_changed,
-    on_player_stats_changed,
-    on_player_atobloop_changed,
-    on_player_media_meta_changed,
-    on_player_media_epg_changed,
-    on_player_subitems_changed,
-    nullptr, // on_media_attachments_added: not used
-    on_player_vout_changed,
-    on_player_corks_changed,
-    on_player_playback_restore_queried,
-    nullptr, // on_stopping_current_media: not used
-};
+static const struct vlc_player_cbs player_cbs = [] {
+    struct vlc_player_cbs cbs {};
+    cbs.on_current_media_changed = on_player_current_media_changed;
+    cbs.on_state_changed = on_player_state_changed;
+    cbs.on_error_changed = on_player_error_changed;
+    cbs.on_buffering_changed = on_player_buffering;
+    cbs.on_capabilities_changed = on_player_capabilities_changed;
+    cbs.on_track_list_changed = on_player_track_list_changed;
+    cbs.on_track_selection_changed = on_player_track_selection_changed;
+    cbs.on_track_delay_changed = on_player_track_delay_changed;
+    cbs.on_program_list_changed = on_player_program_list_changed;
+    cbs.on_program_selection_changed = on_player_program_selection_changed;
+    cbs.on_titles_changed = on_player_titles_changed;
+    cbs.on_title_selection_changed = on_player_title_selection_changed;
+    cbs.on_chapter_selection_changed = on_player_chapter_selection_changed;
+    cbs.on_teletext_menu_changed = on_player_teletext_menu_changed;
+    cbs.on_teletext_enabled_changed = on_player_teletext_enabled_changed;
+    cbs.on_teletext_page_changed = on_player_teletext_page_changed;
+    cbs.on_teletext_transparency_changed = on_player_teletext_transparency_changed;
+    cbs.on_category_delay_changed = on_player_category_delay_changed;
+    cbs.on_associated_subs_fps_changed = on_player_associated_subs_fps_changed;
+    cbs.on_renderer_changed = on_player_renderer_changed;
+    cbs.on_recording_changed = on_player_record_changed;
+    cbs.on_signal_changed = on_player_signal_changed;
+    cbs.on_statistics_changed = on_player_stats_changed;
+    cbs.on_atobloop_changed = on_player_atobloop_changed;
+    cbs.on_media_meta_changed = on_player_media_meta_changed;
+    cbs.on_media_epg_changed = on_player_media_epg_changed;
+    cbs.on_media_subitems_changed = on_player_subitems_changed;
+    cbs.on_vout_changed = on_player_vout_changed;
+    cbs.on_cork_changed = on_player_corks_changed;
+    cbs.on_playback_restore_queried = on_player_playback_restore_queried;
+    return cbs;
+}();
 
 static const vlc_player_vout_cbs player_vout_cbs = []{
     struct vlc_player_vout_cbs cbs{};
@@ -1092,9 +1089,11 @@ static const vlc_player_timer_cbs player_timer_cbs = []{
     return cbs;
 }();
 
-static const struct vlc_player_timer_smpte_cbs player_timer_smpte_cbs = {
-    on_player_timer_smpte_update
-};
+static const struct vlc_player_timer_smpte_cbs player_timer_smpte_cbs = []{
+    struct vlc_player_timer_smpte_cbs cbs {};
+    cbs.on_update = on_player_timer_smpte_update;
+    return cbs;
+}();
 
 // art fetcher callbacks
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d2b42e2cd08808ca01a30a68afcf44f4fcfe14ba...3f82b8c29ab12e81614101745e5abe3a6827fb29

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d2b42e2cd08808ca01a30a68afcf44f4fcfe14ba...3f82b8c29ab12e81614101745e5abe3a6827fb29
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance