* Support for Darwin CoreAudio, courtesy of Colin Delacroix [MacOS X port] ;

* Added warnings for ac3 mantissa (we still have problems with AC3 on
MacOS X) ;
* Renamed WriteResource to avoid a namespace clash with Darwin's
WriteResource.

Makefile.in

@@ -663,7 +663,7 @@ lib/macosx.so: $(PLUGIN_MACOSX)
 	$(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
 
 lib/darwin.so: $(PLUGIN_DARWIN)
-	$(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^
+	$(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^ -framework CoreAudio
 
 lib/dsp.so: $(PLUGIN_DSP)
 	$(CC) $(PCFLAGS) $(PLCFLAGS) -o $@ $^

include/rsc_files.h

@@ -86,6 +86,6 @@ int                 CloseResourceFile   ( resource_file_t *p_file );
 int                 SeekResource        ( resource_file_t *p_file, char *psz_name, int i_type );
 int                 ReadResource        ( resource_file_t *p_file, char *psz_name, int i_type,
                                           size_t max_size, byte_t *p_data );
-int                 WriteResource       ( resource_file_t *p_file, char *psz_name, int i_type,
-                                          size_t size, byte_t *p_data );
+int                 vlc_WriteResource       ( resource_file_t *p_file, char *psz_name, int i_type,
+                                              size_t size, byte_t *p_data );
 

plugins/darwin/darwin.c

@@ -61,7 +61,7 @@ void _M( aout_getfunctions )( function_list_t * p_function_list );
 MODULE_INIT
 {
     p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "Darwin sound support module";
+    p_module->psz_longname = "Darwin HAL sound support module";
     p_module->psz_version = VERSION;
 
     p_module->i_capabilities = MODULE_CAPABILITY_NULL

src/ac3_decoder/ac3_mantissa.c

@@ -286,7 +286,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
 
         if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),5)) >= 27)
         {
-            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa" );
+            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (1)" );
         }
 
         p_ac3dec->mantissa.q_1[ 1 ] = q_1_1[ group_code ];
@@ -304,7 +304,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
         
         if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),7)) >= 125)
         {
-            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa" );
+            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (2)" );
         }
 
         p_ac3dec->mantissa.q_2[ 1 ] = q_2_1[ group_code ];
@@ -317,7 +317,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
     case 3:
         if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),3)) >= 7)
         {
-            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa" );
+            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (3)" );
         }
 
         return (q_3[group_code] * exp_lut[exp]);
@@ -330,7 +330,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
 
         if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),7)) >= 121)
         {
-            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa" );
+            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (4)" );
         }
 
         p_ac3dec->mantissa.q_4[ 0 ] = q_4_1[ group_code ];
@@ -342,7 +342,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
     case 5:
         if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),4)) >= 15)
         {
-            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa" );
+            intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (5)" );
         }
 
         return (q_5[group_code] * exp_lut[exp]);

src/misc/rsc_files.c

@@ -366,8 +366,9 @@ int ReadResource( resource_file_t *p_file, char *psz_name, int i_type,
  *****************************************************************************
  * Messages type: rsc, major code 107
  *****************************************************************************/
-int WriteResource( resource_file_t *p_file, char *psz_name, int i_type,
-                   size_t size, byte_t *p_data )
+/* Darwin port : namespace clash with Darwin's WriteResource */
+int vlc_WriteResource( resource_file_t *p_file, char *psz_name, int i_type,
+                       size_t size, byte_t *p_data )
 {
     int i_index;                                           /* resource index */
     int i_tmp_index;                             /* temporary resource index */