[vlc-commits] [Git][videolan/vlc][master] 2 commits: Remove redundant vout<-"none"

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
531c89a7 by Rémi Denis-Courmont at 2022-02-02T19:14:48+00:00
Remove redundant vout<-"none"

Disabling the window is sufficient here.

- - - - -
201eaaed by Rémi Denis-Courmont at 2022-02-02T19:14:48+00:00
media_player: default module is "any"

Fixes #26565.

- - - - -


1 changed file:

- lib/media_player.c


Changes:

=====================================
lib/media_player.c
=====================================
@@ -1061,9 +1061,9 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp,
     else if ( engine == libvlc_video_engine_disable )
     {
         // use the default display module
-        var_SetString ( mp, "vout", "" );
+        var_SetString ( mp, "vout", "any" );
         // use the default window
-        var_SetString( mp, "window", "");
+        var_SetString( mp, "window", "any" );
     }
     else
         return false;
@@ -1090,15 +1090,14 @@ void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi,
 {
     assert (p_mi != NULL);
 #ifdef __APPLE__
-    var_SetString (p_mi, "dec-dev", "");
-    var_SetString (p_mi, "vout", "");
-    var_SetString (p_mi, "window", "");
+    var_SetString (p_mi, "dec-dev", "any");
+    var_SetString (p_mi, "vout", "any");
+    var_SetString (p_mi, "window", "any");
     var_SetAddress (p_mi, "drawable-nsobject", drawable);
 #else
     (void)drawable;
     libvlc_printerr ("can't set nsobject: APPLE build required");
     assert(false);
-    var_SetString (p_mi, "vout", "none");
     var_SetString (p_mi, "window", "none");
 #endif
 }
@@ -1125,9 +1124,9 @@ void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
 {
     assert (p_mi != NULL);
 
-    var_SetString (p_mi, "dec-dev", "");
-    var_SetString (p_mi, "vout", "");
-    var_SetString (p_mi, "window", drawable ? "embed-xid,any" : "");
+    var_SetString (p_mi, "dec-dev", "any");
+    var_SetString (p_mi, "vout", "any");
+    var_SetString (p_mi, "window", drawable ? "embed-xid,any" : "any");
     var_SetInteger (p_mi, "drawable-xid", drawable);
 }
 
@@ -1147,16 +1146,15 @@ void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
 {
     assert (p_mi != NULL);
 #if defined (_WIN32) || defined (__OS2__)
-    var_SetString (p_mi, "dec-dev", "");
-    var_SetString (p_mi, "vout", "");
+    var_SetString (p_mi, "dec-dev", "any");
+    var_SetString (p_mi, "vout", "any");
     var_SetString (p_mi, "window",
-                   (drawable != NULL) ? "embed-hwnd,any" : "");
+                   (drawable != NULL) ? "embed-hwnd,any" : "any");
     var_SetInteger (p_mi, "drawable-hwnd", (uintptr_t)drawable);
 #else
     (void) drawable;
     libvlc_printerr ("can't set hwnd: WIN32 build required");
     assert(false);
-    var_SetString (p_mi, "vout", "none");
     var_SetString (p_mi, "window", "none");
 #endif
 }
@@ -1188,7 +1186,6 @@ void libvlc_media_player_set_android_context( libvlc_media_player_t *p_mi,
     (void) p_awindow_handler;
     libvlc_printerr ("can't set android context: ANDROID build required");
     assert(false);
-    var_SetString (p_mi, "vout", "none");
     var_SetString (p_mi, "window", "none");
 #endif
 }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/410728742e326a10b6106a7c7917dc05c22f6f6a...201eaaed4ae412edb04d15a6d5105a8768c242a5

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/410728742e326a10b6106a7c7917dc05c22f6f6a...201eaaed4ae412edb04d15a6d5105a8768c242a5
You're receiving this email because of your account on code.videolan.org.