Ported previous stable commits.

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;}
+{\colortbl;\red255\green255\blue255;\red255\green3\blue0;}
 \margl1440\margr1440\vieww11240\viewh10380\viewkind0
 \hyphauto1\hyphfactor90
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
@@ -15,6 +15,19 @@ Mac OS X-specific information
 \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.\
 \
+
+\fs48 \cf2 IMPORTANT NOTE
+\fs24 \cf0 \
+\
+
+\f1\b VLC is NOT compatible with QuickTime 6 Preview. At this point, we suspect a bug in QuickTime 6 Preview. Known workaround are :\
+- switch the screen depth to thousands of colors ;\
+- downgrade to QuickTime 5 (see http://docs.info.apple.com/article.html?artnum=120084)\
+\
+Please do NOT report any problem with QuickTime 6 Preview. Use it at your own risks. Any report involving QuickTime 6 Preview will be deleted.
+\f0\b0 \
+\
+\
 You may find the following frequentely asked questions useful :\
 \
 
@@ -48,7 +61,7 @@ If VLC is slow on your G4 system, try and quit or hide all running applications.
 
 \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. Downgrading QuickTime to 5.0 may help, too.\
+\f0\b0 \ulnone Are you sure you do not have QuickTime 6 Preview installed ?.\
 \
 \
 
@@ -63,7 +76,13 @@ Just double-click on the movie.\
 Simply drag VLC from the place where you have installed it, to the Trash.\
 \
 \
+
+\f1\b \ul 8. 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.\
+\
+\
 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.4 2002/06/02 23:03:22 massiot Exp $}
+$Id: README.MacOSX.rtf,v 1.5 2002/06/18 23:18:40 massiot Exp $}
\ No newline at end of file

configure

@@ -3296,7 +3296,7 @@ fi
 
 save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"
 
-for ac_func in gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2
+for ac_func in gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3303: checking for $ac_func" >&5

configure.in

@@ -126,7 +126,7 @@ dnl The -DSYS_FOO flag
 save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"
 
 dnl Check for system libs needed
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll)
 
 AC_CHECK_FUNC(connect,,[
   AC_CHECK_LIB(socket,connect,

include/config.h

@@ -125,8 +125,9 @@
 
 /* Volume */
 #define VOLUME_DEFAULT                  256
-#define VOLUME_STEP                     128
+#define VOLUME_STEP                     32
 #define VOLUME_MAX                      1024
+#define VOLUME_MIN                      0
 
 /* Number of audio output frames contained in an audio output fifo.
  * (AOUT_FIFO_SIZE + 1) must be a power of 2, in order to optimise the

include/defs.h.in

-/* include/defs.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* include/defs.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA
@@ -55,6 +55,9 @@
 /* Define if you have the __argz_stringify function.  */
 #undef HAVE___ARGZ_STRINGIFY
 
+/* Define if you have the atoll function.  */
+#undef HAVE_ATOLL
+
 /* Define if you have the dcgettext function.  */
 #undef HAVE_DCGETTEXT
 

plugins/access/http.c

@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.11 2002/06/01 12:31:58 sam Exp $
+ * $Id: http.c,v 1.12 2002/06/18 23:18:40 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -137,11 +137,21 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
 #   define HTTP_USERAGENT "User-Agent: " COPYRIGHT_MESSAGE "\r\n"
 #   define HTTP_END       "\r\n"
  
+    if ( p_input->stream.b_seekable )
+    {
          snprintf( psz_buffer, sizeof(psz_buffer),
                    "%s"
                    "Range: bytes=%lld-\r\n"
                    HTTP_USERAGENT HTTP_END,
                    p_access_data->psz_buffer, i_tell );
+    }
+    else
+    {
+         snprintf( psz_buffer, sizeof(psz_buffer),
+                   "%s"
+                   HTTP_USERAGENT HTTP_END,
+                   p_access_data->psz_buffer, i_tell );
+    }
     psz_buffer[sizeof(psz_buffer) - 1] = '\0';
 
     /* Send GET ... */
@@ -189,10 +199,15 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
                       strlen("Content-Length: ") ) )
         {
             psz_parser += strlen("Content-Length: ");
-            /* FIXME : this won't work for 64-bit lengths */
             vlc_mutex_lock( &p_input->stream.stream_lock );
+#ifdef HAVE_ATOLL
+            p_input->stream.p_selected_area->i_size = atoll( psz_parser )
+                                                        + i_tell;
+#else
+            /* FIXME : this won't work for 64-bit lengths */
             p_input->stream.p_selected_area->i_size = atoi( psz_parser )
                                                         + i_tell;
+#endif
             vlc_mutex_unlock( &p_input->stream.stream_lock );
         }
 
@@ -387,7 +402,7 @@ static int HTTPOpen( input_thread_t * p_input )
         p_access_data->socket_desc.i_server_port = i_proxy_port;
 
         snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer),
-                  "GET http://%s:%d/%s HTTP/1.1\r\n",
+                  "GET http://%s:%d/%s\r\n HTTP/1.0\r\n",
                   psz_server_addr, i_server_port, psz_path );
     }
     else
@@ -408,14 +423,21 @@ static int HTTPOpen( input_thread_t * p_input )
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
     p_input->stream.b_pace_control = 1;
-    p_input->stream.b_seekable = 0;
+    p_input->stream.b_seekable = 1;
     p_input->stream.p_selected_area->i_tell = 0;
     p_input->stream.p_selected_area->i_size = 0;
     p_input->stream.i_method = INPUT_METHOD_NETWORK;
     vlc_mutex_unlock( &p_input->stream.stream_lock );
     p_input->i_mtu = 0;
  
+    if( HTTPConnect( p_input, 0 ) )
+    {
+        char * psz_pos = strstr(p_access_data->psz_buffer, "HTTP/1.1");
+        p_input->stream.b_seekable = 0;
+        psz_pos[7] = 0;
         return( HTTPConnect( p_input, 0 ) );
+    }
+    return 0;
 }
 
 /*****************************************************************************

plugins/macosx/intf_vlc_wrapper.m

@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.m,v 1.14 2002/06/08 18:52:34 sam Exp $
+ * $Id: intf_vlc_wrapper.m,v 1.15 2002/06/18 23:18:40 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -630,7 +630,6 @@ static Intf_VLCWrapper *o_intf = nil;
 
 - (void)openNetHTTP:(NSString*)o_addr
 {
-    NSString *o_source;
     int i_end = p_main->p_playlist->i_size;
     intf_thread_t * p_intf = p_main->p_intf;
 
@@ -996,6 +995,9 @@ static Intf_VLCWrapper *o_intf = nil;
             [o_subtitle removeItemAtIndex:0];
         }
 
+        [o_language_item setEnabled: 1];
+        [o_subtitle_item setEnabled: 1];
+
         /* Create language & subtitles menus */
         for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
         {

plugins/macosx/vout_vlc_wrapper.m

@@ -2,7 +2,7 @@
  * vout_vlc_wrapper.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_vlc_wrapper.m,v 1.5 2002/06/08 19:32:19 sam Exp $
+ * $Id: vout_vlc_wrapper.m,v 1.6 2002/06/18 23:18:40 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *
@@ -31,6 +31,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 #include <vlc/vout.h>
+#include <vlc/aout.h>
 
 #include "stream_control.h"
 #include "input_ext-intf.h"
@@ -110,6 +111,24 @@ static Vout_VLCWrapper *o_vout = nil;
 
     switch( key )
     {
+        case (unichar)0xf700: /* up-arrow */
+            if ( !p_main->p_intf->p_sys->b_mute
+                  && p_aout_bank->pp_aout[0]->i_volume + VOLUME_STEP
+                       <= VOLUME_MAX )
+            {
+                p_aout_bank->pp_aout[0]->i_volume += VOLUME_STEP;
+            }
+            break;
+
+        case (unichar)0xf701: /* down-arrow */
+            if ( !p_main->p_intf->p_sys->b_mute
+                  && p_aout_bank->pp_aout[0]->i_volume - VOLUME_STEP
+                       >= VOLUME_MIN )
+            {
+                p_aout_bank->pp_aout[0]->i_volume -= VOLUME_STEP;
+            }
+            break;
+
         case 'f': case 'F':
             p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
             break;