Who said I'm bored ?

diff --git a/MAINTAINERS b/MAINTAINERS
index b2e47a410b9bf92b1d904753187eb984f785c49c..a5f3f8c2b8ae36bdb46574d0ea018b30c88d3859 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8,9 +8,9 @@
 # best knowledge of the code, so that questions and propositions of
 # contributions should be directed to her.
 
-* MISC VLC ARCHITECTURE
+* CORE VLC ARCHITECTURE
 
-  - Makefiles & autoconf : [sam] & [meuuh]
+  - Makefiles & autoconf : [sam] [meuuh] [courmisch]
   - configuration & command-line options : [gibalou]
   - modules, detection, dynamic loading : [sam]
   - objects support, libvlc : [sam]
@@ -19,76 +19,78 @@
   - MMX optimizations : [sam]
   - Altivec optimizations : [meuuh] ([jlj])
 
+* PLAYLIST 
+
+  - core support [zorglub]
+
 * PORTS
 
   - Debian GNU/Linux : [sam]
   - Mandrake Linux : Yves Duret
   - BeOS : Eric Petit (Stephan Assmus)
   - Windows : [gibalou]
-  - Mac OS X : [thedj])
+  - Mac OS X : [thedj]
   - QNX RTOS : [jlj]
   - Solaris : [meuuh]
   - *BSD : [meuuh]
   - GNU/Hurd : [sam]
-  - iPAQ Familiar Linux : [saman] & [marcari] ([meuuh])
+  - iPAQ Familiar Linux : [jpsaman]
   - YOPY/Linupy : [marcari]
   - BSD/OS : Steven M. Schultz
 
 * INTERFACE
 
-  - interface architecture : [sam]
-  - modules gtk, gnome : [sam] ([stef])
-  - modules lirc, dummy, rc, ncurses : [sam]
-  - modules qt, kde : [sigmund]
-  - module xosd : [lool]
-  - module familar : [saman]
+  - interface architecture : [sam] [zorglub]
+  - wxWidgets : [gibalou] [zorglub]
+  - skins2    : [ipkiss] [asmax]
+  - macosx    : [thedj] [bigben] [fkuehne]
+  - lirc, dummy, rc, ncurses : [sam]
+  - corba     : [oaubert]
+  - familiar  : [jpsaman]
+  - http      : [meuuh]
 
 * VIDEO OUTPUT
 
-  - video output architecture : [sam]
-  - modules dummy, fb, ggi, glide, mga, sdl : [sam]
-  - output filters & chroma : [sam]
-  - modules x11, xvideo : [gibalou]
-  - module aa : [sigmund]
-  - module qte : [saman]
+  - Video output architecture : [sam] [gibalou]
+  - dummy, fb, ggi, glide, mga, sdl : [sam]
+  - Filters & chroma : [sam] [gibalou]
+  - X11, Xvideo      : [gibalou]
+  - Directx          : [gibalou]
 
 * AUDIO OUTPUT
 
   - audio output architecture : [sam] ([meuuh])
-  - module ALSA : [bozo]
-  - module aRts : Emmanuel Blindauer
-  - modules dsp, dummy, esd : [sam] ([meuuh])
-  - output filters : [sam] ([meuuh])
+  - ALSA       : [bozo] [bigben]
+  - DirectX    : [gibalou]
+  - AUHAL      : [thedj]
+  - Other      : [sam] ([meuuh])
+  - Filters    : [sam] [babal] [meuuh]
 
 * INPUT
 
-  - input architecture : [meuuh]
-  - demux modules PS, ES, a52_system : [meuuh]
-  - access modules file, udp, http : [meuuh]
-  - demux modules TS, satellite : [jobi]
-  - network modules ipv4, ipv6 : [meuuh]
-  - demux module mpeg_audio (mp3), avi : [fenrir]
-  - DVD module : [stef]
-  - VCD module : [jobi] ([jlj])
-
-* DECODERS
-
-  - decoders architecture : [meuuh] ([henri])
-  - built-in MPEG audio : unmaintained (FIXME)
-  - built-in MPEG video & associated idct+motion : [meuuh]
-  - built-in AC3 & associated plug-ins : Renaud Dartus (soon-to-be scrapped)
-  - mad : [saman] ([meuuh])
-  - ffmpeg : [fenrir]
+  - input architecture : [meuuh] [fenrir]
+  - Most Demuxers      : [fenrir] [gibalou]
+  - DRMS support       : [jlj] [sam]
+  - DVB access         : [meuuh]
+  - DVD                : [sam]
+  - network layer      : [courmisch]
+
+* DECODER
+
+  - decoders architecture : [meuuh] [gibalou] ([henri])
+  - ffmpeg : [fenrir] [gibalou]
   - AC3 SPDIF : [stef]
   - A/52 : [gibalou] ([meuuh])
   - SPU : [sam]
-  - Ogg/Vorbis : [gibalou]
+
+* MISC
+
+  - VLM 
+  - HTTPD : [fenrir]
 
 * DOCUMENTATION
 
-  - VLC HOWTO : [jobi]
   - Developer documentation : [sam] ([meuuh])
-  - FAQ : [lool]
 
 
 [bozo] = Arnaud de Bossoreille de Ribou

diff --git a/src/libvlc.c b/src/libvlc.c
index 52684e22e3c1323e8cac8b6d6b6e22bdad58dce6..e4bcf340714f9ff78001e884f7883e8d4e95a789 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -923,9 +923,9 @@ int VLC_CleanUp( int i_object )
     }
 
     /*
-     * Free playlists
+     * Free playlist
      */
-    msg_Dbg( p_vlc, "removing all playlists" );
+    msg_Dbg( p_vlc, "removing playlist handler" );
     while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
                                           FIND_CHILD )) )
     {
@@ -959,14 +959,14 @@ int VLC_CleanUp( int i_object )
     /*
      * Free announce handler(s?)
      */
-    msg_Dbg( p_vlc, "removing announce handler" );
     while( (p_announce = vlc_object_find( p_vlc, VLC_OBJECT_ANNOUNCE,
                                                  FIND_CHILD ) ) )
-   {
+    {
+        msg_Dbg( p_vlc, "removing announce handler" );
         vlc_object_detach( p_announce );
         vlc_object_release( p_announce );
         announce_HandlerDestroy( p_announce );
-   }
+    }
 
     if( i_object ) vlc_object_release( p_vlc );
     return VLC_SUCCESS;