Mac compatability update from Chris Hanson. Hopefully I got the

binary checkin of .mcp files correct.

Monty

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

diff --git a/mac/compat/strdup.c b/mac/compat/strdup.c
index 536f746..2ef4279 100644 (file)
--- a/mac/compat/strdup.c
+++ b/mac/compat/strdup.c
@@ -1 +1,21 @@
-#include <sys/types.h>\r#include <string.h>\r#include <stdlib.h>\r\rchar *strdup(const char *inStr)\r{\r     char *outStr = NULL;\r   \r       if (inStr == NULL) {\r           return NULL;\r   }\r      \r       outStr = _ogg_malloc(strlen(inStr) + 1);\r       \r       if (outStr != NULL) {\r          strcpy(outStr, inStr);\r }\r      \r       return outStr;\r}\r
\ No newline at end of file
+#include <ogg/os_types.h>
+#include <sys/types.h>
+#include <string.h>
+#include <stdlib.h>
+
+char *strdup(const char *inStr)
+{
+       char *outStr = NULL;
+       
+       if (inStr == NULL) {
+               return NULL;
+       }
+       
+       outStr = _ogg_malloc(strlen(inStr) + 1);
+       
+       if (outStr != NULL) {
+               strcpy(outStr, inStr);
+       }
+       
+       return outStr;
+}

diff --git a/mac/compat/sys/types.h b/mac/compat/sys/types.h
deleted file mode 100644 (file)
index b0d4f92..0000000
--- a/mac/compat/sys/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#ifndef __SYS_TYPES_H__\r#define __SYS_TYPES_H__ 1\r\r#include <MacTypes.h>\r#include <alloca.h>\r#include <string.h>\r\rtypedef short                int16_t;\rtypedef long           int32_t;\rtypedef long long      int64_t;\r\r#define vorbis_size32_t long\r\r\r#if defined(__cplusplus)\rextern "C" {\r#endif\r\r#pragma options align=power\r\rchar *strdup(const char *inStr);\r\r#pragma options align=reset\r\r#if defined(__cplusplus)\r}\r#endif\r\r#endif /* __SYS_TYPES_H__ */\r
\ No newline at end of file

diff --git a/mac/encoder_example.mcp b/mac/encoder_example.mcp
deleted file mode 100644 (file)
index faf63cd..0000000
Binary files a/mac/encoder_example.mcp and /dev/null differ

diff --git a/mac/libvorbis.mcp.exp b/mac/libvorbis.mcp.exp
index 5ffc7c3..88d6e53 100644 (file)
--- a/mac/libvorbis.mcp.exp
+++ b/mac/libvorbis.mcp.exp
@@ -1 +1,52 @@
-### From "vorbis/codec.h"\rogg_stream_packetin\rogg_stream_pageout\rogg_sync_init\rogg_sync_clear\r#ogg_sync_destroy\rogg_sync_reset\rogg_sync_buffer\rogg_sync_wrote\rogg_sync_pageseek\rogg_sync_pageout\rogg_stream_pagein\rogg_stream_packetout\rogg_stream_init\rogg_stream_clear\rogg_stream_reset\rogg_stream_destroy\rogg_stream_eof\rogg_page_version\rogg_page_continued\rogg_page_bos\rogg_page_eos\rogg_page_frameno\rogg_page_serialno\rogg_page_pageno\rvorbis_info_init\rvorbis_info_clear\rvorbis_comment_init\rvorbis_comment_add \rvorbis_comment_clear\rvorbis_block_init\rvorbis_block_clear\rvorbis_dsp_clear\rvorbis_analysis_init\rvorbis_analysis_headerout\rvorbis_analysis_buffer\rvorbis_analysis_wrote\rvorbis_analysis_blockout\rvorbis_analysis\rvorbis_synthesis_headerin\rvorbis_synthesis_init\rvorbis_synthesis\rvorbis_synthesis_blockin\rvorbis_synthesis_pcmout\rvorbis_synthesis_read\rstrdup\r
\ No newline at end of file
+### From "vorbis/codec.h"
+
+# Vorbis PRIMITIVES: general
+
+vorbis_info_init
+vorbis_info_clear
+vorbis_comment_init
+vorbis_comment_add
+vorbis_comment_add_tag
+vorbis_comment_query
+vorbis_comment_query_count
+vorbis_comment_clear
+
+vorbis_block_init
+vorbis_block_clear
+vorbis_dsp_clear
+
+# Vorbis PRIMITIVES: analysis/DSP layer
+
+vorbis_analysis_init
+vorbis_analysis_headerout
+vorbis_analysis_buffer
+vorbis_analysis_wrote
+vorbis_analysis_blockout
+vorbis_analysis
+
+# Vorbis PRIMITIVES: synthesis layer
+
+vorbis_synthesis_headerin
+vorbis_synthesis_init
+vorbis_synthesis
+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

diff --git a/mac/decoder_example.mcp b/mac/libvorbisenc.mcp
old mode 100644 (file)
new mode 100755 (executable)
similarity index 54%
rename from mac/decoder_example.mcp
rename to mac/libvorbisenc.mcp
index 7857354..81ad175
Binary files a/mac/decoder_example.mcp and b/mac/libvorbisenc.mcp differ

diff --git a/mac/libvorbisenc.mcp.exp b/mac/libvorbisenc.mcp.exp
new file mode 100755 (executable)
index 0000000..d586a1b
--- /dev/null
+++ b/mac/libvorbisenc.mcp.exp
@@ -0,0 +1,5 @@
+### From "vorbis/vorbisenc.h"
+
+vorbis_encode_init
+
+vorbis_encode_ctl

diff --git a/mac/libvorbis.mcp b/mac/libvorbisfile.mcp
old mode 100644 (file)
new mode 100755 (executable)
similarity index 63%
rename from mac/libvorbis.mcp
rename to mac/libvorbisfile.mcp
index 2b5f5dc..a874157
Binary files a/mac/libvorbis.mcp and b/mac/libvorbisfile.mcp differ

diff --git a/mac/libvorbisfile.mcp.exp b/mac/libvorbisfile.mcp.exp
new file mode 100755 (executable)
index 0000000..8e3c112
--- /dev/null
+++ b/mac/libvorbisfile.mcp.exp
@@ -0,0 +1,30 @@
+### From "vorbis/vorbisfile.h"
+
+ov_clear
+ov_open
+ov_open_callbacks
+
+ov_bitrate
+ov_bitrate_instant
+ov_streams
+ov_seekable
+ov_serialnumber
+
+ov_raw_total
+ov_pcm_total
+ov_time_total
+
+ov_raw_seek
+ov_pcm_seek
+ov_pcm_seek_page
+ov_time_seek
+ov_time_seek_page
+
+ov_raw_tell
+ov_pcm_tell
+ov_time_tell
+
+ov_info
+ov_comment
+
+ov_read