test: Move testapi.c to /test and use a sample file that is not ogg for basic testing.

[vlc] / src / control / mediacontrol_util.c

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 0bc8f08da8c2ac0725748b1d4b88bbdfda408648..95ee456c701964f38797c89c42b91875bec5e6e1 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -21,7 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "mediacontrol_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/mediacontrol.h>
 
 #include <vlc_interface.h>
@@ -31,6 +34,7 @@
 
 #include <vlc_vout.h>
 #include <vlc_osd.h>
+#include "mediacontrol_internal.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -52,7 +56,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 )
@@ -84,7 +88,7 @@ vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
                 return( value * f_fps / 1000.0 );
         }
         /* Cannot happen */
-        /* See http://catb.org/~esr/jargon/html/entry/can't-happen.html */
+        /* See http://catb.org/~esr/jargon/html/entry/can-t-happen.html */
         break;
 
     case mediacontrol_SampleCount:
@@ -116,14 +120,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 +146,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 +167,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 +187,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 ) );
@@ -199,7 +203,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;
 
@@ -216,12 +220,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;
 
@@ -242,16 +248,27 @@ 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;
@@ -268,22 +285,26 @@ mediacontrol_exception_init( mediacontrol_Exception *exception )
 }
 
 void
-mediacontrol_exception_free( mediacontrol_Exception *exception )
+mediacontrol_exception_cleanup( mediacontrol_Exception *exception )
 {
-    if( ! exception )
-        return;
+    if( exception )
+        free( exception->message );
+}
 
-    free( exception->message );
+void
+mediacontrol_exception_free( mediacontrol_Exception *exception )
+{
+    mediacontrol_exception_cleanup( exception );
     free( 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;