Qt: CaptureOpenPanel: check and prefill with usual devices

[vlc] / modules / stream_out / display.c

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 997b49f707c6f851a186ffc2fb89be9ac9e4ca50..a7cf827d71177cdbb7b6b82dd63b76cd7730f854 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -50,21 +50,21 @@ static void Close( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-display-"
 
-vlc_module_begin();
-    set_shortname( N_("Display"));
-    set_description( N_("Display stream output") );
-    set_capability( "sout stream", 50 );
-    add_shortcut( "display" );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_STREAM );
-    add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
-              AUDIO_LONGTEXT, true );
-    add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
-              VIDEO_LONGTEXT, true );
+vlc_module_begin ()
+    set_shortname( N_("Display"))
+    set_description( N_("Display stream output") )
+    set_capability( "sout stream", 50 )
+    add_shortcut( "display" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+    add_bool( SOUT_CFG_PREFIX "audio", true, NULL, AUDIO_TEXT,
+              AUDIO_LONGTEXT, true )
+    add_bool( SOUT_CFG_PREFIX "video", true, NULL, VIDEO_TEXT,
+              VIDEO_LONGTEXT, true )
     add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
-                 DELAY_LONGTEXT, true );
-    set_callbacks( Open, Close );
-vlc_module_end();
+                 DELAY_LONGTEXT, true )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -206,17 +206,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 
         if( id->p_dec && p_buffer->i_buffer > 0 )
         {
-            if( p_buffer->i_dts <= 0 )
-                p_buffer->i_dts= 0;
+            if( p_buffer->i_dts <= VLC_TS_INVALID )
+                p_buffer->i_dts = 0;
             else
                 p_buffer->i_dts += p_sys->i_delay;
 
-            if( p_buffer->i_pts <= 0 )
-                p_buffer->i_pts= 0;
+            if( p_buffer->i_pts <= VLC_TS_INVALID )
+                p_buffer->i_pts = 0;
             else
                 p_buffer->i_pts += p_sys->i_delay;
 
-            input_DecoderDecode( id->p_dec, p_buffer );
+            input_DecoderDecode( id->p_dec, p_buffer, false );
         }
 
         p_buffer = p_next;