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 d0c0ada194dae78f6f7ec979757411a531c76f96..8fd45a642d59bb8318d5b7901c25dbb027f7ae7d 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -21,21 +21,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <mediacontrol_internal.h>
 #include <vlc/mediacontrol.h>
 
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
+#include <vlc_interface.h>
+#include <vlc_aout.h>
+#include <vlc_input.h>
 #include <vlc_demux.h>
 
+#include <vlc_vout.h>
 #include <vlc_osd.h>
-
-#define HAS_SNAPSHOT 1
-
-#ifdef HAS_SNAPSHOT
-#include <snapshot.h>
-#endif
+#include "mediacontrol_internal.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -54,10 +49,10 @@
 #    include <sys/types.h>
 #endif
 
-#define RAISE( c, m )  exception->code = c; \
-                       exception->message = strdup(m);
+/* 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 )
@@ -83,7 +78,7 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
         {
             double f_fps;
 
-            if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+            if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
                 return 0;
             else
                 return( value * f_fps / 1000.0 );
@@ -96,7 +91,8 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
     {
         double f_fps;
 
-       if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+        if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) ||
+                                f_fps < 0.1 )
             return 0;
 
         if( to == mediacontrol_ByteCount )
@@ -120,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;
@@ -146,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 ) );
@@ -167,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 );
@@ -187,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 ) );
@@ -203,7 +199,7 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P
 }
 
 mediacontrol_RGBPicture*
-mediacontrol_RGBPicture__alloc( int datasize )
+private_mediacontrol_RGBPicture__alloc( int datasize )
 {
     mediacontrol_RGBPicture* pic;
 
@@ -220,12 +216,14 @@ void
 mediacontrol_RGBPicture__free( mediacontrol_RGBPicture* pic )
 {
     if( pic )
+    {
         free( pic->data );
-    free( pic );
+        free( pic );
+    }
 }
 
 mediacontrol_PlaylistSeq*
-mediacontrol_PlaylistSeq__alloc( int size )
+private_mediacontrol_PlaylistSeq__alloc( int size )
 {
     mediacontrol_PlaylistSeq* ps;
 
@@ -246,22 +244,40 @@ mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq* ps )
         int i;
         for( i = 0 ; i < ps->size ; i++ )
             free( ps->data[i] );
+        free( ps->data );
+        free( ps );
     }
-    free( ps->data );
-    free( ps );
 }
 
+void
+mediacontrol_StreamInformation__free( mediacontrol_StreamInformation* p_si )
+{
+  if( p_si )
+  {
+      free( p_si->url );
+      free( p_si );
+  }
+}
+
+
 mediacontrol_Exception*
+mediacontrol_exception_create( void )
+{
+    mediacontrol_Exception* exception;
+ 
+    exception = ( mediacontrol_Exception* )malloc( sizeof( mediacontrol_Exception ) );
+    mediacontrol_exception_init( exception );
+    return exception;
+}
+
+void
 mediacontrol_exception_init( mediacontrol_Exception *exception )
 {
-    if( exception == NULL )
+    if( exception )
     {
-        exception = ( mediacontrol_Exception* )malloc( sizeof( mediacontrol_Exception ) );
+        exception->code = 0;
+        exception->message = NULL;
     }
-
-    exception->code = 0;
-    exception->message = NULL;
-    return exception;
 }
 
 void
@@ -275,12 +291,12 @@ mediacontrol_exception_free( mediacontrol_Exception *exception )
 }
 
 mediacontrol_RGBPicture*
-_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, vlc_int64_t l_date,
+private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, vlc_int64_t l_date,
                                 char* p_data, int i_datasize )
 {
     mediacontrol_RGBPicture *retval;
 
-    retval = mediacontrol_RGBPicture__alloc( i_datasize );
+    retval = private_mediacontrol_RGBPicture__alloc( i_datasize );
     if( retval )
     {
         retval->width  = i_width;