cosmetics: fix indentation (2 spaces -> 4 spaces)

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index ee80234fa62dfe6858bb23452f05e1e23e54db15..2834af187c5694b0d2d15ffb89481e777b705813 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -38,8 +38,7 @@
 
 static const char nomemstr[] = "Insufficient memory";
 
-libvlc_instance_t * libvlc_new_with_builtins( int argc, const char *const *argv,
-                                             const void ** builtins_module)
+libvlc_instance_t * libvlc_new( int argc, const char *const *argv )
 {
     libvlc_instance_t *p_new = malloc (sizeof (*p_new));
     if (unlikely(p_new == NULL))
@@ -57,7 +56,7 @@ libvlc_instance_t * libvlc_new_with_builtins( int argc, const char *const *argv,
     if (unlikely (p_libvlc_int == NULL))
         goto error;
 
-    if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv, builtins_module ))
+    if (libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ))
     {
         libvlc_InternalDestroy( p_libvlc_int );
         goto error;
@@ -81,12 +80,6 @@ error:
     return NULL;
 }
 
-libvlc_instance_t * libvlc_new( int argc, const char *const *argv)
-{
-    return libvlc_new_with_builtins(argc, argv, NULL);
-}
-
-
 void libvlc_retain( libvlc_instance_t *p_instance )
 {
     assert( p_instance != NULL );
@@ -121,7 +114,20 @@ void libvlc_release( libvlc_instance_t *p_instance )
 
 int libvlc_add_intf( libvlc_instance_t *p_i, const char *name )
 {
-    return libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) ? -1 : 0;
+    if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ))
+    {
+        if( name )
+        {
+            libvlc_printerr("interface \"%s\" initialization failed",
+                name );
+        }
+        else
+        {
+            libvlc_printerr("default interface initialization failed");
+        }
+        return -1;
+    }
+    return 0;
 }
 
 void libvlc_set_exit_handler( libvlc_instance_t *p_i, void (*cb) (void *),
@@ -173,7 +179,8 @@ void libvlc_free( void *ptr )
     free( ptr );
 }
 
-libvlc_module_description_t *libvlc_module_description_list_get( libvlc_instance_t *p_instance, const char *capability )
+static libvlc_module_description_t *module_description_list_get(
+                libvlc_instance_t *p_instance, const char *capability )
 {
     VLC_UNUSED( p_instance );
     libvlc_module_description_t *p_list = NULL,
@@ -238,10 +245,15 @@ void libvlc_module_description_list_release( libvlc_module_description_t *p_list
 
 libvlc_module_description_t *libvlc_audio_filter_list_get( libvlc_instance_t *p_instance )
 {
-    return libvlc_module_description_list_get( p_instance, "audio filter" );
+    return module_description_list_get( p_instance, "audio filter" );
 }
 
 libvlc_module_description_t *libvlc_video_filter_list_get( libvlc_instance_t *p_instance )
 {
-    return libvlc_module_description_list_get( p_instance, "video filter2" );
+    return module_description_list_get( p_instance, "video filter2" );
+}
+
+int64_t libvlc_clock(void)
+{
+    return mdate();
 }