* Bumped version to 0.6.0-test1

* modules/access/cdda.c: decreased the priority of the cdda plugin.

diff --git a/configure.ac.in b/configure.ac.in
index ba3032337e8659ef8a0fcac5dcdc69dadef97924..5518820d76e4aaa7d5d42695721467a0d6af69b6 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.6.0-cvs)
+AC_INIT(vlc,0.6.0-test1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -12,7 +12,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.6.0-cvs)
+AM_INIT_AUTOMAKE(vlc,0.6.0-test1)
 AM_CONFIG_HEADER(config.h)
 
 dnl

diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index 26f6ee5a47b353c703c6e4bf049541e466c6b766..f1796a7e67861a72c67ec37240b4f639c2042d85 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
+++ b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "VLC";
-CFBundleShortVersionString = "0.6.0-cvs";
-CFBundleGetInfoString = "VLC media player 0.6.0-cvs, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.0-test1";
+CFBundleGetInfoString = "VLC media player 0.6.0-test1, Copyright (c) 1996-2003 VideoLAN.";
 NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index e68bbfb5c633356e5b312d1e1b9ceee68f207fd1..6d8944b1c7bc7ed64430e8f359714ba9c2591d6f 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -415,7 +415,7 @@
        <key>CFBundleExecutable</key>
        <string>VLC</string>
        <key>CFBundleGetInfoString</key>
-       <string>VLC media player 0.6.0-cvs, Copyright (c) 1996-2003 VideoLAN.</string>
+       <string>VLC media player 0.6.0-test1, Copyright (c) 1996-2003 VideoLAN.</string>
        <key>CFBundleIconFile</key>
        <string>vlc.icns</string>
        <key>CFBundleIdentifier</key>
@@ -427,7 +427,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.6.0-cvs</string>
+       <string>0.6.0-test1</string>
        <key>CFBundleSignature</key>
        <string>VLC#</string>
        <key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-       <string>0.6.0-cvs</string>
+       <string>0.6.0-test1</string>
        <key>NSAppleScriptEnabled</key>
        <string>YES</string>
        <key>NSMainNibFile</key>

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index bf8b9409efc018e15820eabf8a05ef37db7458ef..ecb51690a9fab97ad9353a40234ec5660b7ad4d2 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -2,7 +2,7 @@
  * cdda.c : CD digital audio input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: cdda.c,v 1.2 2003/05/18 15:44:03 gbazin Exp $
+ * $Id: cdda.c,v 1.3 2003/05/19 20:47:16 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -91,7 +91,7 @@ static int  CDDADemux        ( input_thread_t * p_input );
 vlc_module_begin();
     set_description( _("CD Audio input") );
     add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    set_capability( "access", 80 );
+    set_capability( "access", 70 );
     set_callbacks( CDDAOpen, CDDAClose );
     add_shortcut( "cdda" );