Support up to 9 channel with Vorbis

[vlc] / modules / stream_out / display.c

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index cbb7947da3b275f63bac9b6bb669fc78f2b21b45..f5533af9592f986185ec9fab4697f1fb7473a313 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * display.c: display stream output module
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,18 +18,17 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -47,6 +46,7 @@ static void Close( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-display-"
 
 vlc_module_begin();
+    set_shortname( _("Display"));
     set_description( _("Display stream output") );
     set_capability( "sout stream", 50 );
     add_shortcut( "display" );
@@ -92,12 +92,12 @@ static int Open( vlc_object_t *p_this )
     sout_stream_sys_t *p_sys;
     vlc_value_t val;
 
-    sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+    config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
                    p_stream->p_cfg );
 
     p_sys          = malloc( sizeof( sout_stream_sys_t ) );
     p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT,
-                                      FIND_ANYWHERE );
+                                      FIND_PARENT );
     if( !p_sys->p_input )
     {
         msg_Err( p_stream, "cannot find p_input" );