diff --git a/README b/README index 343be9a45..d4abf5666 100644 --- a/README +++ b/README @@ -58,8 +58,6 @@ Directory: ./examples Example code illustrating programmatic use of libvorbis, libvorbisfile and libvorbisenc -./mac Codewarrior project files and build tweaks for MacOS. - ./macosx Project files for MacOS X. ./win32 Win32 projects files and build automation @@ -113,22 +111,5 @@ after normal configuring: make dist rpm -ta libvorbis-.tar.gz -BUILDING ON MACOS 9: - -Vorbis on MacOS 9 is built using Metroworks CodeWarrior. To build it, -first verify that the Ogg libraries are already built following the -instructions in the Ogg module README. Open vorbis/mac/libvorbis.mcp, -switch to the "Targets" pane, select everything, and make the project. -Do the same thing to build libvorbisenc.mcp, and libvorbisfile.mcp (in -that order). In vorbis/mac/Output you will now have both debug and final -versions of Vorbis shared libraries to link your projects against. - -To build a project using Ogg Vorbis, add access paths to your -CodeWarrior project for the ogg/include, ogg/mac/Output, -vorbis/include, and vorbis/mac/Output folders. Be sure that -"interpret DOS and Unix paths" is turned on in your project; it can -be found in the "access paths" pane in your project settings. Now -simply add the shared libraries you need to your project (OggLib and -VorbisLib at least) and #include "ogg/ogg.h" and "vorbis/codec.h" -wherever you need to access Ogg and Vorbis functionality. + diff --git a/macos/compat/strdup.c b/macos/compat/strdup.c deleted file mode 100644 index 294e2d070..000000000 --- a/macos/compat/strdup.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include -#include - -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/macos/compat/sys/types.h b/macos/compat/sys/types.h deleted file mode 100644 index 4ef7abd66..000000000 --- a/macos/compat/sys/types.h +++ /dev/null @@ -1 +0,0 @@ -#ifndef __SYS_TYPES_H__ #define __SYS_TYPES_H__ 1 #include #include #include typedef short int16_t; typedef long int32_t; typedef long long int64_t; #define vorbis_size32_t long #if defined(__cplusplus) extern "C" { #endif #pragma options align=power char *strdup(const char *inStr); #pragma options align=reset #if defined(__cplusplus) } #endif #endif /* __SYS_TYPES_H__ */ \ No newline at end of file diff --git a/macos/decoder_example.mcp b/macos/decoder_example.mcp deleted file mode 100644 index a6c57f74e..000000000 Binary files a/macos/decoder_example.mcp and /dev/null differ diff --git a/macos/encoder_example.mcp b/macos/encoder_example.mcp deleted file mode 100644 index bb6eb880e..000000000 Binary files a/macos/encoder_example.mcp and /dev/null differ diff --git a/macos/libvorbis.mcp b/macos/libvorbis.mcp deleted file mode 100644 index f5de19521..000000000 Binary files a/macos/libvorbis.mcp and /dev/null differ diff --git a/macos/libvorbis.mcp.exp b/macos/libvorbis.mcp.exp deleted file mode 100644 index ec1408732..000000000 --- a/macos/libvorbis.mcp.exp +++ /dev/null @@ -1,45 +0,0 @@ -### From "vorbis/codec.h" - -# Vorbis PRIMITIVES: general - -vorbis_info_init -vorbis_info_clear -vorbis_info_blocksize -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_granule_time - -# 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_restart -vorbis_synthesis -vorbis_synthesis_trackonly -vorbis_synthesis_blockin -vorbis_synthesis_pcmout -vorbis_synthesis_lapout -vorbis_synthesis_read -vorbis_packet_blocksize -vorbis_synthesis_halfrate -vorbis_synthesis_halfrate_p diff --git a/macos/libvorbisenc.mcp b/macos/libvorbisenc.mcp deleted file mode 100755 index bc61f85f3..000000000 Binary files a/macos/libvorbisenc.mcp and /dev/null differ diff --git a/macos/libvorbisenc.mcp.exp b/macos/libvorbisenc.mcp.exp deleted file mode 100755 index d71a21d09..000000000 --- a/macos/libvorbisenc.mcp.exp +++ /dev/null @@ -1,8 +0,0 @@ -### 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/macos/libvorbisfile.mcp b/macos/libvorbisfile.mcp deleted file mode 100755 index 17ff6a7e7..000000000 Binary files a/macos/libvorbisfile.mcp and /dev/null differ diff --git a/macos/libvorbisfile.mcp.exp b/macos/libvorbisfile.mcp.exp deleted file mode 100755 index 92412f0c0..000000000 --- a/macos/libvorbisfile.mcp.exp +++ /dev/null @@ -1,45 +0,0 @@ -### From "vorbis/vorbisfile.h" - -ov_clear -ov_open -ov_open_callbacks - -ov_test -ov_test_callbacks -ov_test_open - -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_seek_lap -ov_pcm_seek_lap -ov_pcm_seek_page_lap -ov_time_seek_lap -ov_time_seek_page_lap - -ov_raw_tell -ov_pcm_tell -ov_time_tell - -ov_info -ov_comment - -ov_read -ov_read_float - -ov_crosslap -ov_halfrate -ov_halfrate_p \ No newline at end of file diff --git a/macos/vorbis.mcp b/macos/vorbis.mcp deleted file mode 100644 index 6ce308ba1..000000000 Binary files a/macos/vorbis.mcp and /dev/null differ diff --git a/todo.txt b/todo.txt deleted file mode 100644 index b0e1f93cd..000000000 --- a/todo.txt +++ /dev/null @@ -1,22 +0,0 @@ -Open project list for further development: - -libvorbis: - -Meaningful error code returns - -still some padding at EOS - -Option for brute-forcing vq search on maptype 2 (helps on undertrained -sets). - -encoder switch interface for binary compat through changes; ioctl()-like? - -API changes: - break up some of the more monolithic calls (eg, allow access - to MDCT domain data, additional low level framing capability) - convenience calls for text comments - -other: - -command line suite -'crashme'