decoder: drain the audio output properly

[vlc] / src / input / stream_filter.c

diff --git a/src/input/stream_filter.c b/src/input/stream_filter.c
index 213643f58f965285f426f16e7c29a360f3a508ac..368b56d178f90e200447749d19d457b45e7d012e 100644 (file)
--- a/src/input/stream_filter.c
+++ b/src/input/stream_filter.c
@@ -6,19 +6,19 @@
  *
  * Author: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -27,8 +27,11 @@
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
+#include <vlc_modules.h>
 #include <libvlc.h>
 
+#include <assert.h>
+
 #include "stream.h"
 
 static void StreamDelete( stream_t * );
@@ -37,6 +40,7 @@ stream_t *stream_FilterNew( stream_t *p_source,
                             const char *psz_stream_filter )
 {
     stream_t *s;
+    assert( p_source != NULL );
 
     s = stream_CommonNew( VLC_OBJECT( p_source ) );
     if( s == NULL )
@@ -45,6 +49,7 @@ stream_t *stream_FilterNew( stream_t *p_source,
     s->p_input = p_source->p_input;
 
     /* */
+    s->psz_access = strdup( p_source->psz_access );
     s->psz_path = strdup( p_source->psz_path );
     if( !s->psz_path )
     {
@@ -54,8 +59,6 @@ stream_t *stream_FilterNew( stream_t *p_source,
     s->p_source = p_source;
 
     /* */
-    vlc_object_attach( s, p_source );
-
     s->p_module = module_need( s, "stream_filter", psz_stream_filter, true );
 
     if( !s->p_module )
@@ -105,11 +108,10 @@ stream_t *stream_FilterChainNew( stream_t *p_source,
     }
     free( psz_tmp );
 
-    /* Add record filter if usefull */
+    /* Add record filter if useful */
     if( b_record )
     {
-        stream_t *p_filter = stream_FilterNew( p_source,
-                                               "stream_filter_record" );
+        stream_t *p_filter = stream_FilterNew( p_source, "record" );
         if( p_filter )
             p_source = p_filter;
     }
@@ -126,3 +128,8 @@ static void StreamDelete( stream_t *s )
     stream_CommonDelete( s );
 }
 
+int stream_FilterDefaultReadDir( stream_t *s, input_item_node_t *p_node )
+{
+    assert( s->p_source != NULL );
+    return stream_ReadDir( s->p_source, p_node );
+}