This commit was manufactured by cvs2svn to create tag 'v0_4_6'.

AUTHORS

@@ -87,6 +87,12 @@ C: tcastley
 D: BeOS interface, BeOS Video
 S: Australia
 
+N: Stephan Assmus
+E:
+C: stippi
+D: BeOS interface, BeOS video
+S: 
+
 N: Rudolf Cornelissen
 E: rag.cornelissen@inter.nl.net
 D: BeOS fixes
@@ -176,6 +182,15 @@ E: alexis.guillard@bt.com
 D: IPv6
 S: United Kingdom
 
+N: Roine Gustafsson
+E: roine@popstar.com
+D: spudec bug fixes
+
+N: Gerald Hansink
+E: gerald.hansink@ordina.nl
+D: Qt Embedded Video Output
+S: Netherlands
+
 N: Shane Harper
 E: shanegh@optusnet.com.au
 D: SDL plugin fixes and enhancements
@@ -299,6 +314,10 @@ D: Many ports (Mac OS X, iPAQ, *BSD, Solaris...)
 D: documentation
 S: France
 
+N: Benjamin Mironer
+E: bmironer@noos.fr
+D: Mac OS X fixes
+
 N: Arkadiusz Miskiewicz
 E: misiek@pld.ORG.PL
 D: autoconf and Makefile patches
@@ -320,10 +339,16 @@ E: pomel@via.ecp.fr
 C: pomel
 S: France
 
+N: Remco Poortinga
+E: poortinga@telin.nl
+D: IPv6 multicast patch
+S: Netherlands
+
 N: Jean-Paul Saman
 E: jpsaman@wxs.nl
 D: libmad plug-in
 D: iPAQ port
+D: Familiar Linux interface
 S: Netherlands
 
 N: Steven M. Schultz

BUGS

-List of known vlc bugs $Id: BUGS,v 1.13 2002/05/20 22:30:19 sam Exp $
+List of known vlc bugs $Id: BUGS,v 1.13.2.1 2002/07/11 07:58:53 tcastley Exp $
 
    Please try to keep this file up to date. Also, grep for FIXME in the
 source files for more and more bugs to fix.
@@ -36,6 +36,9 @@ Video output:
   * On-the-fly resizing when using a chroma transformation doesn't work for
   all plugins. Currently it is only implemented for x11 and SDL.
 
+  * The SPU decoder does not respect the pitch of the output buffer.  This 
+  causes distortion of subtitles on GeForce cards in BeOS (and Windows I think).
+
 Chroma transformations:
 
   * Most chroma transformation modules completely ignore margins.

FAQ

 Frequentely Asked Questions for VideoLAN Client
-$Id: FAQ,v 1.6 2002/05/02 23:06:27 massiot Exp $
+$Id: FAQ,v 1.6.2.3 2002/11/13 09:45:50 sam Exp $
 
 1. Using VLC
 
@@ -55,6 +55,41 @@ You shouldn't need any option. If you're paranoid and want to control
 everything, here is the exact syntax :
     vlc udp:[<server>[:<server port>]][@[<bind address>][:<bind port>]]
 
+1.8 How do I uninstall / reinstall VLC ?
+--------------------------------------
+Why would you want to ?  ;)
+
+If you're using a source distribution of VLC, for example a tarball or
+the CVS, then you have probably used "make install" to install the
+compiled VLC.  To remove it just "make uninstall".  If you want to
+install a newer version than the currently installed one, you should
+first uninstall the first one.  If you deleted the original source tree,
+a "make uninstall" in the newer tree should still work.
+
+For binary packages, remove old packages first and install the new ones
+(normally this should be handled automagically by your sytem).
+
+1.9 Debian: what should I put in my sources.list for videolan ?
+-------------------------------------------------------------
+deb     http://www.videolan.org/pub/videolan/debian $(ARCH)/
+deb-src http://www.videolan.org/pub/videolan/debian sources/
+
+1.10 How can I save my VLC configuration ?
+----------------------------------------
+Currently, the only way to save the configuration options in VLC is through
+the preferences menu in one of the graphical user interface plugins.
+
+1.11 Where does VLC store it's config file ?
+------------------------------------------
+Currently, a config file is created on a per user basis (there is no global
+configuration file). If you modify the available options in VLC and save the
+new configuration, then a configuration file will be created in your user
+directory. The precise location of this file depends on the Operating System
+you are running:
+
+- Unices (linux, etc...): "~/.videolan/vlcrc"
+- Windows: "Application Data\videolan\vlcrc"
+
 
 2. Troubleshooting
 
@@ -118,7 +153,48 @@ is being investigated.
 
 2.9 Sound volume is too low
 ----------------------------
-You can raise it with --volume commandline switch.
+You can raise it with --volume commandline switch or in the preferences
+window of your graphical interface.
+
+2.10 I have no image under DirectX
+----------------------------------
+Check that your video card drivers are in their latest version and that
+your DirectX is up-to-date.
+
+2.11 VLC crashes
+----------------
+Increase the verbosity level (either in the preferences or with a
+"-vvvv" command-line option) and look at the debug messages (on the
+terminal or in the Messages window).
+
+2.12 I can only play a DVD as root
+----------------------------------
+Check that as user you have write access to your DVD drive / device.
+
+2.13 I'm stuck with option xxx, how do I reset options ?
+------------------------------------------------------
+Under unices, remove your ~/.videolan/vlcrc; for Windows, remove vlcrc
+in the videolan subfolder of your "Application Data" directory.
+
+2.14 I don't have access to the GUI anymore
+-------------------------------------------
+If you change the default interface module in the preferences menu to a non
+GUI module (ie. to a command line interface) and then save the configuration,
+the only way to get VLC to show a GUI again is to run it directly from the
+command line.
+For instance on Windows, you need to open a dos command box, go to the
+directory where you installed VLC (usually
+c:\Program Files\VideoLAN\VideoLAN Client) and then type "vlc --intf win32"
+You will then be able to modify the configuration again and save it.
+
+2.15 I have just upgraded to VLC 0.4.5, and now I don't have any sound
+with the streams coming from the VLS !
+---------------------------------------------------------------------------
+This is a known problem. VLC 0.4.5 and later are now compliant to general
+usage regarding A/52 sound, and the new behavior is incompatible with the
+previous one. VLS version 0.4.0 and later now fixes this problem. If, for
+a reason or another, you wish to keep VLS 0.3.3, you can still read those
+streams if you launch VLC (0.4.5 or later) with --vls-backwards-compat.
 
 
 3. Ports and features
@@ -130,6 +206,9 @@ You can raise it with --volume commandline switch.
 Currently it doesn't. We'd be glad to support them, but we lack technical
 information on them.
 
+3.1.2 [REMOVED]
+---------------
+
 3.2 Win32 port
 
 3.2.2 When moving the focus to another window, VLC network input stops
@@ -137,3 +216,20 @@ working properly !
 ---------------------------------------------------------------------------
 This is a known problem with Win 95-class systems. Upgrade to an NT-class
 system.
+
+3.3 Planned ports
+
+3.3.1 Do you have plans for a MacOS 9 / OS/2 / &{#!@}~ port ?
+--------------------------------------------------------
+No, nobody reported to be actually working on a MacOS 9 port.  If you
+feel like you could write it, we would of course welcome it.  Currently,
+the developers are more interested in supporting the latest Operating
+Systems and completing the functionalities.
+
+3.3.2 Does VLC have dxr2 / dxr3 cards support ?
+---------------------------------------------
+This support is currently being developed.
+
+3.3.3 Does VLC support RTP ?
+--------------------------
+Yes. Just use vlc rtp:@<mcast addr>:<local port>.

INSTALL.win32

@@ -14,10 +14,8 @@ To store a debug log of the current vlc session, you can use
 disable the GUI. You will end-up with a vlc.log file in your current directory.
 
 If you want to play a DVD, run vlc and click on the Disc option in the
-interface. You then have to type your drive letter in the 'Device name'
-box (eg. 'D' if this is the letter for your dvdrom drive).
-( !WARNING: you have to be in administrator mode (for now) on Win2k/XP or the
-  DVD won't play. )
+interface. You then have to type your drive letter followed by a colon in
+the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive).
 
 Building VideoLAN Client from the source code
 =============================================

Makefile

@@ -33,6 +33,7 @@ PLUGINS_DIR :=	a52 \
 		dvd \
 		dvdread \
 		esd \
+		familiar \
 		fb \
 		ffmpeg \
 		filter \
@@ -55,8 +56,10 @@ PLUGINS_DIR :=	a52 \
 		mpeg_vdec \
 		network \
 		ogg \
+		opie \
 		qnx \
 		qt \
+		qte \
 		satellite \
 		sdl \
 		spudec \
@@ -71,6 +74,7 @@ PLUGINS_TARGETS := a52/a52 \
 		ac3_spdif/ac3_spdif \
 		access/file \
 		access/udp \
+		access/rtp \
 		access/http \
 		alsa/alsa \
 		arts/arts \
@@ -94,6 +98,7 @@ PLUGINS_TARGETS := a52/a52 \
 		dvd/dvd \
 		dvdread/dvdread \
 		esd/esd \
+		familiar/familiar \
 		fb/fb \
 		ffmpeg/ffmpeg \
 		filter/filter_deinterlace \
@@ -102,6 +107,7 @@ PLUGINS_TARGETS := a52/a52 \
 		filter/filter_distort \
 		filter/filter_wall \
 		filter/filter_clone \
+		filter/filter_crop \
 		fx/fx_scope \
 		ggi/ggi \
 		glide/glide \
@@ -142,8 +148,10 @@ PLUGINS_TARGETS := a52/a52 \
 		network/ipv4 \
 		network/ipv6 \
 		ogg/vorbis \
+		opie/opie \
 		qnx/qnx \
 		qt/qt \
+		qte/qte \
 		satellite/satellite \
 		sdl/sdl \
 		spudec/spudec \
@@ -342,7 +350,7 @@ dist:
 		echo "OK."; mkdir tmp; \
 	fi
 	# Copy directory structure in tmp
-	find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
+	find . -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
 		do mkdir -p tmp/vlc/$$i ; \
 	done
 	rm -Rf tmp/vlc/tmp
@@ -368,7 +376,7 @@ dist:
 	for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
 	# Copy misc files
 	cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
-		ABOUT-NLS BUGS MODULES vlc.spec \
+		ABOUT-NLS BUGS plugins/LIST vlc.spec \
 		Makefile Makefile.*.in Makefile.dep Makefile.modules \
 		configure configure.in install-sh install-win32 macosx-dmg \
 		config.sub config.guess aclocal.m4 mkinstalldirs \
@@ -379,8 +387,8 @@ dist:
 	for file in control changelog rules ; do \
 		cp debian/$$file tmp/vlc/debian/ ; done
 	# Copy ipkg control files
-	for file in control rules patch ; do \
-		cp ipkg/$$file tmp/vlc/ipkg/ ; done
+	for file in ipkg/* ; do \
+		cp $$file tmp/vlc/ipkg/ ; done
 	# Copy fonts and icons
 	for file in share/*vlc* share/*psf; do \
 		cp $$file tmp/vlc/share ; done
@@ -437,6 +445,7 @@ package-beos:
 	# Copy relevant files
 	cp vlc tmp/vlc/
 	strip tmp/vlc/vlc
+	xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
 	cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
 	for file in default8x16.psf default8x9.psf ; \
 		do cp share/$$file tmp/vlc/share/ ; done

Makefile.modules

@@ -89,7 +89,7 @@ ifeq (,$($(module_name)_CUSTOM))
 
 ../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
 	rm -f $@
-	ar rc $@ $(OBJ_ALL)
+	$(AR) rc $@ $(OBJ_ALL)
 	$(RANLIB) $@
 endif
 

Makefile.opts.in

@@ -63,6 +63,7 @@ dvdread_CFLAGS = @dvdread_CFLAGS@
 mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
 directx_CFLAGS = @directx_CFLAGS@
 esd_CFLAGS = @esd_CFLAGS@
+familiar_CFLAGS = @familiar_CFLAGS@
 ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
 glide_CFLAGS = @glide_CFLAGS@
 gnome_CFLAGS = @gnome_CFLAGS@
@@ -72,7 +73,9 @@ idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
 mad_CFLAGS = @mad_CFLAGS@
 memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
+opie_CFLAGS = @opie_CFLAGS@
 qt_CFLAGS = @qt_CFLAGS@
+qte_CFLAGS = @qte_CFLAGS@
 sdl_CFLAGS = @sdl_CFLAGS@
 x11_CFLAGS = @x11_CFLAGS@
 xvideo_CFLAGS = @xvideo_CFLAGS@
@@ -96,6 +99,7 @@ dvd_LDFLAGS = @dvd_LDFLAGS@
 dvdread_LDFLAGS = @dvdread_LDFLAGS@
 mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
 esd_LDFLAGS = @esd_LDFLAGS@
+familiar_LDFLAGS = @familiar_LDFLAGS@
 filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
 ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
 ggi_LDFLAGS = @ggi_LDFLAGS@
@@ -116,8 +120,10 @@ mad_LDFLAGS = @mad_LDFLAGS@
 memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
 motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
 ncurses_LDFLAGS = @ncurses_LDFLAGS@
+opie_LDFLAGS = @opie_LDFLAGS@
 qnx_LDFLAGS = @qnx_LDFLAGS@
 qt_LDFLAGS = @qt_LDFLAGS@
+qte_LDFLAGS = @qte_LDFLAGS@
 rc_LDFLAGS = @rc_LDFLAGS@
 sdl_LDFLAGS = @sdl_LDFLAGS@
 vcd_LDFLAGS = @vcd_LDFLAGS@

README.MacOSX.rtf

-{\rtf1\mac\ansicpg10000\cocoartf100
{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww11240\viewh10380\viewkind0
\hyphauto1\hyphfactor90
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc

\f0\fs48 \cf0 VideoLAN Client (VLC) version 0.4\
Mac OS X-specific information
\fs24 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 \
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
\cf0 Welcome to the VideoLAN Client ! VLC is a multi-purpose mutimedia tool : it can play DVDs and VCDs, or read a stream from the network. It also supports DivX/MPEG-4 files and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in Quicktime. VLC has originally been developed for GNU/Linux systems, but has been ported to numerous operating systems, including Mac OS X and Win32. The Mac OS X port is a bit young and immature, as you will notice, and there are many caveats. We are working hard to improve it, and if you think you can help us in any way, please drop us a line.\
\
You may find the following frequentely asked questions useful :\
\

\f1\b \ul 1. How do I install ?
\f0\b0 \ulnone \
When you download VLC, you will end up with a vlc-0.4.0.dmg file. Doubleclick, or drop it on the application Disk Copy, to open this file. An icon will now appear on your Desktop, right beside your drive(s). Open it and drag the vlc application from the resulting window to the place where you want to install it. Most often this is /Applications.\
\
\

\f1\b \ul 2. How do use VLC?
\f0\b0 \ulnone \
To use VLC, you will need to open the application first and then from the "File" menu open the file or disk, you would like to view. Doubleclicking a file will result in Quicktime trying to open it and Quicktime can not benefit from the advantages VLC brings.\

\f1\b \ul \
\
3. How do I read an SVCD ?
\f0\b0 \ulnone \
VLC is currently unable to read SVCD directly from the drive. SVCDs contain plain MPEG-2 files which can be directly read. Just copy the .dat files in the SVCD onto your hard drive, and use the "Open File" menu item in VLC (drag and drop doesn't work yet).\
\
\

\f1\b \ul 4. The video is choppy ! It's like we're dropping frames\

\f0\b0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all frames. Though there is some room for improvement, do never expect VLC to be able to decode MPEG-2 streams on a low-end G3 machine. Apple DVD player uses specific hardware accelerations from the video board of those systems, and we currently lack documentation to do the same. If you think you have information which might help us, please contact us, otherwise please don't complain about this.\
\
If VLC is slow on your G4 system, try and quit or hide all running applications. See with 
\f2 top -u
\f0  in a terminal window which applications take the CPU. Minimizing the VLC controller window might help, too. Be aware of bouncing icons in the dock. Bounces seriously effect the performance of VLC. The same goes for any time interval process (Checking mail every 2 minutes).\
\
\

\f1\b \ul 5. I only get a black picture !\

\f0\b0 \ulnone We haven't found the reason why some people get this problem. However, users have indicated a workaround : switch your screen depth to thousands of colors instead of millions. If you think you have information to help us find the bug, please drop us a mail.\
\
\

\f1\b \ul 6. How do I hide the mouse cursor ?
\f0\b0 \ulnone \
Just double-click on the movie.\
\
\

\f1\b \ul 7. How do remove VLC ?
\f0\b0 \ulnone \
Simply drag VLC from the place where you have installed it, to the Trash.\
\
\
Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \
-- \
Christophe Massiot <massiot@via.ecp.fr>, for the VideoLAN team.\
$Id: README.MacOSX.rtf,v 1.3 2002/05/23 21:42:43 massiot Exp $}
+{\rtf1\mac\ansicpg10000\cocoartf102
\ No newline at end of file
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
+}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww11240\viewh10380\viewkind0
+\hyphauto1\hyphfactor90
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+
+\f0\fs48 \cf0 VideoLAN Client (VLC) version 0.4\
+Mac OS X-specific information
+\fs24 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 \
+\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
+\cf0 Welcome to the VideoLAN Client ! VLC is a multi-purpose mutimedia tool : it can play DVDs and VCDs, or read a stream from the network. It also supports DivX/MPEG-4 files and is unaffected by the dreaded .avi bug which can cause choppy sound when playing DivX in Quicktime. VLC has originally been developed for GNU/Linux systems, but has been ported to numerous operating systems, including Mac OS X and Win32. The Mac OS X port is a bit young and immature, as you will notice, and there are many caveats. We are working hard to improve it, and if you think you can help us in any way, please drop us a line.\
+\
+You may find the following frequentely asked questions useful :\
+\
+
+\f1\b \ul 1. How do I install ?
+\f0\b0 \ulnone \
+When you download VLC, you will end up with a vlc-0.4.5.dmg file. Double-click, or drop it on the application Disk Copy, to open this file. An icon will now appear on your Desktop, right beside your drive(s). Open it and drag the vlc application from the resulting window to the place where you want to install it. Most often this is /Applications.\
+\
+\
+
+\f1\b \ul 2. How do use VLC?
+\f0\b0 \ulnone \
+To use VLC, you will need to open the application first and then from the "File" menu open the file or disk, you would like to view. Doubleclicking a file will result in QuickTime Player trying to open it and QuickTime Player can not benefit from the advantages VLC brings.\
+
+\f1\b \ul \
+\
+3. How do I read an SVCD ?
+\f0\b0 \ulnone \
+VLC is currently unable to read SVCD directly from the drive. SVCDs contain plain MPEG-2 files which can be directly read. Just copy the .dat files in the SVCD onto your hard drive, and use the "Open File" menu item in VLC (drag and drop doesn't work yet). Some SVCDs can be read if you tell VLC they're VCDs, in the "Open Disc" dialog.\
+\
+\
+
+\f1\b \ul 4. The video is choppy ! It's like we're dropping frames\
+
+\f0\b0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all frames. Though there is some room for improvement, do never expect VLC to be able to decode MPEG-2 streams on a low-end G3 machine. Apple DVD player uses specific hardware accelerations from the video board of those systems, and we currently lack documentation to do the same. If you think you have information which might help us, please contact us, otherwise please don't complain about this.\
+\
+If VLC is slow on your G4 system, try and quit or hide all running applications. See with 
+\f2 top -u
+\f0  in a terminal window which applications take the CPU. Minimizing the VLC controller window might help, too. Be aware of bouncing icons in the dock. Bounces seriously effect the performance of VLC. The same goes for any time interval process (Checking mail every 2 minutes).\
+\
+\
+
+\f1\b \ul 5. How do I hide the mouse cursor ?
+\f0\b0 \ulnone \
+Just double-click on the movie.\
+\
+\
+
+\f1\b \ul 6. How do I remove VLC ?
+\f0\b0 \ulnone \
+Simply drag VLC from the place where you have installed it, to the Trash.\
+\
+\
+
+\f1\b \ul 7. Where can I find an older version for Mac OS 9 ?\
+
+\f0\b0 \ulnone There is no version for Mac OS 9. VLC is originally a UNIX application and has never been ported to Mac OS 9. Considering the amount of differences between Mac OS 9 and modern systems, it would require a tremendous work to port VLC. We do not plan to do it. So please don't ask.\
+\
+\
+
+\f1\b \ul 8. How do I enable deinterlacing ?\
+
+\f0\b0 \ulnone You must select the "Deinterlace" menu item 
+\f1\b before
+\f0\b0  opening any file. If the item is selected while reading a file, nothing will happen. This is a known issue, please do not report it.\
+\
+\
+Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \
+-- \
+Christophe Massiot <massiot@via.ecp.fr>, for the VideoLAN team.\
+$Id: README.MacOSX.rtf,v 1.3.2.5 2002/10/13 22:34:21 massiot Exp $}
\ No newline at end of file

TODO

@@ -47,7 +47,7 @@ Urgency: Wishlist
 Description: Share stream information between vlc and vls
  vls should send misc TS packets to let us know what the stream PID
  contain, such as the language, or the subtitle palette.
-Status: Todo
+Status: Done (collective work)
 
 Task: 0x59
 Difficulty: Hard
@@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues
  A few DVDs are still reported not to work at all. Try to find what is
  causing this, have a more robust DVD input, and list all discs reported
  to work flawlessly to prevent bug regression.
-Status: Todo
+Status: Done (collective work)
 
 Task: 0x4e
 Difficulty: Hard
@@ -169,7 +169,7 @@ Urgency: Normal
 Description: Write AVI input plugin
  .avi files can use MPEG codec, if this is the case it shouldn't be
  hard to read those files -> Meuuh
-Status: Todo
+Status: Done 23 Apr 2002 (fenrir)
 
 Task: 0x4a
 Difficulty: Medium
@@ -459,7 +459,7 @@ Difficulty: Hard
 Urgency: Wishlist
 Description: MP3 support
  The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that.
-Status: Todo
+Status: Done 10 May 2002 (fenrir)
 
 Task: 0x25
 Difficulty: Hard

ipkg/control

 Package: vlc
 Section: graphics
 Priority: optional
-Version: 0.4.0
+Version: 0.4.6
 Release: 1
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
-Depends: libc6, task-x
+Depends: libc6, task-x, sdl, libgtk1.2, libgtk2.0
 Copyright: GPL
 Description: VideoLAN Client is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 

ipkg/control.gpe

+Package: vlc
+Section: graphics
+Priority: optional
+Version: 0.4.5
+Release: 1
+Architecture: arm
+Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
+Depends: libc6, task-x, libsdl, libgpewidget0, libgtk1.2 
+Copyright: GPL
+Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+ VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
+ source can be found on: 
+ http://www.videolan.org/pub/videolan/vlc/
+ The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
+ Program Streams from the network or from a file, as well as direct DVD 
+ playback. 

ipkg/control.opie

+Package: vlc
+Section: graphics
+Priority: optional
+Version: 0.4.5
+Release: 1
+Architecture: arm
+Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
+Depends: libc6
+Copyright: GPL
+Description: VideoLAN Client is a free network-aware MPEG and DVD player.
+ VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 
+ source can be found on: 
+ http://www.videolan.org/pub/videolan/vlc/
+ The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
+ Program Streams from the network or from a file, as well as direct DVD 
+ playback. 

ipkg/postinst.gpe

+#!/bin/sh
+# patch for gtk-1.2 installation
+#if [ ! -x /usr/lib/libgtk.so ] ; then 
+#   ln -s /usr/lib/libgtk-1.2.so.0.9.1 /usr/lib/libgtk.so 
+#fi
+#if [ ! -x /usr/lib/libgdk.so ] ; then
+#   ln -s /usr/lib/libgdk-1.2.so.0.9.1 /usr/lib/libgdk.so
+#fi
+#ldconfig
+# update menus
+if [ -x /usr/bin/update-menus ] && [ ! /usr/bin/update-menus ] ; then 
+   exit $?; 
+fi

ipkg/postinst.opie

+#!/bin/sh
+if [ -x /usr/share/vlc ] ; then
+   ln -s /usr/share/vlc /opt/QtPalmtop/pics/vlc
+fi
+exit 0

ipkg/postrm.gpe

+#!/bin/sh
+#if [ -x /usr/lib/libgtk.so ] ; then
+#   rm /usr/lib/libgtk.so
+#fi
+#if [ -x /usr/lib/libgdk.so ] ; then
+#   rm /usr/lib/libgdk.so
+#fi
+#ldconfig
+if [ -x /usr/bin/update-menus ] && [ ! /usr/bin/update-menus ] ; then 
+   exit $?; 
+fi

ipkg/postrm.opie

+#!/bin/sh
+[ -x /opt/QtPalmtop/pics/vlc ] || rm /opt/QtPalmtop/pics/vlc
+exit 0
+

ipkg/rules

@@ -19,7 +19,7 @@ build-stamp:
 		$(shell echo $(CONFIG_FLAGS))
 
 # This is ugly -- I know
-	patch -p 0 < ipkg/patch
+	patch -p 0 < ipkg/sdl.patch
 
 	$(MAKE)
 

ipkg/vlc.desktop

+[Desktop Entry]
+Comment=Multiplatform Multimedia Player
+Exec=vlc.opie
+Icon=vlc/vlc48x48.png
+Name=VideoLAN Client

ipkg/vlc.gpe

+?package(vlc): \
+ needs=x11 \
+ section=Graphics \
+ logtitle="VideoLAN Client" \
+ title="VideoLAN Client" \
+ command="vlc" \
+ icon48=/usr/share/videolan/vlc48x48.png \
+ windowtitle="VideoLAN Client"
+

ipkg/vlc.opie

+#!/bin/sh
+export QTDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=.:/usr/X11R6/lib:/opt/QtPalmtop/lib:/lib/videolan/vlc
+/usr/bin/vlc

MODULES → plugins/LIST

 List of vlc plugins
-$Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $
+$Id: LIST,v 1.1.2.2 2002/09/30 20:13:19 jpsaman Exp $
 
  * ac3_adec: software AC3 decoder.
 
@@ -41,6 +41,8 @@ $Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $
 
  * esd: audio output module using the Esound sound daemon.
 
+ * familiar: interface for iPaq using the Gtk+ widget set.
+
  * fb: video output module for the Linux framebuffer.
 
  * filter_deinterlace: naive deinterlacing filter.
@@ -123,6 +125,8 @@ $Id: MODULES,v 1.3 2002/01/30 00:09:49 sam Exp $
 
  * qt: interface module using the Qt widget set.
 
+ * qte: video output module for Qt Embedded.
+
  * rc: interface module using stdio.
 
  * sdl: audio output and video output module using the SDL library.

plugins/beos/ListViews.h

+/*****************************************************************************
+ * ListViews.h: BeOS interface list view class prototype
+ *****************************************************************************
+ * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * $Id: ListViews.h,v 1.1.2.1 2002/09/29 12:06:08 titer Exp $
+ *
+ * Authors: Stephan Aßmus <stippi@yellowbites.com>
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef LIST_VIEWS_H
+#define LIST_VIEWS_H
+
+#include <ListItem.h>
+#include <ListView.h>
+
+class InterfaceWindow;
+
+// PlaylistItem
+class PlaylistItem : public BStringItem
+{
+ public:
+							PlaylistItem( const char* name );
+		virtual				~PlaylistItem();
+
+		virtual	void		Draw( BView* owner, BRect frame,
+								  bool tintedLine,
+								  bool active = false,
+								  bool playing = false );
+
+};
+
+// DragSortableListView
+class DragSortableListView : public BListView
+{
+ public:
+							DragSortableListView( BRect frame,
+												  const char* name,
+												  list_view_type type
+														= B_SINGLE_SELECTION_LIST,
+												  uint32 resizingMode
+														= B_FOLLOW_LEFT
+														  | B_FOLLOW_TOP,
+												  uint32 flags
+														= B_WILL_DRAW
+														  | B_NAVIGABLE
+														  | B_FRAME_EVENTS );
+	virtual					~DragSortableListView();
+
+							// BListView
+	virtual	void			Draw( BRect updateRect );
+	virtual	bool			InitiateDrag( BPoint point, int32 index,
+										  bool wasSelected );
+	virtual void			MessageReceived( BMessage* message );
+	virtual void			MouseMoved( BPoint where, uint32 transit,
+										const BMessage* dragMessage );
+	virtual void			MouseUp( BPoint where );
+	virtual	void			WindowActivated( bool active );
+	virtual void			DrawItem( BListItem *item, BRect itemFrame,
+									  bool complete = false);
+
+							// DragSortableListView
+	virtual	BListItem*		CloneItem( int32 atIndex ) const = 0;
+	virtual	void			DrawListItem( BView* owner, int32 index,
+										  BRect itemFrame ) const = 0;
+	virtual	void			MakeDragMessage( BMessage* message ) const = 0;
+
+ private:
+	int32			fDropIndex;
+};
+
+// PlaylistView
+class PlaylistView : public DragSortableListView
+{
+ public:
+							PlaylistView( BRect frame,
+										  InterfaceWindow* mainWindow );
+							~PlaylistView();
+
+							// BListView
+	virtual	void			AttachedToWindow();
+	virtual void			MouseDown( BPoint where );
+	virtual	void			KeyDown( const char* bytes, int32 numBytes );
+	virtual	void			Pulse();
+
+							// DragSortableListView
+	virtual	BListItem*		CloneItem( int32 atIndex ) const;
+	virtual	void			DrawListItem( BView* owner, int32 index,
+										  BRect itemFrame ) const;
+	virtual	void			MakeDragMessage( BMessage* message ) const;
+
+							// PlaylistView
+			void			SetCurrent( int32 index );
+			void			SetPlaying( bool playing );
+
+ private:
+	int32					fCurrentIndex;
+	bool					fPlaying;
+	InterfaceWindow*		fMainWindow;
+};
+
+#endif // LIST_VIEWS_H

plugins/beos/intf_vlc_wrapper.h

+/*****************************************************************************
+ * intf_vlc_wrapper.h: BeOS plugin for vlc (derived from MacOS X port )
+ *****************************************************************************
+ * Copyright (C) 2001 VideoLAN
+ * $Id: intf_vlc_wrapper.h,v 1.1.2.4 2002/10/09 15:29:51 stippi Exp $
+ *
+ * Authors: Florian G. Pflug <fgp@phlo.org>
+ *          Jon Lech Johansen <jon-vl@nanocrew.net>
+ *          Tony Casltey <tony@castley.net>
+ *          Stephan Aßmus <stippi@yellowbites.com>
+ *
+ * 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.
+ *****************************************************************************/
+class InterfaceWindow;
+
+/*****************************************************************************
+ * intf_sys_t: description and status of FB interface
+ *****************************************************************************/
+typedef struct intf_sys_s
+{
+    InterfaceWindow * p_window;
+    char              i_key;
+    int               b_disabled_menus;
+    int	              i_part;
+    int               i_saved_volume;
+    int               b_loop;
+    int               i_channel;
+    int               b_mute;
+} intf_sys_t;
+
+/* Intf_VLCWrapper is a singleton class
+    (only one instance at any time) */
+class Intf_VLCWrapper
+{
+public:
+    static bool manage();
+    static void quit();
+    /* playlist control */
+    static bool playlistPlay();
+    static void playlistPause();
+    static void playlistStop();
+    static void playlistNext();
+    static void playlistPrev();
+    static void playlistJumpTo( int pos );
+    static int playlistCurrentPos();
+    static int playlistSize();
+	static void playlistLock();
+	static void playlistUnlock();
+
+    static void getNavCapabilities( bool* canSkipPrev,
+    								bool* canSkipNext );
+	static void	navigatePrev();
+	static void	navigateNext();
+
+//    static void channelNext();
+//    static void channelPrev();
+    static void loop();
+
+    /* playback control */
+    static void playSlower();
+    static void playFaster();
+    static void volume_mute();
+    static void volume_restore();
+    static void set_volume(int value);
+    static void toggle_mute();
+    static bool is_muted();
+    static bool is_playing();
+    static void maxvolume();
+    static bool has_audio();
+//    static void fullscreen();
+    static void eject();
+
+    /* playback info */
+    static const char* getTimeAsString();
+    static float  getTimeAsFloat();
+    static void   setTimeAsFloat( float i_offset );
+    static bool   playlistPlaying();
+    static BList* playlistAsArray();
+    static void   getPlaylistInfo( int32& currentIndex,
+    							   int32& maxIndex );
+    static void   getTitleInfo( int32& currentIndex,
+    							int32& maxIndex );
+    static void   getChapterInfo( int32& currentIndex,
+    							  int32& maxIndex );
+
+    /* open file/disc/network */
+    static void openFiles( BList *o_files, bool replace = true );
+    static void openDisc( BString o_type, BString o_device,
+    					  int i_title, int i_chapter );
+    static void openNet( BString o_addr, int i_port );
+    static void openNetChannel( BString o_addr, int i_port );
+    static void openNetHTTP( BString o_addr );
+
+    /* menus management */
+    static void toggleProgram( int i_program );
+    static void toggleTitle( int i_title );
+    static void toggleChapter( int i_chapter );
+    static void toggleLanguage( int i_language );
+    static void toggleSubtitle( int i_subtitle );
+    static void setupMenus();
+};
+

plugins/familiar/Makefile

+familiar_SOURCES = familiar.c familiar_interface.c familiar_support.c familiar_callbacks.c

plugins/familiar/familiar.h

+/*****************************************************************************
+ * familiar.h: private Gtk+ interface description
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: familiar.h,v 1.6.2.3 2002/10/07 21:49:53 jpsaman Exp $
+ *
+ * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ *
+ * 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.
+ *****************************************************************************/
+
+#define MAX_ATEXIT                 10
+
+/*****************************************************************************
+ * intf_sys_t: description and status of Gtk+ interface
+ *****************************************************************************/
+typedef struct intf_sys_s
+{
+    /* windows and widgets */
+    GtkWidget *         p_window;                             /* main window */
+    GtkNotebook *       p_notebook;
+    GtkCList    *       p_clist;
+//    GHashTable *        config_hash_table;
+    boolean_t           b_autoplayfile;
+
+    /* XXX: Ugly kludge, see gtk.c */
+    void             ( *pf_callback[MAX_ATEXIT] ) ( void );
+} intf_sys_t;
+
+/*****************************************************************************
+ * Useful macro
+ ****************************************************************************/
+#define  GtkGetIntf( widget ) __GtkGetIntf( GTK_WIDGET( widget ) )
+void * __GtkGetIntf( GtkWidget * );
+
+

plugins/familiar/familiar_callbacks.h

+/*****************************************************************************
+ * familiar_callbacks.h : familiar plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: familiar_callbacks.h,v 1.7.2.6 2002/10/29 20:53:30 jpsaman Exp $
+ *
+ * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ *
+ * 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.
+ *****************************************************************************/
+
+#include <gtk/gtk.h>
+
+gboolean GtkExit                ( GtkWidget *, gpointer );
+
+void ReadDirectory(GtkCList *clist, char *psz_dir);
+void OpenDirectory(GtkCList *clist, char *psz_dir);
+
+void
+on_toolbar_open_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_preferences_clicked         (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_rewind_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_pause_clicked               (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_play_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_stop_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_forward_clicked             (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_toolbar_about_clicked               (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_comboURL_entry_changed              (GtkEditable     *editable,
+                                        gpointer         user_data);
+
+
+void
+on_clistmedia_click_column             (GtkCList        *clist,
+                                        gint             column,
+                                        gpointer         user_data);
+
+void
+on_clistmedia_select_row               (GtkCList        *clist,
+                                        gint             row,
+                                        gint             column,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+on_cbautoplay_toggled                  (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+
+gboolean
+on_familiar_delete_event               (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+on_buttonSave_clicked                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_buttonApply_clicked                 (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_buttonCancel_clicked                (GtkButton       *button,
+                                        gpointer         user_data);

plugins/familiar/familiar_interface.h

+/*
+ * DO NOT EDIT THIS FILE - it is generated by Glade.
+ */
+
+GtkWidget* create_familiar (void);

plugins/qte/Makefile

+qte_SOURCES = qte.c qte.cpp
+#qte_CFLAGS = -I$(QTDIR)/include -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti
+#qte_LDFLAGS = -L$(QTDIR)/lib -lqpe -lqte

share/familiar-forwardb16x16.xpm

+/* XPM */
+static char * familiar_forwardb16x16_xpm[] = {
+"16 16 2 1",
+" 	c None",
+".	c #000000",
+"                ",
+"                ",
+"    ..    ...   ",
+"    ...   ...   ",
+"    ....  ...   ",
+"    ..... ...   ",
+"    .........   ",
+"    .........   ",
+"    .........   ",
+"    ..... ...   ",
+"    ....  ...   ",
+"    ...   ...   ",
+"    ..    ...   ",
+"                ",
+"                ",
+"                "};