Now that sout-all is default, make --programs take precedence over it

fafb5347 · Rafaël Carré · 9a76128f · fafb5347
Commit fafb5347 authored Aug 21, 2014 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

src/input/input.c src/input/input.c +4 -5

No files found.
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1126,11 +1126,6 @@ static void InitPrograms( input_thread_t * p_input )
    {
        char *prgms;

-        if( var_GetBool( p_input, "sout-all" ) )
-        {
-            i_es_out_mode = ES_OUT_MODE_ALL;
-        }
-        else
        if( (prgms = var_GetNonEmptyString( p_input, "programs" )) != NULL )
        {
            char *buf;
@@ -1150,6 +1145,10 @@ static void InitPrograms( input_thread_t * p_input )

            free( prgms );
        }
+        else if( var_GetBool( p_input, "sout-all" ) )
+        {
+            i_es_out_mode = ES_OUT_MODE_ALL;
+        }
    }
    es_out_SetMode( p_input->p->p_es_out, i_es_out_mode );