input: treat negative deadline as no deadline in ControlPop()

2f4d5964 · Rémi Denis-Courmont · 43464204 · 2f4d5964
Commit 2f4d5964 authored Feb 21, 2015 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

No files found.
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1482,6 +1482,8 @@ static inline int ControlPop( input_thread_t *p_input,
            return VLC_EGENERIC;
        }

+        if( i_deadline >= 0 )
+        {
            if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control,
                                    i_deadline ) )
            {
@@ -1489,6 +1491,9 @@ static inline int ControlPop( input_thread_t *p_input,
                return VLC_EGENERIC;
            }
        }
+        else
+            vlc_cond_wait( &p_sys->wait_control, &p_sys->lock_control );
+    }

    /* */
    const int i_index = ControlGetReducedIndexLocked( p_input );