* Deinterlace support in the OS X interface.

* Bumped up version number to 0.4.2.

ChangeLog

@@ -4,6 +4,16 @@
 
 HEAD
 
+  * Nothing yet.
+
+0.4.2
+Mon, 20 Jun 2002 00:41:26 +0200
+
+  * ./plugins/macosx: new controls for audio output, and deinterlacing
+    support.
+  * ./plugins/macosx: fixed a bug with language and subtitle menus.
+  * ./plugins/access/http.c: should be more tolerant with old servers and
+    non-seekable streams.
   * ./plugins/filter/deinterlace.c: backported new deinterlacing routines.
   * ./include/threads.h, ./include/threads_funcs.h: backported the new Win32
     cond_wait implementation from MAIN.

README.MacOSX.rtf

@@ -82,7 +82,15 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
 \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 9. 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.2 2002/06/18 22:29:02 massiot Exp $}
+$Id: README.MacOSX.rtf,v 1.3.2.3 2002/06/19 22:45:25 massiot Exp $}
\ No newline at end of file

configure

@@ -775,7 +775,7 @@ test "$host_alias" != "$target_alias" &&
 
 
 PACKAGE="vlc"
-VERSION="0.4.1"
+VERSION="0.4.2"
 CODENAME=Ourumov
 
 save_CFLAGS="${CFLAGS}"

configure.in

@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 AC_CANONICAL_SYSTEM
 
 PACKAGE="vlc"
-VERSION="0.4.1"
+VERSION="0.4.2"
 CODENAME=Ourumov
 
 dnl Save CFLAGS and LDFLAGS

doc/release-howto.txt

@@ -14,6 +14,7 @@
      · vlc.spec
      · ipkg/control
      · debian/changelog
+     · extras/MacOSX/vlc.pbprj/project.pbxproj
   - mettre à jour les ChangeLog et la TODO list pour ceux qui auraient
     étourdiment oublié de l'updater à chaque commit
   - updater le numéro de version et le timestamp dans :

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -3,6 +3,7 @@
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
             ACTIONS = {
+                deinterlace = id; 
                 eject = id; 
                 faster = id; 
                 fullscreen = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -9,7 +9,7 @@
 		<key>235</key>
 		<string>401 417 350 182 0 0 1152 746 </string>
 		<key>29</key>
-		<string>809 162 262 44 0 0 1152 746 </string>
+		<string>367 465 262 44 0 0 1152 746 </string>
 		<key>445</key>
 		<string>347 561 370 117 0 0 1152 746 </string>
 		<key>460</key>
@@ -19,8 +19,8 @@
 	<string>248.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
 		<integer>528</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>5Q125</string>

ipkg/control

 Package: vlc
 Section: graphics
 Priority: optional
-Version: 0.4.1
+Version: 0.4.2
 Release: 1
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>

plugins/macosx/intf_controller.h

@@ -2,7 +2,7 @@
  * intf_controller.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.h,v 1.8.2.2 2002/06/02 12:17:23 massiot Exp $
+ * $Id: intf_controller.h,v 1.8.2.3 2002/06/19 22:45:26 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *
@@ -79,6 +79,7 @@
 - (IBAction)prevChannel:(id)sender;
 - (IBAction)nextChannel:(id)sender;
 - (IBAction)loop:(id)sender;
+- (IBAction)deinterlace:(id)sender;
 - (IBAction)mute:(id)sender;
 - (IBAction)fullscreen:(id)fullscreen;
 - (IBAction)eject:(id)sender;

plugins/macosx/intf_controller.m

@@ -2,7 +2,7 @@
  * intf_controller.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.m,v 1.4.2.3 2002/06/02 22:32:46 massiot Exp $
+ * $Id: intf_controller.m,v 1.4.2.4 2002/06/19 22:45:26 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -193,6 +193,22 @@
     }
 }
 
+- (IBAction)deinterlace:(id)sender
+{
+    NSMenuItem * item = (NSMenuItem *)sender;
+
+    if ( [item state] == NSOnState )
+    {
+        config_PutPszVariable( "filter", NULL );
+        [item setState:NSOffState];
+    }
+    else
+    {
+        config_PutPszVariable( "filter", "deinterlace:blend" );
+        [item setState:NSOnState];
+    }
+}
+
 - (IBAction)mute:(id)sender
 {
     NSMenuItem * item = (NSMenuItem *)sender;

vlc.spec

 
 
 %define name 		vlc
-%define vlc_ver 	0.4.1
+%define vlc_ver 	0.4.2
 %define version		%vlc_ver
 
 %define cvs     	0
@@ -411,6 +411,9 @@ rm -fr %buildroot
 %{_libdir}/videolan/vlc/alsa.so
 
 %changelog
+* Mon Jun 20 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.2-1mdk
+- new upstream release
+
 * Mon Jun 3 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.1-1mdk
 - new upstream release