* Added debian/* files to help generating CSS-enabled non-US packages,
    and changed plugins/dvd/* to reflect this change.
  * Added .xpm icons (fixes lintian warnings).
  * --help output and manpage are now in sync (Closes Debian bug #87478).
  * Fixed Build-dpends entry in debian/control (Closes Debian bug #83707).

Makefile.in

@@ -471,6 +471,7 @@ install:
 	mkdir -p $(DESTDIR)$(datadir)/videolan
 	$(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/videolan
 	$(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
+	$(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
 show:
 	@echo CC: $(CC)
@@ -489,15 +490,11 @@ show:
 snapshot:
 	rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
 	# copy archive in /tmp
-	find -type d | while read i ; \
+	find -type d | grep -v CVS | grep -v '^\.dep' | while read i ; \
 		do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
 	done
-	find debian -mindepth 1 -maxdepth 1 -type d | grep -v CVS | \
+	find debian -mindepth 1 -maxdepth 1 -type d | \
 		while read i ; do rm -rf /tmp/vlc-@VLC_VERSION@/$$i ; done
-	# CVS entries
-	find . -type f | grep CVS | while read i ; \
-		do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
-	done
 	# .c .h .in .cpp
 	find include src plugins -type f -name '*.[chi]*' | while read i ; \
 		do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
@@ -507,11 +504,13 @@ snapshot:
 		Makefile.in Makefile.dep configure configure.in install-sh \
 		config.sub config.guess todo.pl \
 			/tmp/vlc-@VLC_VERSION@/
-	for file in control vlc-gtk.menu vlc.copyright vlc.docs changelog \
-		rules vlc.1 vlc.dirs vlc.menu ; do \
+	for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
+		changelog changelog-css rules rules-css vlc.1 vlc.dirs \
+		vlc.menu ; do \
 			cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
-	for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
-		cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
+	for file in default8x16.psf default8x9.psf gvlc.png vlc.png \
+		gvlc.xpm vlc.xpm ; do \
+			cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
 
 	# build css-enabled archives
 	(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
@@ -520,28 +519,6 @@ snapshot:
 		gzip -f -9 vlc-@VLC_VERSION@.tar )
 	mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
 
-	# removing CSS stuff
-	for x in plugins/dvd/dvd.c plugins/dvd/dvd_css.c ; do \
-	rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
-	perl -ne 'if (/^#e(lse|ndif).*HAVE_CSS/) { $$i=0; } \
-			if (/^#if.*HAVE_CSS/) { $$i=1; } \
-			elsif (!$$i && !/^#.*HAVE_CSS/) { print $$_; }' \
-		< $$x >| /tmp/vlc-@VLC_VERSION@/$$x ; \
-	done
-	rm -f /tmp/vlc-@VLC_VERSION@/plugins/dvd/dvd_csstables.c
-	rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
-	sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
-		> /tmp/vlc-@VLC_VERSION@/debian/changelog
-
-	# build nocss archives
-	(cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
-		tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
-		bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
-			> vlc-@VLC_VERSION@nocss.tar.bz2 ; \
-		gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
-	mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
-		/tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
-
 	# clean up
 	rm -rf /tmp/vlc-@VLC_VERSION@*
 

configure

@@ -3478,24 +3478,30 @@ fi
 # Check whether --with-ggi or --without-ggi was given.
 if test "${with_ggi+set}" = set; then
   withval="$with_ggi"
-   PLUGINS=${PLUGINS}"ggi ";
-    if test "x$withval" != "xyes";
+   if test "x$withval" != "xno";
     then
-      LIB_GGI="-l"$withval
-    else
-      LIB_GGI="-lggi"
+      PLUGINS=${PLUGINS}"ggi ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GGI="-l"$withval
+      else
+        LIB_GGI="-lggi"
+      fi
     fi 
 fi
 
 # Check whether --with-sdl or --without-sdl was given.
 if test "${with_sdl+set}" = set; then
   withval="$with_sdl"
-   PLUGINS=${PLUGINS}"sdl ";
-    if test "x$withval" != "xyes";
+   if test "x$withval" != "xno";
     then
-      LIB_SDL="L/usr/X11R6/lib -l"$withval
-    else
-      LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      PLUGINS=${PLUGINS}"sdl ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_SDL="L/usr/X11R6/lib -l"$withval
+      else
+        LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      fi
     fi 
 fi
 
@@ -3507,12 +3513,15 @@ fi
 # Check whether --with-glide or --without-glide was given.
 if test "${with_glide+set}" = set; then
   withval="$with_glide"
-   PLUGINS=${PLUGINS}"glide ";
-    if test "x$withval" != "xyes";
+   if test "x$withval" != "xno";
     then
-      LIB_GLIDE="-l"$withval
-    else
-      LIB_GLIDE="-lglide2x"
+      PLUGINS=${PLUGINS}"glide ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GLIDE="-l"$withval
+      else
+        LIB_GLIDE="-lglide2x"
+      fi
     fi 
 fi
 
@@ -3554,17 +3563,17 @@ if test "${enable_alsa+set}" = set; then
   enableval="$enable_alsa"
   if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:3558: checking for sys/asoundlib.h" >&5
+echo "configure:3567: checking for sys/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3563 "configure"
+#line 3572 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3581,7 +3590,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:3585: checking for main in -lasound" >&5
+echo "configure:3594: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3589,14 +3598,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3593 "configure"
+#line 3602 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

configure.in

@@ -167,21 +167,27 @@ AC_ARG_ENABLE(fb,
   [if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi])
 AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
-  [ PLUGINS=${PLUGINS}"ggi ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_GGI="-l"$withval
-    else
-      LIB_GGI="-lggi"
+      PLUGINS=${PLUGINS}"ggi ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GGI="-l"$withval
+      else
+        LIB_GGI="-lggi"
+      fi
     fi ])
 AC_ARG_WITH(sdl,
   [  --with-sdl[=name]       SDL support (default enabled)],
-  [ PLUGINS=${PLUGINS}"sdl ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_SDL="L/usr/X11R6/lib -l"$withval
-    else
-      LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      PLUGINS=${PLUGINS}"sdl ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_SDL="L/usr/X11R6/lib -l"$withval
+      else
+        LIB_SDL="-L/usr/X11R6/lib -lSDL"
+      fi
     fi ])
     if test "x$withval" = "x";
     then
@@ -190,12 +196,15 @@ AC_ARG_WITH(sdl,
     fi
 AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
-  [ PLUGINS=${PLUGINS}"glide ";
-    if test "x$withval" != "xyes";
+  [ if test "x$withval" != "xno";
     then
-      LIB_GLIDE="-l"$withval
-    else
-      LIB_GLIDE="-lglide2x"
+      PLUGINS=${PLUGINS}"glide ";
+      if test "x$withval" != "xyes";
+      then
+        LIB_GLIDE="-l"$withval
+      else
+        LIB_GLIDE="-lglide2x"
+      fi
     fi ])
 AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],

debian/changelog

+vlc (0.2.62-2) unstable; urgency=low
+
+  * Removed a few lintian warnings.
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat,  3 Mar 2001 10:29:31 +0100
+
+vlc (0.2.62-1) unstable; urgency=low
+
+  * Updated vlc.1 manpage (Closes: #87478).
+  * Fixed debian/control (Closes: #83707).
+  * The framebuffer plugin doesn't hijack ^C anymore (Closes: #87500).
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri,  2 Mar 2001 17:32:24 +0100
+
 vlc (0.2.62-1) unstable; urgency=low
 
   * New release. Glide and GGI packages build again.

debian/changelog-css

+vlc-css (0.2.62-2) unstable; urgency=low
+
+  * Removed a few lintian warnings.
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat,  3 Mar 2001 10:29:31 +0100
+
+vlc-css (0.2.62-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri,  2 Mar 2001 17:58:26 +0100
+
+Local variables:
+mode: debian-changelog
+End:

debian/control-css

+Source: vlc-css
+Section: non-US/main
+Priority: optional
+Maintainer: Samuel Hocevar <sam@zoy.org>
+Build-Depends: debhelper (>=2.2.0), xlib6g-dev
+Standards-Version: 3.0.1
+
+Package: vlc-css
+Architecture: any
+Depends: ${shlibs:Depends}, vlc
+Description: CSS plugin for the VideoLAN Client
+ VideoLAN is a free MPEG, MPEG2 and DVD software solution.
+ .
+ This plugin adds DVD support with CSS decryption to the VideoLAN Client.
+

debian/rules

@@ -61,7 +61,8 @@ install: build
 	mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
 	mkdir -p debian/vlc-gtk/usr/share/videolan/
 	mv debian/vlc/usr/share/videolan/gvlc.png \
-		debian/vlc-gtk/usr/share/videolan/
+		debian/vlc/usr/share/videolan/gvlc.xpm \
+			debian/vlc-gtk/usr/share/videolan/
 	mkdir -p debian/vlc-gtk/usr/share/man/man1/
 	ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
 

debian/rules-css

+#!/usr/bin/make -f
+# debian/rules for the VideoLAN Client - uses debhelper.
+# based on Joey Hess's one.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	if [ $(DEB_BUILD_ARCH) = i386 ]; then \
+	./configure --prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--disable-gnome --disable-gtk --enable-fb --without-glide \
+		--without-ggi --without-sdl --disable-esd --disable-alsa \
+		--disable-ppro ; \
+	else \
+	./configure --prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--disable-gnome --disable-gtk --enable-fb --without-ggi \
+		--without-sdl --disable-esd --disable-alsa; \
+	fi
+
+	$(MAKE) lib/dvd.so
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# make symlinks for packages
+	mkdir -p debian/vlc-css/usr/share/doc/
+	ln -s vlc debian/vlc-css/usr/share/doc/vlc-css
+	mkdir -p debian/vlc-css/usr/lib/videolan/vlc/
+	cp lib/dvd.so debian/vlc-css/usr/lib/videolan/vlc/dvd-css.so
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installinit
+	dh_installcron
+#	dh_installmanpages
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/vlc-gtk.menu

 ?package(vlc-gtk):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
                   section="Apps/Viewers" title="Gnome/Gtk VideoLAN Client" \
-                  icon="/usr/share/videolan/gvlc.png"
+                  icon="/usr/share/videolan/gvlc.xpm"

debian/vlc.1

@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-vlc, fbvlc, gvlc \- The VideoLAN Client
+vlc, gvlc, kvlc \- The VideoLAN Client
 .SH SYNOPSIS
 .B vlc
 .RI [ OPTIONS ]
@@ -35,6 +35,9 @@ A summary of options is included below.
 .B \-\-intf <module>
 Specify an interface module: "gnome", "curses", "shell", for instance.
 .TP
+.B \-\-warning <level>
+Select the warning level. 0 is the most verbose, 3 is almost mute.
+.TP
 .B \-\-noaudio
 Disable audio output.
 .TP
@@ -85,12 +88,14 @@ heuristics based on CPU usage.
 displays I and P images and every second B image, and `IPB' forces
 displaying of all images.
 
-Note that the vlc is certainly going to crash if you ask it to
+Note that vlc is certainly going to crash if you ask it to
 display more images than your CPU can cope with.
 .TP
-.B vlc
-opens /dev/dvd, but this behaviour may be overridden by the vlc_dvd_device
-environment variable (see below).
+.B \-t, \-\-dvdtitle <title>
+Choose the DVD title. Most movies on DVDs start on the first title, but you may want to manually select another title.
+.TP
+.B \-T, \-\-dvdchapter <title>
+Choose the DVD chapter. DVDs are divided into titles, which in turn are divided into chapters.
 .TP
 .B \-a, \-\-dvdaudio [ ac3 | lpcm | mpeg | off ]
 Choose the audio channel type. Most DVDs have AC3 audio channels, but
@@ -105,12 +110,18 @@ audio channel will also depend on the channel type.
 .B \-s, \-\-dvdsubtitle [ 0\-31 ]
 Select the subtitle channel, if there is one in the stream.
 .TP
-.B \-\-novlans
-Disable VLANs support.
+.B \-\-input <method>
+Choose the input method, "dvd", "ps", "ts" for instance.
+.TP
+.B \-\-vlans
+Enable VLANs support. This feature isn't activated yet.
 .TP
 .B \-\-server <host>, \-\-port <port>
 Choose the video server address and port.
 .TP
+.B \-\-broadcast
+Set broadcast mode for network input.
+.TP
 .B \-h, \-\-help
 Print help and exit.
 .TP
@@ -150,6 +161,8 @@ also accepts a lot of parameters to customize its behaviour.
 .TP
 .B DVD parameters:
  vlc_dvd_device=<device>           DVD device
+ vlc_input_title=<title>           title number
+ vlc_input_chapter=<chapter>       chapter number
  vlc_audio={ac3|lpcm|mpeg|off}     audio type
  vlc_channel=[0-15]                audio channel
  vlc_subtitle=[0-31]               subtitle channel
@@ -166,5 +179,4 @@ also accepts a lot of parameters to customize its behaviour.
 .BR vls (1), vlms (1)
 .br
 .SH AUTHOR
-This manual page was written by the VideoLAN Team <videolan@via.ecp.fr>,
-for the Debian GNU/Linux system (but may be used by others).
+This manual page was written by Samuel Hocevar <sam@zoy.org>, for the Debian GNU/Linux system (but may be used by others).

debian/vlc.menu

 ?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
                section="Apps/Viewers" title="VideoLAN Client" \
-               icon="/usr/share/videolan/vlc.png"
+               icon="/usr/share/videolan/vlc.xpm"

plugins/dvd/dvd.c

@@ -20,14 +20,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME dvd
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 #include "defs.h"
 
+#ifdef HAVE_CSS
+#define MODULE_NAME dvd-css
+#else /* HAVE_CSS */
+#define MODULE_NAME dvd
+#endif /* HAVE_CSS */
+#include "modules_inner.h"
+
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
 
@@ -64,9 +68,9 @@ MODULE_INIT
     p_module->psz_name = MODULE_STRING;
 #ifdef HAVE_CSS
     p_module->psz_longname = "full DVD input module with CSS decryption";
-#else
+#else /* HAVE_CSS */
     p_module->psz_longname = "DVD input module, CSS decryption disabled";
-#endif
+#endif /* HAVE_CSS */
     p_module->psz_version = VERSION;
 
     p_module->i_capabilities = MODULE_CAPABILITY_NULL

plugins/dvd/dvd_css.c

@@ -2,7 +2,7 @@
  * dvd_css.c: Functions for DVD authentification and unscrambling
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_css.c,v 1.17 2001/03/03 07:07:01 stef Exp $
+ * $Id: dvd_css.c,v 1.18 2001/03/03 11:01:07 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -103,12 +103,11 @@ int CSSTest( int i_fd )
  *****************************************************************************/
 css_t * CSSInit( int i_fd )
 {
-    css_t *         p_css;
-
 #ifdef HAVE_CSS
     /* structures defined in cdrom.h or dvdio.h */
     dvd_struct      dvd;
     dvd_authinfo    auth_info;
+    css_t *         p_css;
 
     int             i_error = -1;
     int             i;
@@ -323,13 +322,14 @@ css_t * CSSInit( int i_fd )
     case 1:
         return p_css;
     }
+
+    return p_css;
+
 #else /* HAVE_CSS */
     intf_ErrMsg( "css error: CSS decryption is disabled in this module" );
 
-    p_css = NULL;
+    return NULL;
 #endif /* HAVE_CSS */
-
-    return p_css;
 }
 
 /*****************************************************************************
@@ -339,7 +339,9 @@ void CSSEnd( css_t * p_css )
 {
 #ifdef HAVE_CSS
     free( p_css );
-#endif
+#else /* HAVE_CSS */
+    ;
+#endif /* HAVE_CSS */
 }
 
 /*****************************************************************************

plugins/dvd/input_dvd.c

@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.25 2001/03/03 07:07:01 stef Exp $
+ * $Id: input_dvd.c,v 1.26 2001/03/03 11:01:07 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -29,14 +29,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#define MODULE_NAME dvd
-#include "modules_inner.h"
-
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 #include "defs.h"
 
+#ifdef HAVE_CSS
+#define MODULE_NAME dvd-css
+#else /* HAVE_CSS */
+#define MODULE_NAME dvd-nocss
+#endif /* HAVE_CSS */
+#include "modules_inner.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -309,13 +313,21 @@ static int DVDProbe( probedata_t *p_data )
 
     if( TestMethod( INPUT_METHOD_VAR, "dvd" ) )
     {
+#ifdef HAVE_CSS
         return( 999 );
+#else /* HAVE_CSS */
+        return( 998 );
+#endif /* HAVE_CSS */
     }
 
     if( ( strlen(psz_name) > 4 ) && !strncasecmp( psz_name, "dvd:", 4 ) )
     {
         /* If the user specified "dvd:" then it's probably a DVD */
+#ifdef HAVE_CSS
         i_score = 100;
+#else /* HAVE_CSS */
+        i_score = 90;
+#endif /* HAVE_CSS */
         psz_name += 4;
     }
 

src/interface/main.c

@@ -762,9 +762,9 @@ static void Usage( int i_fashion )
         return;
 
     /* Interface parameters */
-    intf_MsgImm( "\nInterface parameters:\n"
+    intf_MsgImm( "\nInterface parameters:"
         "\n  " INTF_METHOD_VAR "=<method name>          \tinterface method"
-        "\n  " INTF_INIT_SCRIPT_VAR "=<filename>             \tinitialization script"
+        "\n  " INTF_INIT_SCRIPT_VAR "=<filename>               \tinitialization script"
         "\n  " INTF_CHANNELS_VAR "=<filename>            \tchannels list"
         "\n  " INTF_WARNING_VAR "=<level>                \twarning level" );
 
@@ -793,14 +793,14 @@ static void Usage( int i_fashion )
     /* DVD parameters */
     intf_MsgImm( "\nDVD parameters:"
         "\n  " INPUT_DVD_DEVICE_VAR "=<device>           \tDVD device"
-        "\n  " INPUT_TITLE_VAR "=<title>                 \ttitle number"
-        "\n  " INPUT_CHAPTER_VAR "=<chapter>             \tchapter number"
-        "\n  " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off}     \taudio type"
-        "\n  " INPUT_CHANNEL_VAR "=[0-15]                \taudio channel"
-        "\n  " INPUT_SUBTITLE_VAR "=[0-31]               \tsubtitle channel" );
+        "\n  " INPUT_TITLE_VAR "=<title>             \ttitle number"
+        "\n  " INPUT_CHAPTER_VAR "=<chapter>         \tchapter number"
+        "\n  " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off} \taudio type"
+        "\n  " INPUT_CHANNEL_VAR "=[0-15]            \taudio channel"
+        "\n  " INPUT_SUBTITLE_VAR "=[0-31]           \tsubtitle channel" );
 
     /* Input parameters */
-    intf_MsgImm( "\nInput parameters:\n"
+    intf_MsgImm( "\nInput parameters:"
         "\n  " INPUT_SERVER_VAR "=<hostname>          \tvideo server"
         "\n  " INPUT_PORT_VAR "=<port>            \tvideo server port"
         "\n  " INPUT_IFACE_VAR "=<interface>          \tnetwork interface"