Merged ES_OUT_SET_ACTIVE/_MODE.

[vlc] / src / input / es_out.c

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 1b215f6f42d03902d37c9f728ed03c75b4bdfe62..bb94572046ea32b84d4f20a278c3b22c0cc456dd 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2111,10 +2111,13 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             *pb = EsIsSelected( es );
             return VLC_SUCCESS;
 
-        case ES_OUT_SET_ACTIVE:
+        case ES_OUT_SET_MODE:
         {
-            b = (bool) va_arg( args, int );
-            if( b && !p_sys->b_active && p_sys->i_es > 0 )
+            const int i_mode = va_arg( args, int );
+            assert( i_mode == ES_OUT_MODE_NONE || i_mode == ES_OUT_MODE_ALL ||
+                    i_mode == ES_OUT_MODE_AUTO || i_mode == ES_OUT_MODE_PARTIAL );
+
+            if( i_mode != ES_OUT_MODE_NONE && !p_sys->b_active && p_sys->i_es > 0 )
             {
                 /* XXX Terminate vout if there are tracks but no video one.
                  * This one is not mandatory but is he earliest place where it
@@ -2128,33 +2131,20 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
                 if( i >= p_sys->i_es )
                     input_resource_TerminateVout( p_sys->p_input->p->p_resource );
             }
-            p_sys->b_active = b;
-            return VLC_SUCCESS;
-        }
+            p_sys->b_active = i_mode != ES_OUT_MODE_NONE;
+            p_sys->i_mode = i_mode;
 
-        case ES_OUT_SET_MODE:
-            i = (int) va_arg( args, int );
-            if( i == ES_OUT_MODE_NONE || i == ES_OUT_MODE_ALL ||
-                i == ES_OUT_MODE_AUTO || i == ES_OUT_MODE_PARTIAL )
+            /* Reapply policy mode */
+            for( i = 0; i < p_sys->i_es; i++ )
             {
-                p_sys->i_mode = i;
-
-                /* Reapply policy mode */
-                for( i = 0; i < p_sys->i_es; i++ )
-                {
-                    if( EsIsSelected( p_sys->es[i] ) )
-                    {
-                        EsUnselect( out, p_sys->es[i],
-                                    p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
-                    }
-                }
-                for( i = 0; i < p_sys->i_es; i++ )
-                {
-                    EsOutSelect( out, p_sys->es[i], false );
-                }
-                return VLC_SUCCESS;
+                if( EsIsSelected( p_sys->es[i] ) )
+                    EsUnselect( out, p_sys->es[i],
+                                p_sys->es[i]->p_pgrm == p_sys->p_pgrm );
             }
-            return VLC_EGENERIC;
+            for( i = 0; i < p_sys->i_es; i++ )
+                EsOutSelect( out, p_sys->es[i], false );
+            return VLC_SUCCESS;
+        }
 
         case ES_OUT_SET_ES:
         case ES_OUT_RESTART_ES: