* NEWS: VCD entry points and iso files

    * include/audio_output.h: more proper freebsd compilation fix
    * modules/audio_output/oss.c: if /dev/dsp is used, use another output.

diff --git a/NEWS b/NEWS
index f1a5d6821ea52f01fb00a426af40679fd9edbc82..ff014c215ba4ad9a42b7823c61b84cc0fff32fb8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.12 2003/02/02 00:05:00 sam Exp $
+$Id: NEWS,v 1.13 2003/02/02 00:57:20 jobi Exp $
 
 Changes between 0.4.6 and 0.5.0:
 --------------------------------
@@ -8,7 +8,7 @@ Core structure:
   * new audio output architecture based on filter pipelines, providing
     S/PDIF and multi-channel support
   * localization support via gettext on most architectures
-  * new stream output architecture, allowing to use VLC to unicast,
+  * new stream output architecture, allowing, using VLC to unicast,
     multicast or broadcast a stream to another VLC (only MPEG 1, 2 and 4
     and A/52 streams are supported)
   * build system now uses autoconf/automake/autopoint
@@ -18,6 +18,8 @@ Input access:
   * ftp:// support
   * stability fixes in the HTTP access
   * auto-detection of RTP encapsulation
+  * VCD entry points support
+  * VCD image file support
 
 Input demux:
   * support for *.asf format
@@ -26,14 +28,13 @@ Input demux:
   * support for ogg encapsulation
   * support for raw DV format
   * support for *.wav format
+  * support for *.mp3 format
   * new demuxdump demux allowing to save a stream to a file
   * raw AAC support
 
 Stream discovery & playlists:
   * support for the SAP/SDP and SLP protocols
   * support for .m3u file format
-  * support for .asx file format
-  * hack to find the streaming sources in html-pages with embedded wmp
 
 Codecs:
   * support for the microdvd, subrip, ssa1, ssa2-4 subtitles file formats
@@ -60,10 +61,6 @@ Miscellaneous:
   * all interfaces allow to dynamically change the volume, the audio
     device and the channels configuration
   * headphone channel mixer with virtual spatialization effect
-  * Mozilla plugin based on libvlc for embedded playback in webpages of any
-    format that VLC can play
-  * new swedish translation
-  * updated french, german, dutch and italian translations
 
 GNU/Linux, *BSD & misc. UNIX ports:
   * OSS and ALSA audio output modules support A/52 over S/PDIF output
@@ -76,10 +73,10 @@ Mac OS X port:
   * new open panel with full features
   * video output screen can be chosen in the Video menu
   * audio device and channels configuration can be chosen in the Audio menu
-  * new playlist drawer and messages windows
+  * new playlist and messages windows
 
 Win32 port:
-  * preferences dialog box redesigned
+  * preference dialog box redesigned
   * waveout module supports multi-channel audio output
   * support for VCDs
   * new dialog box to select avi subtitles

diff --git a/include/audio_output.h b/include/audio_output.h
index c17ad3f1999a195863a12c84fbaff2337014fb3f..5e20a08660f4f6f5c6aaf8042171814ea483bfba 100644 (file)
--- a/include/audio_output.h
+++ b/include/audio_output.h
@@ -2,7 +2,7 @@
  * audio_output.h : audio output interface
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: audio_output.h,v 1.75 2003/01/22 18:31:46 massiot Exp $
+ * $Id: audio_output.h,v 1.76 2003/02/02 00:57:20 jobi Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -68,6 +68,9 @@ struct audio_sample_format_t
 #   define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l')
 #endif
 
+#define AFMT_S16_NE AOUT_FMT_S16_NE
+#define AFMT_U16_NE AOUT_FMT_U16_NE
+
 #define AOUT_FMT_NON_LINEAR( p_format )                                    \
     ( ((p_format)->i_format == VLC_FOURCC('s','p','d','i'))                \
        || ((p_format)->i_format == VLC_FOURCC('a','5','2',' '))            \

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 9b65deee652283c24d5589f9167f3805a03299a2..6d47adb147e21f3112cbd935f69161c8c8666521 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.48 2003/01/28 22:03:21 sam Exp $
+ * $Id: oss.c,v 1.49 2003/02/02 00:57:21 jobi Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -53,13 +53,6 @@
 #   include <machine/soundcard.h>
 #endif
 
-/* AFMT_AC3 is really IEC61937 / IEC60958, mpeg/ac3/dts over spdif */
-#ifndef AFMT_AC3
-#   define AFMT_AC3        0x00000400                   /* Dolby Digital AC3 */
-#endif
-#ifndef AFMT_S16_NE
-#   define AFMT_S16_NE     0x00000010
-#endif
 /*****************************************************************************
  * aout_sys_t: OSS audio output method descriptor
  *****************************************************************************
@@ -260,13 +253,18 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Open the sound device */
-    p_sys->i_fd = open( psz_device, O_WRONLY );
+    p_sys->i_fd = open( psz_device, O_WRONLY | O_NDELAY );
     if( p_sys->i_fd < 0 )
     {
         msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
         free( p_sys );
         return VLC_EGENERIC;
     }
+
+    /* if the opening was ok, put the device back in blocking mode */
+    fcntl( p_sys->i_fd, F_SETFL,
+            fcntl( p_sys->i_fd, F_GETFL ) &~ FNDELAY );
+
     free( psz_device );
 
     p_aout->output.pf_play = Play;