Removes trailing spaces. Removes tabs.

[vlc] / src / control / mediacontrol_util.c

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 818d625013f7de576b8e3c89b0b00c8b3e242567..8fd45a642d59bb8318d5b7901c25dbb027f7ae7d 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "mediacontrol_internal.h"
 #include <vlc/mediacontrol.h>
 
 #include <vlc_interface.h>
@@ -31,6 +30,7 @@
 
 #include <vlc_vout.h>
 #include <vlc_osd.h>
+#include "mediacontrol_internal.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -52,7 +52,7 @@
 /* FIXME: Need to stop accessing private input structures !! */
 #include "input/input_internal.h"
 
-vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
+vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input,
                                        mediacontrol_PositionKey from,
                                        mediacontrol_PositionKey to,
                                        vlc_int64_t value )
@@ -116,14 +116,14 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
 
 //         if( p_input->stream.i_mux_rate == 0 )
 //             return 0;
-// 
+//
 //         /* Convert an offset into milliseconds. Taken from input_ext-intf.c.
 //            The 50 hardcoded constant comes from the definition of i_mux_rate :
 //            i_mux_rate : the rate we read the stream (in units of 50 bytes/s) ;
 //            0 if undef */
 //         if( to == mediacontrol_MediaTime )
 //             return ( vlc_int64_t )( 1000 * value / 50 / p_input->stream.i_mux_rate );
-// 
+//
 //         if( to == mediacontrol_SampleCount )
 //         {
 //             double f_fps;
@@ -142,12 +142,12 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
 /* Converts a mediacontrol_Position into a time in microseconds in
    movie clock time */
 vlc_int64_t
-mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_Position * pos )
+private_mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_Position * pos )
 {
     switch( pos->origin )
     {
     case mediacontrol_AbsolutePosition:
-        return ( 1000 * mediacontrol_unit_convert( p_input,
+        return ( 1000 * private_mediacontrol_unit_convert( p_input,
                                                    pos->key, /* from */
                                                    mediacontrol_MediaTime,  /* to */
                                                    pos->value ) );
@@ -163,7 +163,7 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P
             var_Get( p_input, "time", &val );
         }
 
-        l_pos = 1000 * mediacontrol_unit_convert( p_input,
+        l_pos = 1000 * private_mediacontrol_unit_convert( p_input,
                                                   pos->key,
                                                   mediacontrol_MediaTime,
                                                   pos->value );
@@ -183,7 +183,7 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P
 
         if( val.i_time > 0)
         {
-            l_pos = ( 1000 * mediacontrol_unit_convert( p_input,
+            l_pos = ( 1000 * private_mediacontrol_unit_convert( p_input,
                                                         pos->key,
                                                         mediacontrol_MediaTime,
                                                         pos->value ) );
@@ -264,7 +264,7 @@ mediacontrol_Exception*
 mediacontrol_exception_create( void )
 {
     mediacontrol_Exception* exception;
-    
+ 
     exception = ( mediacontrol_Exception* )malloc( sizeof( mediacontrol_Exception ) );
     mediacontrol_exception_init( exception );
     return exception;