Removes trailing spaces. Removes tabs.

[vlc] / src / control / media_library.c

diff --git a/src/control/media_library.c b/src/control/media_library.c
index f66fb36bc1c2202cdfeaffe80c449b7438589847..0a177f66be645f0744a1016a8ec1311d53cec4c6 100644 (file)
--- a/src/control/media_library.c
+++ b/src/control/media_library.c
@@ -40,21 +40,21 @@ libvlc_media_library_t *
 libvlc_media_library_new( libvlc_instance_t * p_inst,
                           libvlc_exception_t * p_e )
 {
-       (void)p_e;
+    (void)p_e;
     libvlc_media_library_t * p_mlib;
 
-       p_mlib = malloc(sizeof(libvlc_media_library_t));
+    p_mlib = malloc(sizeof(libvlc_media_library_t));
 
-       if( !p_mlib )
-               return NULL;
+    if( !p_mlib )
+        return NULL;
 
-       p_mlib->p_libvlc_instance = p_inst;
+    p_mlib->p_libvlc_instance = p_inst;
     p_mlib->i_refcount = 1;
     p_mlib->p_mlist = NULL;
 
     p_mlib->p_event_manager = libvlc_event_manager_new( p_mlib, p_inst, p_e );
 
-       return p_mlib;
+    return p_mlib;
 }
 
 /**************************************************************************
@@ -67,7 +67,8 @@ void libvlc_media_library_release( libvlc_media_library_t * p_mlib )
     if( p_mlib->i_refcount > 0 )
         return;
 
-       free( p_mlib );
+    libvlc_event_manager_release( p_mlib->p_event_manager );
+    free( p_mlib );
 }
 
 /**************************************************************************
@@ -75,7 +76,7 @@ void libvlc_media_library_release( libvlc_media_library_t * p_mlib )
  **************************************************************************/
 void libvlc_media_library_retain( libvlc_media_library_t * p_mlib )
 {
-       p_mlib->i_refcount++;
+    p_mlib->i_refcount++;
 }
 
 /**************************************************************************
@@ -87,17 +88,17 @@ void
 libvlc_media_library_load( libvlc_media_library_t * p_mlib,
                            libvlc_exception_t * p_e )
 {
-    const char *psz_homedir = p_mlib->p_libvlc_instance->p_libvlc_int->psz_homedir;
+    const char *psz_datadir = p_mlib->p_libvlc_instance->p_libvlc_int->psz_datadir;
     char * psz_uri;
 
-    if( !psz_homedir )
+    if( !psz_datadir ) /* XXX: i doubt that this can ever happen */
     {
-        libvlc_exception_raise( p_e, "Can't get HOME DIR" );
+        libvlc_exception_raise( p_e, "Can't get data directory" );
         return;
     }
 
-    if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP CONFIG_DIR DIR_SEP
-                        "ml.xsp", psz_homedir ) == -1 )
+    if( asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xsp",
+                  psz_datadir ) == -1 )
     {
         libvlc_exception_raise( p_e, "Can't get create the path" );
         return;
@@ -131,7 +132,7 @@ libvlc_media_list_t *
 libvlc_media_library_media_list( libvlc_media_library_t * p_mlib,
                                      libvlc_exception_t * p_e )
 {
-       (void)p_e;
+    (void)p_e;
     if( p_mlib->p_mlist )
         libvlc_media_list_retain( p_mlib->p_mlist );
     return p_mlib->p_mlist;