Replace libvlc_exception_get_message with libvlc_errmsg

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index 566ce11b24b1a2aac6e4a45531946b00b78378c9..6f853f8e62a84d0ad4a33dc0e50b0332d010451e 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -352,28 +352,28 @@ libvlc_media_t * libvlc_media_new_as_node(
  **************************************************************************/
 void libvlc_media_add_option(
                                    libvlc_media_t * p_md,
-                                   const char * ppsz_option,
+                                   const char * psz_option,
                                    libvlc_exception_t *p_e )
 {
     VLC_UNUSED(p_e);
-    input_item_AddOption( p_md->p_input_item, ppsz_option,
+    input_item_AddOption( p_md->p_input_item, psz_option,
                           VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED );
 }
 
 /**************************************************************************
- * Same as libvlc_media_add_option but with untrusted source.
+ * Same as libvlc_media_add_option but with configurable flags.
  **************************************************************************/
-void libvlc_media_add_option_untrusted(
+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 )
 {
     VLC_UNUSED(p_e);
     input_item_AddOption( p_md->p_input_item, ppsz_option,
-                          VLC_INPUT_OPTION_UNIQUE );
+                          i_flags );
 }
 
-
 /**************************************************************************
  * Delete a media descriptor object
  **************************************************************************/
@@ -535,7 +535,7 @@ libvlc_media_event_manager( libvlc_media_t * p_md,
 }
 
 /**************************************************************************
- * Get duration of media object.
+ * Get duration of media object (in ms)
  **************************************************************************/
 int64_t
 libvlc_media_get_duration( libvlc_media_t * p_md,
@@ -549,7 +549,7 @@ libvlc_media_get_duration( libvlc_media_t * p_md,
         return -1;
     }
 
-    return input_item_GetDuration( p_md->p_input_item );
+    return input_item_GetDuration( p_md->p_input_item ) / 1000;
 }
 
 /**************************************************************************
@@ -598,13 +598,5 @@ libvlc_media_get_user_data( libvlc_media_t * p_md,
                                        libvlc_exception_t * p_e )
 {
     VLC_UNUSED(p_e);
-
-    if( p_md )
-    {
-        return p_md->p_user_data;
-    }
-    else
-    {
-        return NULL;
-    }
+    return p_md ? p_md->p_user_data : NULL;
 }