Update MacOS build files for Metrowerks CodeWarrior 7. Haven't tested the example...

svn path=/trunk/vorbis/; revision=3605

diff --git a/examples/decoder_example.c b/examples/decoder_example.c
index 7e11b0b..209e77f 100644 (file)
--- a/examples/decoder_example.c
+++ b/examples/decoder_example.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple example decoder
- last mod: $Id: decoder_example.c,v 1.26 2002/07/11 06:40:47 xiphmont Exp $
+ last mod: $Id: decoder_example.c,v 1.27 2002/07/12 15:07:52 giles Exp $
 
  ********************************************************************/
 
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #endif
 
-#if defined(macintosh) && defined(__MWERKS__)
+#if defined(__MACOS__) && defined(__MWERKS__)
 #include <console.h>      /* CodeWarrior's Mac "command-line" support */
 #endif
 

diff --git a/examples/encoder_example.c b/examples/encoder_example.c
index ec5d448..00bc0a8 100644 (file)
--- a/examples/encoder_example.c
+++ b/examples/encoder_example.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.47 2002/07/11 06:50:31 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.48 2002/07/12 15:07:52 giles Exp $
 
  ********************************************************************/
 
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #endif
 
-#if defined(macintosh) && defined(__MWERKS__)
+#if defined(__MACOS__) && defined(__MWERKS__)
 #include <console.h>      /* CodeWarrior's Mac "command-line" support */
 #endif
 
@@ -85,7 +85,7 @@ int main(){
   {
     fread(readbuffer,1,2,stdin);
 
-    if ( ! strncmp(readbuffer, "da", 2) )
+    if ( ! strncmp((char*)readbuffer, "da", 2) )
     {
       founddata = 1;
       fread(readbuffer,1,6,stdin);

diff --git a/mac/decoder_example.mcp b/mac/decoder_example.mcp
index 693a4d9..a6c57f7 100644 (file)
Binary files a/mac/decoder_example.mcp and b/mac/decoder_example.mcp differ

diff --git a/mac/encoder_example.mcp b/mac/encoder_example.mcp
index 8f055e8..fce944f 100644 (file)
Binary files a/mac/encoder_example.mcp and b/mac/encoder_example.mcp differ

diff --git a/mac/libvorbis.mcp b/mac/libvorbis.mcp
index efdc867..ef8c198 100644 (file)
Binary files a/mac/libvorbis.mcp and b/mac/libvorbis.mcp differ

diff --git a/mac/libvorbis.mcp.exp b/mac/libvorbis.mcp.exp
index 88d6e53..fc4d92a 100644 (file)
--- a/mac/libvorbis.mcp.exp
+++ b/mac/libvorbis.mcp.exp
@@ -4,6 +4,7 @@
 
 vorbis_info_init
 vorbis_info_clear
+vorbis_info_blocksize
 vorbis_comment_init
 vorbis_comment_add
 vorbis_comment_add_tag
@@ -18,35 +19,22 @@ vorbis_dsp_clear
 # Vorbis PRIMITIVES: analysis/DSP layer
 
 vorbis_analysis_init
+vorbis_commentheader_out
 vorbis_analysis_headerout
 vorbis_analysis_buffer
 vorbis_analysis_wrote
 vorbis_analysis_blockout
 vorbis_analysis
+vorbis_bitrate_addblock
+vorbis_bitrate_flushpacket
 
 # Vorbis PRIMITIVES: synthesis layer
 
 vorbis_synthesis_headerin
 vorbis_synthesis_init
 vorbis_synthesis
+vorbis_synthesis_trackonly
 vorbis_synthesis_blockin
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
-
-### From "psy.h" (for VorbisEncLib)
-
-_vp_psy_init
-_vp_psy_clear
-#_vi_psy_dup
-
-_vi_psy_free
-_vi_psy_copy
-
-_vp_compute_mask
-_vp_apply_floor
-
-### From "xxx.h" (for VorbisEncLib)
-_time_P
-_floor_P
-_residue_P
-_mapping_P
+vorbis_packet_blocksize

diff --git a/mac/libvorbisenc.mcp b/mac/libvorbisenc.mcp
index 81ad175..2b30cf7 100755 (executable)
Binary files a/mac/libvorbisenc.mcp and b/mac/libvorbisenc.mcp differ

diff --git a/mac/libvorbisenc.mcp.exp b/mac/libvorbisenc.mcp.exp
index d586a1b..d71a21d 100755 (executable)
--- a/mac/libvorbisenc.mcp.exp
+++ b/mac/libvorbisenc.mcp.exp
@@ -1,5 +1,8 @@
 ### From "vorbis/vorbisenc.h"
 
 vorbis_encode_init
-
+vorbis_encode_setup_managed
+vorbis_encode_setup_vbr
+vorbis_encode_init_vbr
+vorbis_encode_setup_init
 vorbis_encode_ctl

diff --git a/mac/libvorbisfile.mcp b/mac/libvorbisfile.mcp
index a874157..fa878de 100755 (executable)
Binary files a/mac/libvorbisfile.mcp and b/mac/libvorbisfile.mcp differ

diff --git a/mac/libvorbisfile.mcp.exp b/mac/libvorbisfile.mcp.exp
index 8e3c112..6c37113 100755 (executable)
--- a/mac/libvorbisfile.mcp.exp
+++ b/mac/libvorbisfile.mcp.exp
@@ -4,6 +4,10 @@ ov_clear
 ov_open
 ov_open_callbacks
 
+ov_test
+ov_test_callbacks
+ov_test_open
+
 ov_bitrate
 ov_bitrate_instant
 ov_streams
@@ -28,3 +32,4 @@ ov_info
 ov_comment
 
 ov_read
+ov_read_float
\ No newline at end of file