* Bumped up version number to 0.5.2

* Fix for the "lock-up" problem under MacOS X. Removed the rt-priority
  configuration variable.

diff --git a/NEWS b/NEWS
index ecead89a346d7e57b127273a53b2fea46915d98a..711fffaf981dfca48a1f26eba8e50dc1d5290ed1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,52 +1,69 @@
-$Id: NEWS,v 1.31 2003/03/09 19:44:16 gbazin Exp $
+$Id: NEWS,v 1.32 2003/03/10 00:04:14 massiot Exp $
 
 Changes between 0.5.1a and 0.5.2:
---------------------------------
+---------------------------------
 
 Core support:
- * advanced config options are now hidden by default.
- * new --spdif option to use the S/PDIF audio output by default.
- * fixed a 'clicking' sound when switching between streams.
- * new bandlimited resampler that should improve audio quality on primarily Mac OS X.
- * fixed a problem with audio over http that caused some web radios to not work.
+ * advanced config options are now hidden by default
+ * new --spdif option to use the S/PDIF audio output by default
+ * fixed a 'clicking' sound when switching between streams
+ * new bandlimited resampler that should improve audio quality on primarily
+   Mac OS X
+ * fixed a problem with audio over http that caused some web radios to not work
+ * DTS S/PDIF support
 
 Codecs:
- * support for DV audio through the ffmpeg library.
- * new but basic MPEG video decoder based on libmpeg2.
- * fixed a major bug in LPCM code ( fixes a problem with iDVD disks )
+ * support for DV audio through the ffmpeg library
+ * support for FLAC audio through libflac
+ * new but basic MPEG video decoder based on libmpeg2
+ * fixed a major bug in LPCM code (fixes a problem with iDVD disks)
+
+Stream output:
+ * support for streaming DivX 1/2/3, wmv1/2, h/i263 over MPEG-2 TS
+ * new --ttl option for Time To Live
 
 DVD support:
- * fixed quite a few problems with the dvd menu support.
+ * fixed quite a few problems with the dvd menu support
 
 UNIX ports:
- * fixed the GNU-pth support.
+ * fixed the GNU-pth support
 
 Win32 port:
- * multi-channel audio and S/PDIF support for both the DirectX and Waveout plugins.
- * localization support via gettext is now fully working.
- * rc interface is now fully useable.
- * fixed the MSVC project files generation.
+ * multi-channel audio and S/PDIF support for both the DirectX and Waveout
+   plugins
+ * localization support via gettext is now fully working
+ * rc interface is now fully useable
+ * fixed the MSVC project files generation
 
 Mac OS X port:
- * several fixes for multi channel audio devices. AC3 over SPDIF with M-Audio Sonica Theater still does not work. this is most likely a driver bug and has been reported to M-Audio. ( Sonica, Revolution, Delta, Griffin iMate and MOTU firewire devices should work).
- * new info panel.
- * very prelimenary support for VLC control via applescript.
+ * several fixes for multi channel audio devices. AC3 over SPDIF with
+   M-Audio Sonica Theater still does not work. this is most likely a driver
+   bug and has been reported to M-Audio. (Sonica, Revolution, Delta, Griffin
+   iMate and MOTU firewire devices should work)
+ * VLC now uses the default audio device
+ * new info panel
+ * very preliminary support for VLC control via applescript
+ * support for mouse gestures
+ * new priority scheme allowing to avoid lock-ups on low-end machines
 
 Linupy port:
- * there is a whole new port for the linupy distribution used by o.a. the YOPY PDA. It is still experimental, please test it.
+ * there is a whole new port for the linupy distribution used by o.a. the
+   YOPY PDA. It is still experimental, please test it
 
 Miscellaneous:
- * improved ID3 tag detection.
- * changed several errors into warnings. the frequently reported "this is not a PS stream, continuing" is one of these.
- * mouse gestures work on windows and osx, but there still isn't any useful gestures
+ * improved ID3 tag detection
+ * changed several errors into warnings ; the frequently reported "this is
+   not a PS stream, continuing" is one of these
+ * mouse gestures work on windows and osx, but there still isn't any useful
+   gestures
  * some support for .pls playlists used by shoutcast
 
 Changes between 0.5.1 and 0.5.1a:
---------------------------------
+---------------------------------
 
 Mac OS X port:
  * fixed a problem that caused VLC to select the wrong language when
-   English was set as the preferred language.
+   English was set as the preferred language
 
 
 Changes between 0.5.0 and 0.5.1:

diff --git a/configure.ac.in b/configure.ac.in
index 63b039bae0de6559a52d8160e19fbf6817d625e8..c46b650c667ed1c9d5e9e738bdf9b13c54e7f99c 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.5.2-test3)
+AC_INIT(vlc,0.5.2)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.2-test3)
+AM_INIT_AUTOMAKE(vlc,0.5.2)
 AM_CONFIG_HEADER(config.h)
 
 dnl

diff --git a/doc/release-howto.txt b/doc/release-howto.txt
index 771b5f179cee09cd878b404b56285bcf795f4107..2db10cfbf42a925971bc3085b69c0d7b5ba8a7da 100644 (file)
--- a/doc/release-howto.txt
+++ b/doc/release-howto.txt
@@ -10,7 +10,7 @@
 
   - générer un timestamp de release (par exemple avec 822-date)
   - updater le numéro de version partout où c'est nécessaire
-     · configure.in (relancer autoconf)
+     · configure.ac.in (relancer autoconf)
      · vlc.spec
      · ipkg/control
      · debian/changelog

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 8cec7af2850ab79c0744ee94e9519ec5b2570930..84ad70b4dd26367f8d33638717a37ab7ae177f13 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -344,7 +344,7 @@
        <key>CFBundleExecutable</key>
        <string>VLC</string>
        <key>CFBundleGetInfoString</key>
-       <string>VLC media player 0.5.2-test3, Copyright (c) 1996-2003 VideoLAN.</string>
+       <string>VLC media player 0.5.2, Copyright (c) 1996-2003 VideoLAN.</string>
        <key>CFBundleIconFile</key>
        <string>vlc.icns</string>
        <key>CFBundleIdentifier</key>
@@ -356,7 +356,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.5.2-test3</string>
+       <string>0.5.2</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>
@@ -403,7 +403,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-       <string>0.5.2-test3</string>
+       <string>0.5.2</string>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
        <key>NSMainNibFile</key>

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 0205141ae10d6188501abd67c30678991011a937..2c1ca1b94d6296e3bbbf8f0a0e64403732eed12a 100644 (file)
--- a/include/vlc_threads.h
+++ b/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.30 2003/03/03 23:48:41 massiot Exp $
+ * $Id: vlc_threads.h,v 1.31 2003/03/10 00:04:14 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 1
-#   define VLC_THREAD_PRIORITY_INPUT 1
-#   define VLC_THREAD_PRIORITY_AUDIO 1
-#   define VLC_THREAD_PRIORITY_VIDEO 1
-#   define VLC_THREAD_PRIORITY_OUTPUT 1
+#   define VLC_THREAD_PRIORITY_LOW (-47)
+#   define VLC_THREAD_PRIORITY_INPUT 37
+#   define VLC_THREAD_PRIORITY_AUDIO 37
+#   define VLC_THREAD_PRIORITY_VIDEO (-47)
+#   define VLC_THREAD_PRIORITY_OUTPUT 37
 
 #elif defined(WIN32) || defined(UNDER_CE)
 /* Define different priorities for WinNT/2K/XP and Win9x/Me */

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index a3f2e24e53583f23a3ba18802dd65cd430fc4b32..4c9d1fe0cc8c42b658ee8a5dec8a609aa0504281 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.16 2003/02/20 01:52:45 sigmunau Exp $
+ * $Id: file.c,v 1.17 2003/03/10 00:04:14 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -111,7 +111,7 @@ vlc_module_begin();
     add_string( "audiofile-path", "audiofile.wav", NULL, PATH_TEXT,
                 PATH_LONGTEXT, VLC_FALSE );
     add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
-    set_description( _("file audio output module") );
+    set_description( N_("file audio output module") );
     set_capability( "audio output", 0 );
     add_shortcut( "file" );
     add_shortcut( "audiofile" );

diff --git a/src/libvlc.h b/src/libvlc.h
index 9f32cddebc981317527c5cdde3746aa49bda52a1..5f0ce916504e09ed40a5301a52fab1111276ef06 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.47 2003/03/06 09:58:00 massiot Exp $
+ * $Id: libvlc.h,v 1.48 2003/03/10 00:04:14 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -578,10 +578,6 @@ vlc_module_begin();
     add_integer( "win9x-cv-method", 0, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT, VLC_TRUE );
 #endif
 
-#if defined(SYS_DARWIN)
-    add_integer( "rt-priority", 1, NULL, RT_PRIORITY_TEXT, NULL, VLC_TRUE );
-#endif
-
     /* Usage (mainly useful for cmd line stuff) */
     add_usage_hint( PLAYLIST_USAGE );
 

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 2f6605b4eaafbac730b5652c4b4e0a3d5798f587..61964d1ef46a5788efda5491bc186f33d4e94f7c 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -2,7 +2,7 @@
  * threads.c : threads implementation for the VideoLAN client
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.39 2003/03/04 23:36:57 massiot Exp $
+ * $Id: threads.c,v 1.40 2003/03/10 00:04:14 massiot Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -614,18 +614,26 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
 #ifdef SYS_DARWIN
     if ( i_priority )
     {
-        int i_error;
+        int i_error, i_policy;
         struct sched_param param;
         memset( &param, 0, sizeof(struct sched_param) );
-        param.sched_priority = config_GetInt( p_this, "rt-priority" );
+        if ( i_priority < 0 )
+        {
+            param.sched_priority = (-1) * i_priority;
+            i_policy = SCHED_OTHER;
+        }
+        else
+        {
+            param.sched_priority = i_priority;
+            i_policy = SCHED_RR;
+        }
         if ( (i_error = pthread_setschedparam( p_this->thread_id,
-                                               SCHED_RR, &param )) )
+                                               i_policy, &param )) )
         {
-            msg_Warn( p_this, "couldn't go to real-time priority (%s:%d): %s",
+            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",
                       psz_file, i_line, strerror(i_error) );
             i_priority = 0;
         }
-
     }
 #endif
 
@@ -702,14 +710,23 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file,
 #ifdef SYS_DARWIN
     if ( i_priority )
     {
-        int i_error;
+        int i_error, i_policy;
         struct sched_param param;
         memset( &param, 0, sizeof(struct sched_param) );
-        param.sched_priority = config_GetInt( p_this, "rt-priority" );
+        if ( i_priority < 0 )
+        {
+            param.sched_priority = (-1) * i_priority;
+            i_policy = SCHED_OTHER;
+        }
+        else
+        {
+            param.sched_priority = i_priority;
+            i_policy = SCHED_RR;
+        }
         if ( (i_error = pthread_setschedparam( pthread_self(),
-                                               SCHED_RR, &param )) )
+                                               i_policy, &param )) )
         {
-            msg_Warn( p_this, "couldn't go to real-time priority (%s:%d): %s",
+            msg_Warn( p_this, "couldn't set thread priority (%s:%d): %s",     
                       psz_file, i_line, strerror(i_error) );
             i_priority = 0;
         }