[vlc-devel] commit: Cosmetics. (Laurent Aimar )

git version control git at videolan.org
Sat Nov 22 16:38:02 CET 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Nov 22 12:03:18 2008 +0100| [087f8dc2dd0933ce2a7b013a1c9c93d473a4eff4] | committer: Laurent Aimar 

Cosmetics.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=087f8dc2dd0933ce2a7b013a1c9c93d473a4eff4
---

 src/input/input.c          |   31 +++++++++++++++++++++++++++++++
 src/input/input_internal.h |   31 +------------------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 9371a0c..bb15c4a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1398,6 +1398,37 @@ static void End( input_thread_t * p_input )
 /*****************************************************************************
  * Control
  *****************************************************************************/
+void input_ControlPush( input_thread_t *p_input,
+                        int i_type, vlc_value_t *p_val )
+{
+    vlc_mutex_lock( &p_input->p->lock_control );
+    if( i_type == INPUT_CONTROL_SET_DIE )
+    {
+        /* Special case, empty the control */
+        p_input->p->i_control = 1;
+        p_input->p->control[0].i_type = i_type;
+        memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) );
+    }
+    else if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
+    {
+        msg_Err( p_input, "input control fifo overflow, trashing type=%d",
+                 i_type );
+    }
+    else
+    {
+        p_input->p->control[p_input->p->i_control].i_type = i_type;
+        if( p_val )
+            p_input->p->control[p_input->p->i_control].val = *p_val;
+        else
+            memset( &p_input->p->control[p_input->p->i_control].val, 0,
+                    sizeof( vlc_value_t ) );
+
+        p_input->p->i_control++;
+    }
+    vlc_cond_signal( &p_input->p->wait_control );
+    vlc_mutex_unlock( &p_input->p->lock_control );
+}
+
 static inline int ControlPopNoLock( input_thread_t *p_input,
                                     int *pi_type, vlc_value_t *p_val,
                                     mtime_t i_deadline )
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index fe06e7f..7165bd9 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -203,36 +203,7 @@ enum input_control_e
 };
 
 /* Internal helpers */
-static inline void input_ControlPush( input_thread_t *p_input,
-                                      int i_type, vlc_value_t *p_val )
-{
-    vlc_mutex_lock( &p_input->p->lock_control );
-    if( i_type == INPUT_CONTROL_SET_DIE )
-    {
-        /* Special case, empty the control */
-        p_input->p->i_control = 1;
-        p_input->p->control[0].i_type = i_type;
-        memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) );
-    }
-    else if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
-    {
-        msg_Err( p_input, "input control fifo overflow, trashing type=%d",
-                 i_type );
-    }
-    else
-    {
-        p_input->p->control[p_input->p->i_control].i_type = i_type;
-        if( p_val )
-            p_input->p->control[p_input->p->i_control].val = *p_val;
-        else
-            memset( &p_input->p->control[p_input->p->i_control].val, 0,
-                    sizeof( vlc_value_t ) );
-
-        p_input->p->i_control++;
-    }
-    vlc_cond_signal( &p_input->p->wait_control );
-    vlc_mutex_unlock( &p_input->p->lock_control );
-}
+void input_ControlPush( input_thread_t *, int i_type, vlc_value_t * );
 
 /**********************************************************************
  * Item metadata




More information about the vlc-devel mailing list