Changeset e405691afcb7d6c9d4e0917da3565fbe149114e3

Timestamp:

06/19/02 01:18:40 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1024442320 +0000

git-parent:

[cecb7e869db3e9cecffcb712fd66c3a8bc52636e]

git-author:

Christophe Massiot <massiot@videolan.org> 1024442320 +0000

Message:

Ported previous stable commits.

Files:

• README.MacOSX.rtf (modified) (4 diffs)
• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• include/config.h (modified) (1 diff)
• include/defs.h.in (modified) (2 diffs)
• plugins/access/http.c (modified) (6 diffs)
• plugins/macosx/intf_vlc_wrapper.m (modified) (3 diffs)
• plugins/macosx/vout_vlc_wrapper.m (modified) (3 diffs)

README.MacOSX.rtf

@@ -2 +2 @@
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
-}
-
+\red255\green3\blue0;
-\margl1440\margr1440\vieww11240\viewh10380\viewkind0
-\hyphauto1\hyphfactor90
@@ -15 +15 @@
-\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 :\
@@ -49 +62 @@
-\f1\b \ul 5. I only get a black picture !\
-
-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
+Are you sure you do not have QuickTime 6 Preview installed ?
-\
-\
@@ -64 +77 @@
-\
-\
+
+\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.\
-4 2002/06/02 23:03:22
+5 2002/06/18 23:18:40

configure

@@ -3297 +3297 @@
-save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"
-
-
+ atoll
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

configure.in

@@ -127 +127 @@
-
-dnl Check for system libs needed
-
+ atoll
-
-AC_CHECK_FUNC(connect,,[

include/config.h

@@ -126 +126 @@
-/* Volume */
-#define VOLUME_DEFAULT                  256
-128
+32
-#define VOLUME_MAX                      1024
+#define VOLUME_MIN                      0
-
-/* Number of audio output frames contained in an audio output fifo.

include/defs.h.in

@@ -1 @@
- 2.13
+
-
-/* Define if using alloca.c.  */
@@ -56 +56 @@
-#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

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2002/06/01 12:31:58 sam
+2 2002/06/18 23:18:40 massiot
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -138 +138 @@
-#   define HTTP_END       "\r\n"
- 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    psz_buffer[sizeof(psz_buffer) - 1] = '\0';
-
@@ -190 +200 @@
-        {
-            psz_parser += strlen("Content-Length: ");
+            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 */
-            vlc_mutex_lock( &p_input->stream.stream_lock );
-            p_input->stream.p_selected_area->i_size = atoi( psz_parser )
-                                                        + i_tell;
+#endif
-            vlc_mutex_unlock( &p_input->stream.stream_lock );
-        }
@@ -388 +403 @@
-
-        snprintf( p_access_data->psz_buffer, sizeof(p_access_data->psz_buffer),
- HTTP/1.1
+\r\n HTTP/1.0
-                  psz_server_addr, i_server_port, psz_path );
-    }
@@ -409 +424 @@
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_input->stream.b_pace_control = 1;
-0
+1
-    p_input->stream.p_selected_area->i_tell = 0;
-    p_input->stream.p_selected_area->i_size = 0;
@@ -416 +431 @@
-    p_input->i_mtu = 0;
- 
-
+
+
+
+
+
+
+
+
-}
-

plugins/macosx/intf_vlc_wrapper.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2002/06/08 18:52:34 sam
+5 2002/06/18 23:18:40 massiot
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -631 +631 @@
-- (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 +995 @@
-            [o_subtitle removeItemAtIndex:0];
-        }
+
+        [o_language_item setEnabled: 1];
+        [o_subtitle_item setEnabled: 1];
-
-        /* Create language & subtitles menus */

plugins/macosx/vout_vlc_wrapper.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2002/06/08 19:32:19 sam
+6 2002/06/18 23:18:40 massiot
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -32 +32 @@
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc/aout.h>
-
-#include "stream_control.h"
@@ -111 +112 @@
-    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;