rtmp_amf_flv: Try and refactor a bit by reducing overly long

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index 6f853f8e62a84d0ad4a33dc0e50b0332d010451e..9a893b012a0df495ceea67175f4f435ca26bd65f 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -25,6 +25,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_media.h>
 #include <vlc/libvlc_media_list.h> // For the subitems, here for convenience
@@ -245,14 +247,16 @@ libvlc_media_t * libvlc_media_new_from_input_item(
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e, "No input item given" );
+        libvlc_exception_raise( p_e );
+        libvlc_printerr( "No input item given" );
         return NULL;
     }
 
     p_md = malloc( sizeof(libvlc_media_t) );
     if( !p_md )
     {
-        libvlc_exception_raise( p_e, "Not enough memory" );
+        libvlc_exception_raise( p_e );
+        libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
@@ -302,7 +306,8 @@ libvlc_media_t * libvlc_media_new(
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e, "Can't create md's input_item" );
+        libvlc_exception_raise( p_e );
+        libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
@@ -330,7 +335,8 @@ libvlc_media_t * libvlc_media_new_as_node(
 
     if (!p_input_item)
     {
-        libvlc_exception_raise( p_e, "Can't create md's input_item" );
+        libvlc_exception_raise( p_e );
+        libvlc_printerr( "Not enough memory" );
         return NULL;
     }
 
@@ -352,10 +358,8 @@ libvlc_media_t * libvlc_media_new_as_node(
  **************************************************************************/
 void libvlc_media_add_option(
                                    libvlc_media_t * p_md,
-                                   const char * psz_option,
-                                   libvlc_exception_t *p_e )
+                                   const char * psz_option )
 {
-    VLC_UNUSED(p_e);
     input_item_AddOption( p_md->p_input_item, psz_option,
                           VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
 }
@@ -366,10 +370,8 @@ void libvlc_media_add_option(
 void libvlc_media_add_option_flag(
                                    libvlc_media_t * p_md,
                                    const char * ppsz_option,
-                                   libvlc_media_option_t i_flags,
-                                   libvlc_exception_t *p_e )
+                                   libvlc_media_option_t i_flags )
 {
-    VLC_UNUSED(p_e);
     input_item_AddOption( p_md->p_input_item, ppsz_option,
                           i_flags );
 }
@@ -411,9 +413,7 @@ void libvlc_media_release( libvlc_media_t *p_md )
  **************************************************************************/
 void libvlc_media_retain( libvlc_media_t *p_md )
 {
-    if (!p_md)
-        return;
-
+    assert (p_md);
     p_md->i_refcount++;
 }
 
@@ -431,10 +431,9 @@ libvlc_media_duplicate( libvlc_media_t *p_md_orig )
  * Get mrl from a media descriptor object
  **************************************************************************/
 char *
-libvlc_media_get_mrl( libvlc_media_t * p_md,
-                                 libvlc_exception_t * p_e )
+libvlc_media_get_mrl( libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
+    assert( p_md );
     return input_item_GetURI( p_md->p_input_item );
 }
 
@@ -442,13 +441,11 @@ libvlc_media_get_mrl( libvlc_media_t * p_md,
  * Getter for meta information
  **************************************************************************/
 
-char * libvlc_media_get_meta( libvlc_media_t *p_md,
-                                         libvlc_meta_t e_meta,
-                                         libvlc_exception_t *p_e )
+char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta )
 {
     char * psz_meta;
-    VLC_UNUSED(p_e);
 
+    assert( p_md );
     /* XXX: locking */
 
     preparse_if_needed( p_md );
@@ -479,10 +476,9 @@ char * libvlc_media_get_meta( libvlc_media_t *p_md,
  **************************************************************************/
 
 libvlc_state_t
-libvlc_media_get_state( libvlc_media_t *p_md,
-                                   libvlc_exception_t *p_e )
+libvlc_media_get_state( libvlc_media_t *p_md )
 {
-    VLC_UNUSED(p_e);
+    assert( p_md );
     return p_md->state;
 }
 
@@ -492,11 +488,9 @@ libvlc_media_get_state( libvlc_media_t *p_md,
 
 void
 libvlc_media_set_state( libvlc_media_t *p_md,
-                                   libvlc_state_t state,
-                                   libvlc_exception_t *p_e )
+                                   libvlc_state_t state )
 {
     libvlc_event_t event;
-    VLC_UNUSED(p_e);
 
     p_md->state = state;
 
@@ -512,11 +506,8 @@ libvlc_media_set_state( libvlc_media_t *p_md,
  * subitems
  **************************************************************************/
 libvlc_media_list_t *
-libvlc_media_subitems( libvlc_media_t * p_md,
-                                  libvlc_exception_t * p_e )
+libvlc_media_subitems( libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
-
     if( p_md->p_subitems )
         libvlc_media_list_retain( p_md->p_subitems );
     return p_md->p_subitems;
@@ -526,10 +517,9 @@ libvlc_media_subitems( libvlc_media_t * p_md,
  * event_manager
  **************************************************************************/
 libvlc_event_manager_t *
-libvlc_media_event_manager( libvlc_media_t * p_md,
-                                       libvlc_exception_t * p_e )
+libvlc_media_event_manager( libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
+    assert( p_md );
 
     return p_md->p_event_manager;
 }
@@ -538,14 +528,14 @@ libvlc_media_event_manager( libvlc_media_t * p_md,
  * Get duration of media object (in ms)
  **************************************************************************/
 int64_t
-libvlc_media_get_duration( libvlc_media_t * p_md,
-                                      libvlc_exception_t * p_e )
+libvlc_media_get_duration( libvlc_media_t * p_md, libvlc_exception_t *p_e )
 {
-    VLC_UNUSED(p_e);
+    assert( p_md );
 
-    if( !p_md || !p_md->p_input_item)
+    if( !p_md->p_input_item )
     {
-        libvlc_exception_raise( p_e, "No input item" );
+        libvlc_exception_raise( p_e );
+        libvlc_printerr( "No input item" );
         return -1;
     }
 
@@ -556,16 +546,12 @@ libvlc_media_get_duration( libvlc_media_t * p_md,
  * Get preparsed status for media object.
  **************************************************************************/
 int
-libvlc_media_is_preparsed( libvlc_media_t * p_md,
-                                       libvlc_exception_t * p_e )
+libvlc_media_is_preparsed( libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
+    assert( p_md );
 
-    if( !p_md || !p_md->p_input_item)
-    {
-        libvlc_exception_raise( p_e, "No input item" );
+    if( !p_md->p_input_item )
         return false;
-    }
 
     return input_item_IsPreparsed( p_md->p_input_item );
 }
@@ -576,16 +562,10 @@ libvlc_media_is_preparsed( libvlc_media_t * p_md,
  * an native object that references a libvlc_media_t pointer
  **************************************************************************/
 void 
-libvlc_media_set_user_data( libvlc_media_t * p_md,
-                                       void * p_new_user_data,
-                                       libvlc_exception_t * p_e )
+libvlc_media_set_user_data( libvlc_media_t * p_md, void * p_new_user_data )
 {
-    VLC_UNUSED(p_e);
-
-    if( p_md )
-    {
-        p_md->p_user_data = p_new_user_data;
-    }
+    assert( p_md );
+    p_md->p_user_data = p_new_user_data;
 }
 
 /**************************************************************************
@@ -594,9 +574,8 @@ libvlc_media_set_user_data( libvlc_media_t * p_md,
  * an native object that references a libvlc_media_t pointer
  **************************************************************************/
 void *
-libvlc_media_get_user_data( libvlc_media_t * p_md,
-                                       libvlc_exception_t * p_e )
+libvlc_media_get_user_data( libvlc_media_t * p_md )
 {
-    VLC_UNUSED(p_e);
-    return p_md ? p_md->p_user_data : NULL;
+    assert( p_md );
+    return p_md->p_user_data;
 }