* The Gtk+ interface is now built as a Debian package as well. The Gnome
    package depends on it because of the icon and menu entry.
  * Added an intf_WarnHexDump() function to do raw hexadecimal dumps of
    memory areas. For debugging purposes or for real men, as you wish.
  * Lots of tidying in dvd_ioctl.c, a few comments added.
  * Better error handling in the subpicture decoder.
  * Tidied video_spu.c. More to come later.
  * Fixed subtitle displaying. Will soon work in overlay mode as well.

Makefile.in

@@ -451,7 +451,7 @@ all: vlc @ALIASES@ plugins
 clean:
 	rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
 	rm -f plugins/*/*.o src/*/*.o lib/*.so
-	rm -f vlc @ALIASES@
+	rm -f vlc kvlc gvlc
 
 distclean: clean
 	rm -f src/*/*.o plugins/*/*.o **/*~ *.log

debian/control

@@ -7,8 +7,8 @@ Standards-Version: 3.0.1
 
 Package: vlc
 Architecture: any
-Depends: ${shlibs:Depends}, vlc-gnome
-Suggests: vlc-sdl, vlc-esd
+Depends: ${shlibs:Depends}, vlc-gtk
+Suggests: vlc-sdl, vlc-esd, vlc-gnome
 Description: the free MPEG and DVD player VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
@@ -17,12 +17,20 @@ Description: the free MPEG and DVD player VideoLAN Client
 
 Package: vlc-gnome
 Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Depends: vlc (= ${Source-Version}), vlc-gtk (= ${Source-Version}), ${shlibs:Depends}
 Description: Gnome plugin for the VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds a Gnome interface to the VideoLAN Client.
 
+Package: vlc-gtk
+Architecture: any
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Description: Gtk+ plugin for the VideoLAN Client
+ VideoLAN is a free MPEG, MPEG2 and DVD software solution.
+ .
+ This plugin adds a Gtk+ interface to the VideoLAN Client.
+
 Package: vlc-esd
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}

debian/rules

@@ -16,13 +16,14 @@ build-stamp:
 	./configure --prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--enable-gnome --enable-fb --with-glide --with-ggi \
-		--with-sdl --enable-esd --enable-alsa --disable-ppro ; \
+		--enable-gnome --enable-gtk --enable-fb --with-glide \
+		--with-ggi --with-sdl --enable-esd --enable-alsa \
+		--disable-ppro ; \
 	else \
 	./configure --prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--enable-gnome --enable-fb --with-ggi \
+		--enable-gnome --enable-gtk --enable-fb --with-ggi \
 		--with-sdl --enable-esd --enable-alsa; \
 	fi
 
@@ -48,7 +49,7 @@ install: build
 	DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
 
 	# make symlinks for packages
-	for alias in ggi gnome glide esd sdl alsa ; do \
+	for alias in ggi gtk gnome glide esd sdl alsa ; do \
 		mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \
 		ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
 		mkdir -p debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \
@@ -56,13 +57,13 @@ install: build
 			debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \
 	done
 
-	mkdir -p debian/vlc-gnome/usr/bin/
-	mv debian/vlc/usr/bin/gvlc debian/vlc-gnome/usr/bin/
-	mkdir -p debian/vlc-gnome/usr/share/videolan/
+	mkdir -p debian/vlc-gtk/usr/bin/
+	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-gnome/usr/share/videolan/
-	mkdir -p debian/vlc-gnome/usr/share/man/man1/
-	ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gvlc.1.gz
+		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
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -81,10 +82,10 @@ binary-arch: build install
 #	dh_installpam
 #	dh_installinit
 	dh_installcron
-	dh_installmanpages -Nvlc-gnome -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa
+	dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa
 	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs -Nvlc-gnome -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa
+	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa
 	dh_link
 	dh_strip
 	dh_compress

debian/vlc-gnome.menu

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

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"

debian/vlc.copyright

 This package was debianized by Samuel Hocevar <sam@zoy.org> on
 Mon, 13 Mar 2000 02:21:45 +0100.
 
-It was downloaded from ftp://ftp.videolan.org/pub/videolan/
+It was taken from the CVS tree. See http://www.videolan.org/cvs.html
 
 Upstream Author(s): The VideoLAN Team <videolan@videolan.org>
 
-VideoLAN is Copyright 1996, 1997, 1998, 1999, 2000 The VideoLAN Team
+VideoLAN is Copyright 1996, 1997, 1998, 1999, 2000, 2001 The VideoLAN Team
 
 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

include/intf_msg.h

@@ -85,3 +85,5 @@ void         intf_IntfMsg        ( char *psz_format, ... );
 void         intf_MsgImm         ( char *psz_format, ... );
 void         intf_ErrMsgImm      ( char *psz_format, ... );
 void         intf_WarnMsgImm     ( int i_level, char *psz_format, ... );
+void         intf_WarnHexDump    ( int i_level, void *p_data, int i_size );
+

include/video_graphics.h

-/*****************************************************************************
- * video_graphics.h: pictures manipulation primitives
- * Includes function to compose, convert and display pictures, and also basic
- * functions to copy pictures data or descriptors.
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
- *
- * 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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Requires:
- *  "config.h"
- *  "common.h"
- *  "mtime.h"
- *  "video.h"
- *****************************************************************************/
-
-/*****************************************************************************
- * Prototypes
- *****************************************************************************/
-
-

plugins/beos/intf_beos.cpp

@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.10 2001/02/20 07:49:12 sam Exp $
+ * $Id: intf_beos.cpp,v 1.11 2001/02/26 12:16:28 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -61,7 +61,7 @@ extern "C"
 #include "main.h"
 }
 
-#include "beos_window.h"
+#include "window.h"
 
 /*****************************************************************************
  * intf_sys_t: description and status of FB interface

plugins/beos/vout_beos.cpp

@@ -54,13 +54,13 @@ extern "C"
 #include "video.h"
 #include "video_output.h"
 
-#include "interface.h" /* XXX maybe to remove if beos_window.h is splitted */
+#include "interface.h" /* XXX maybe to remove if window.h is splitted */
 #include "intf_msg.h"
 
 #include "main.h"
 }
 
-#include "beos_window.h"
+#include "window.h"
 
 #define WIDTH 128
 #define HEIGHT 64

include/beos_window.h → plugins/beos/window.h

 /*****************************************************************************
- * beos_window.h: beos window class prototype
+ * window.h: BeOS window class prototype
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
- * Jean-Marc Dressler
+ * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *
  * 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

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.20 2001/02/22 08:59:54 stef Exp $
+ * $Id: input_dvd.c,v 1.21 2001/02/26 12:16:28 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -711,7 +711,7 @@ static void DVDInit( input_thread_t * p_input )
     /* FIXME: We consider here that one title is one title set
      * it is not true !!! */
 
-    intf_WarnMsg( 2, "DVD: Number of titles: %d\n",
+    intf_WarnMsg( 2, "DVD: Number of titles: %d",
                   p_method->ifo.vmg.mat.i_tts_nb );
 
 #define area p_input->stream.pp_areas

plugins/gtk/gtk_interface.c

@@ -634,8 +634,7 @@ create_intf_about (void)
   GtkWidget *vbox3;
   GtkWidget *label14;
   GtkWidget *label18;
-  GtkWidget *hbox1;
-  GtkWidget *label15;
+  GtkWidget *frame1;
   GtkWidget *label16;
   GtkWidget *label17;
   GtkWidget *dialog_action_area;
@@ -673,40 +672,32 @@ create_intf_about (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (label18);
   gtk_box_pack_start (GTK_BOX (vbox3), label18, FALSE, FALSE, 0);
+  gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_padding (GTK_MISC (label18), 0, 5);
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox1);
-  gtk_object_set_data_full (GTK_OBJECT (intf_about), "hbox1", hbox1,
+  frame1 = gtk_frame_new (_("Authors"));
+  gtk_widget_ref (frame1);
+  gtk_object_set_data_full (GTK_OBJECT (intf_about), "frame1", frame1,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
-
-  label15 = gtk_label_new (_("Authors:"));
-  gtk_widget_ref (label15);
-  gtk_object_set_data_full (GTK_OBJECT (intf_about), "label15", label15,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label15);
-  gtk_box_pack_start (GTK_BOX (hbox1), label15, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_RIGHT);
-  gtk_misc_set_alignment (GTK_MISC (label15), 0.5, 1.67638e-08);
-  gtk_misc_set_padding (GTK_MISC (label15), 0, 10);
+  gtk_widget_show (frame1);
+  gtk_box_pack_start (GTK_BOX (vbox3), frame1, FALSE, FALSE, 0);
 
   label16 = gtk_label_new (_("Rgis Duchesne <regis@via.ecp.fr>\nMichel Lespinasse <walken@zoy.org>\nOlivier Pomel <pomel@via.ecp.fr>\nPierre Baillet <oct@zoy.org>\nJean-Philippe Grimaldi <jeanphi@via.ecp.fr>\nAndres Krapf <dae@via.ecp.fr>\nChristophe Massiot <massiot@via.ecp.fr>\nVincent Seguin <seguin@via.ecp.fr>\nBenoit Steiner <benny@via.ecp.fr>\nArnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\nJean-Marc Dressler <polux@via.ecp.fr>\nGal Hendryckx <jimmy@via.ecp.fr>\nSamuel Hocevar <sam@zoy.org>\nBrieuc Jeunhomme <bbp@via.ecp.fr>\nMichel Kaempf <maxx@via.ecp.fr>\nStphane Borel <stef@via.ecp.fr>\nRenaud Dartus <reno@via.ecp.fr>\nHenri Fallon <henri@via.ecp.fr>"));
   gtk_widget_ref (label16);
   gtk_object_set_data_full (GTK_OBJECT (intf_about), "label16", label16,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (label16);
-  gtk_box_pack_start (GTK_BOX (hbox1), label16, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame1), label16);
   gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label16), 0.5, 0);
-  gtk_misc_set_padding (GTK_MISC (label16), 10, 10);
+  gtk_misc_set_padding (GTK_MISC (label16), 5, 5);
 
   label17 = gtk_label_new (_("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."));
   gtk_widget_ref (label17);
   gtk_object_set_data_full (GTK_OBJECT (intf_about), "label17", label17,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (label17);
-  gtk_box_pack_start (GTK_BOX (vbox3), label17, FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox3), label17, FALSE, FALSE, 0);
   gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_LEFT);
   gtk_label_set_line_wrap (GTK_LABEL (label17), TRUE);
   gtk_misc_set_padding (GTK_MISC (label17), 0, 5);

plugins/gtk/intf_gtk.glade

@@ -656,12 +656,12 @@
 	<class>GtkLabel</class>
 	<name>label18</name>
 	<label>(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
+	<justify>GTK_JUSTIFY_LEFT</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
 	<yalign>0.5</yalign>
 	<xpad>0</xpad>
-	<ypad>0</ypad>
+	<ypad>5</ypad>
 	<child>
 	  <padding>0</padding>
 	  <expand>False</expand>
@@ -670,33 +670,17 @@
       </widget>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<class>GtkFrame</class>
+	<name>frame1</name>
+	<label>Authors</label>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	<child>
 	  <padding>0</padding>
 	  <expand>False</expand>
 	  <fill>False</fill>
 	</child>
 
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label15</name>
-	  <label>Authors:</label>
-	  <justify>GTK_JUSTIFY_RIGHT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>1.67638e-08</yalign>
-	  <xpad>0</xpad>
-	  <ypad>10</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label16</name>
@@ -722,13 +706,8 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;</label>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0</yalign>
-	  <xpad>10</xpad>
-	  <ypad>10</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	</widget>
       </widget>
 
@@ -745,7 +724,7 @@ Henri Fallon &lt;henri@via.ecp.fr&gt;</label>
 	<child>
 	  <padding>0</padding>
 	  <expand>False</expand>
-	  <fill>True</fill>
+	  <fill>False</fill>
 	</child>
       </widget>
     </widget>

src/interface/intf_msg.c

@@ -348,6 +348,43 @@ void _intf_DbgMsgImm( char *psz_file, char *psz_function, int i_line,
 }
 #endif
 
+/*****************************************************************************
+ * intf_WarnHexDump : print a hexadecimal dump of a memory area
+ *****************************************************************************
+ * This is convenient for debugging purposes.
+ *****************************************************************************/
+void intf_WarnHexDump( int i_level, void *p_data, int i_size )
+{
+    int   i_index = 0;
+    int   i_subindex;
+    char  p_string[75];
+    u8   *p_area = (u8 *)p_data;
+
+    intf_WarnMsg( i_level, "hexdump: dumping %i bytes at address %p",
+                           i_size, p_data );
+
+    while( i_index < i_size )
+    {
+        i_subindex = 0;
+
+        while( ( i_subindex < 24 ) && ( i_index + i_subindex < i_size ) )
+        {
+            sprintf( p_string + 3 * i_subindex, "%.2x ",
+                     p_area[ i_index + i_subindex ] );
+
+            i_subindex++;
+        }
+
+        /* -1 here is safe because we know we printed at least one */
+        p_string[ 3 * i_subindex - 1 ] = '\0';
+        intf_WarnMsg( i_level, "0x%.4x: %s", i_index, p_string );
+
+        i_index += 24;
+    }
+
+    intf_WarnMsg( i_level, "hexdump: %i bytes dumped", i_size );
+}
+
 /*****************************************************************************
  * intf_FlushMsg                                                        (ok ?)
  *****************************************************************************

src/spu_decoder/spu_decoder.h

@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Samuel Hocevar <sam@zoy.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
@@ -43,6 +43,13 @@ typedef struct spudec_thread_s
      */
     vout_thread_t *     p_vout;          /* needed to create the spu objects */
 
+    /*
+     * Private properties
+     */
+    int                 i_spu_size;            /* size of current SPU packet */
+    int                 i_rle_size;                  /* size of the RLE part */
+    subpicture_t *      p_spu;
+
 } spudec_thread_t;
 
 /*****************************************************************************

src/video_output/video_output.c

@@ -6,7 +6,7 @@
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * 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

src/video_output/video_spu.h

@@ -3,7 +3,8 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Henri Fallon <henri@via.ecp.fr>
  *
  * 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

src/video_output/video_text.c

@@ -3,7 +3,8 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.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

src/video_output/video_text.h

@@ -3,7 +3,8 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.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

src/video_output/video_yuv.c

@@ -4,7 +4,7 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * 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

src/video_output/video_yuv.h

@@ -4,7 +4,7 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * 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