* README.MacOSX.rtf: Typos

* include/vlc_threads.h: Lowered OS X priorities to avoid locking the machine
* modules/access/dvdread/input.c: Fixed a long-standing bug when switching
  titles.

README.MacOSX.rtf

@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
 }
 {\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww15800\viewh16000\viewkind0
+\margl1440\margr1440\vieww15800\viewh14480\viewkind0
 \hyphauto1\hyphfactor90
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
@@ -20,7 +20,7 @@ You may find the following frequently 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.5.0.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 the directory Applications on your main harddrive.\
+When you download VLC, you will end up with a vlc-0.5.x.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 the directory Applications on your main harddrive.\
 \
 \
 
@@ -32,7 +32,7 @@ To use VLC, you will need to open the application first and then from the "File"
 \
 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.\
+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. Some SVCDs can be read if you tell VLC they're VCDs, in the "Open Disc" dialog.\
 \
 \
 
@@ -58,9 +58,9 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
 \
 \
 
-\f1\b \ul 7. How do I change the size of the videowindow?\
+\f1\b \ul 7. How do I change the size of the video window?\
 
-\f0\b0 \ulnone Grab the bottom-right corner of the videowindow and drag the window to its desired size.\
+\f0\b0 \ulnone Grab the bottom-right corner of the video window and drag the window to its desired size.\
 \
 \
 
@@ -72,17 +72,17 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
 
 \f1\b \ul 9. Support for files with subtitles \
 
-\f0\b0 \ulnone Support for subtitles in separate files is still very much in a testing fase. DVD subtitles can be used trough the Controls->Subtitles menu-item.\
+\f0\b0 \ulnone Support for subtitles in separate files is still very much in a testing phase. DVD subtitles can be used trough the Controls->Subtitles menu-item.\
 - Subfiles need to be opened at the same moment as the video to which you want to add subtitles. You can do this in the File->Open menu.\
 - As of yet it is not yet possible to adapt the font, size of the text and/or position.\
 - You need to specify the subtitle when you open the file.\
 - A subtitle is global instead of bound to a playlist-item.  This will be fixed in a future version.\
 - Only MicroDVD, SubRIP and SSA1-4 subtitle files are supported at the moment.\
-- Subs can only be added to .avi  and mpg movie files at the moment\
+- Subs can only be added to .avi movie files at the moment\
 \
 \
 Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/support/lists.html\ulnone .\
 -- \
 Christophe Massiot <massiot@via.ecp.fr> and\
 Derk-Jan Hartman <thedj@users.sourceforge.net> for the VideoLAN team.\
-$Id: README.MacOSX.rtf,v 1.10 2003/01/28 15:59:38 hartman Exp $}
\ No newline at end of file
+$Id: README.MacOSX.rtf,v 1.11 2003/02/02 00:49:40 massiot Exp $}
\ No newline at end of file

include/vlc_threads.h

@@ -3,7 +3,7 @@
  * This header provides portable declarations for mutexes & conditions
  *****************************************************************************
  * Copyright (C) 1999, 2002 VideoLAN
- * $Id: vlc_threads.h,v 1.25 2003/01/30 00:39:41 massiot Exp $
+ * $Id: vlc_threads.h,v 1.26 2003/02/02 00:49:40 massiot Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -72,11 +72,11 @@
 
 /* Thread priorities */
 #ifdef SYS_DARWIN
-#   define VLC_THREAD_PRIORITY_LOW 32
-#   define VLC_THREAD_PRIORITY_INPUT 36
-#   define VLC_THREAD_PRIORITY_AUDIO 37
-#   define VLC_THREAD_PRIORITY_VIDEO 33
-#   define VLC_THREAD_PRIORITY_OUTPUT 34
+#   define VLC_THREAD_PRIORITY_LOW 31
+#   define VLC_THREAD_PRIORITY_INPUT 34
+#   define VLC_THREAD_PRIORITY_AUDIO 35
+#   define VLC_THREAD_PRIORITY_VIDEO 32
+#   define VLC_THREAD_PRIORITY_OUTPUT 33
 
 #elif defined(WIN32) || defined(UNDER_CE)
 /* Define different priorities for WinNT/2K/XP and Win9x/Me */

modules/access/dvdread/input.c

@@ -5,8 +5,8 @@
  * especially the 2048 bytes logical block size.
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: input.c,v 1.15 2003/01/28 15:05:52 massiot Exp $
+ * Copyright (C) 2001, 2003 VideoLAN
+ * $Id: input.c,v 1.16 2003/02/02 00:49:40 massiot Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -843,10 +843,10 @@ static int DvdReadSetArea( input_thread_t * p_input, input_area_t * p_area )
 
 
 /*****************************************************************************
- * DvdReadRead: reads data packets into the netlist.
+ * DvdReadRead: reads data packets.
  *****************************************************************************
- * Returns -1 in case of error, 0 if everything went well, and 1 in case of
- * EOF.
+ * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
+ * bytes.
  *****************************************************************************/
 static int DvdReadRead( input_thread_t * p_input,
                         byte_t * p_buffer, size_t i_count )
@@ -897,10 +897,11 @@ static int DvdReadRead( input_thread_t * p_input,
 
             DvdReadHandleDSI( p_dvd, p_buf );
 
-            /* End of File */
+            /* End of title */
             if( p_dvd->i_next_vobu >= p_dvd->i_end_block + 1 )
             {
-                return 1;
+                b_eot = 1;
+                break;
             }
 
             assert( p_dvd->i_pack_len < 1024 );
@@ -959,15 +960,13 @@ static int DvdReadRead( input_thread_t * p_input,
         {
             /* EOF */
             vlc_mutex_unlock( &p_input->stream.stream_lock );
-            return 1;
+            return 0;
         }
 
         /* EOT */
         msg_Dbg( p_input, "new title" );
         DvdReadSetArea( p_input, p_input->stream.pp_areas[
                         p_input->stream.p_selected_area->i_id+1] );
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-        return 0;
     }
 
     vlc_mutex_unlock( &p_input->stream.stream_lock );