src/control/event.c: Add missing return for NDEBUG builds. Fix return

[vlc] / src / control / flat_media_list_view.c

diff --git a/src/control/flat_media_list_view.c b/src/control/flat_media_list_view.c
index e5f51401d62cb2f3e00b4977a1793ed208674524..2017e754a632e38b5c11535f2fddb33527cdc8e7 100644 (file)
--- a/src/control/flat_media_list_view.c
+++ b/src/control/flat_media_list_view.c
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <assert.h>
 
 #include <vlc/libvlc.h>
@@ -144,14 +148,14 @@ import_mlist_rec( libvlc_media_list_view_t * p_mlv,
                   libvlc_exception_t * p_e )
 {
     int i, count;
-    count = libvlc_media_list_count( p_mlist, p_e );
+    count = libvlc_media_list_count( p_mlist );
     for( i = 0; i < count; i++ )
     {
         libvlc_media_t * p_md;
         libvlc_media_list_t * p_submlist;
         p_md = libvlc_media_list_item_at_index( p_mlist, i, p_e );
         vlc_array_append( &p_mlv->p_this_view_data->array, p_md );
-        p_submlist = libvlc_media_subitems( p_md, p_e );
+        p_submlist = libvlc_media_subitems( p_md );
         if( p_submlist )
         {
             libvlc_media_list_lock( p_submlist );
@@ -182,8 +186,7 @@ libvlc_media_list_flat_view( libvlc_media_list_t * p_mlist,
                                         flat_media_list_view_children_at_index,
                                         libvlc_media_list_flat_view,
                                         flat_media_list_view_release,
-                                        p_this_view_data,
-                                        p_e );
+                                        p_this_view_data );
     libvlc_media_list_lock( p_mlist );
     import_mlist_rec( p_mlv, p_mlist, p_e );
     libvlc_media_list_view_set_ml_notification_callback( p_mlv,