Skip to content

Commit

Permalink
Added MAD-based Mp3 decoder.
Browse files Browse the repository at this point in the history
  • Loading branch information
vspader committed Jun 19, 2006
1 parent a1be08c commit 31eac8c
Show file tree
Hide file tree
Showing 159 changed files with 119,351 additions and 119 deletions.
2 changes: 1 addition & 1 deletion Cog.scriptSuite
Expand Up @@ -67,7 +67,7 @@
<key>Type</key>
<string>NSNumber&lt;Double&gt;</string>
</dict>
<key>bitRate</key>
<key>bitrate</key>
<dict>
<key>AppleEventCode</key>
<string>CoBi</string>
Expand Down
4 changes: 2 additions & 2 deletions Cog.scriptTerminology
Expand Up @@ -55,12 +55,12 @@
<key>Name</key>
<string>length</string>
</dict>
<key>bitRate</key>
<key>bitrate</key>
<dict>
<key>Description</key>
<string>This is the... whatever.</string>
<key>Name</key>
<string>bitRate</string>
<string>bitrate</string>
</dict>
<key>title</key>
<dict>
Expand Down
51 changes: 28 additions & 23 deletions Cog.xcodeproj/project.pbxproj
Expand Up @@ -14,8 +14,13 @@
8E0AD92B0A338CFF00215AEF /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EA9172F0A336CC30087CDE2 /* Shorten.framework */; };
8E1296DA0A2BA9CE00443124 /* PlaylistHeaderView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E1296D80A2BA9CE00443124 /* PlaylistHeaderView.h */; };
8E1296DB0A2BA9CE00443124 /* PlaylistHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1296D90A2BA9CE00443124 /* PlaylistHeaderView.m */; };
8E1849C50A43DB5C0084C69D /* MAD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E1849C40A43DB5C0084C69D /* MAD.framework */; };
8E1849C80A43DB730084C69D /* MADFile.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E1849C60A43DB730084C69D /* MADFile.h */; };
8E1849C90A43DB730084C69D /* MADFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1849C70A43DB730084C69D /* MADFile.m */; };
8E4C7F090A0509FC003BE25F /* DragScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C7F070A0509FC003BE25F /* DragScrollView.m */; };
8E4CAB5B0A32251B00214C1D /* ShnFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8E4CAB5A0A32251B00214C1D /* ShnFile.mm */; };
8E53E8610A44C11B007E5BCE /* ID3Tag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E53E8600A44C11B007E5BCE /* ID3Tag.framework */; };
8E53E8690A44C121007E5BCE /* ID3Tag.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E53E8600A44C11B007E5BCE /* ID3Tag.framework */; };
8E6A8E2C0A0D8A68002ABE9C /* CoreAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6A8E280A0D8A68002ABE9C /* CoreAudioFile.m */; };
8E6A8E380A0D8AD8002ABE9C /* CoreAudioUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6A8E360A0D8AD8002ABE9C /* CoreAudioUtils.m */; };
8E75756909F31D5A0080F1EE /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751909F31D5A0080F1EE /* AppController.m */; };
Expand Down Expand Up @@ -100,30 +105,18 @@
8E757C7D09F32F070080F1EE /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E757C7B09F32F070080F1EE /* AudioUnit.framework */; };
8EA917300A336CC30087CDE2 /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EA9172F0A336CC30087CDE2 /* Shorten.framework */; };
8EB450080A2BB8B300AA711F /* Cog Help in Resources */ = {isa = PBXBuildFile; fileRef = 8EB44FF90A2BB8B300AA711F /* Cog Help */; };
8EB971790A44B74A009803E3 /* MAD.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E1849C40A43DB5C0084C69D /* MAD.framework */; };
/* End PBXBuildFile section */

/* Begin PBXBuildStyle section */
4A9504CCFFE6A4B311CA0CBA /* Debug */ = {
isa = PBXBuildStyle;
buildSettings = {
};
name = Debug;
};
4A9504CDFFE6A4B311CA0CBA /* Release */ = {
isa = PBXBuildStyle;
buildSettings = {
};
name = Release;
};
/* End PBXBuildStyle section */

/* Begin PBXCopyFilesBuildPhase section */
8E757AEC09F3265E0080F1EE /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
8E53E8690A44C121007E5BCE /* ID3Tag.framework in CopyFiles */,
8EB971790A44B74A009803E3 /* MAD.framework in CopyFiles */,
8E0AD92B0A338CFF00215AEF /* Shorten.framework in CopyFiles */,
8E757B4F09F326710080F1EE /* WavPack.framework in CopyFiles */,
8E757B5009F326710080F1EE /* Vorbis.framework in CopyFiles */,
Expand All @@ -134,6 +127,7 @@
8E757B5609F326710080F1EE /* FLAC.framework in CopyFiles */,
8E757B5709F326710080F1EE /* OggFLAC.framework in CopyFiles */,
8E1296DA0A2BA9CE00443124 /* PlaylistHeaderView.h in CopyFiles */,
8E1849C80A43DB730084C69D /* MADFile.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -161,9 +155,13 @@
8D1107320486CEB800E47090 /* Cog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cog.app; sourceTree = BUILT_PRODUCTS_DIR; };
8E1296D80A2BA9CE00443124 /* PlaylistHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistHeaderView.h; sourceTree = "<group>"; };
8E1296D90A2BA9CE00443124 /* PlaylistHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistHeaderView.m; sourceTree = "<group>"; };
8E1849C40A43DB5C0084C69D /* MAD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MAD.framework; path = Libraries/MAD/build/Release/MAD.framework; sourceTree = "<group>"; };
8E1849C60A43DB730084C69D /* MADFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADFile.h; sourceTree = "<group>"; };
8E1849C70A43DB730084C69D /* MADFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MADFile.m; sourceTree = "<group>"; };
8E4C7F060A0509FC003BE25F /* DragScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragScrollView.h; sourceTree = "<group>"; };
8E4C7F070A0509FC003BE25F /* DragScrollView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DragScrollView.m; sourceTree = "<group>"; };
8E4CAB5A0A32251B00214C1D /* ShnFile.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShnFile.mm; sourceTree = "<group>"; };
8E53E8600A44C11B007E5BCE /* ID3Tag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ID3Tag.framework; path = Libraries/ID3Tag/build/Release/ID3Tag.framework; sourceTree = "<group>"; };
8E643DF20A2B585600844A28 /* GameFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameFile.h; sourceTree = "<group>"; };
8E643DF30A2B585600844A28 /* GameFile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GameFile.mm; sourceTree = "<group>"; };
8E6A8E270A0D8A68002ABE9C /* CoreAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioFile.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -304,6 +302,8 @@
8E757C7C09F32F070080F1EE /* AudioToolbox.framework in Frameworks */,
8E757C7D09F32F070080F1EE /* AudioUnit.framework in Frameworks */,
8EA917300A336CC30087CDE2 /* Shorten.framework in Frameworks */,
8E1849C50A43DB5C0084C69D /* MAD.framework in Frameworks */,
8E53E8610A44C11B007E5BCE /* ID3Tag.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -505,6 +505,8 @@
8E75755809F31D5A0080F1EE /* WavPackFile.m */,
8E643DF20A2B585600844A28 /* GameFile.h */,
8E643DF30A2B585600844A28 /* GameFile.mm */,
8E1849C60A43DB730084C69D /* MADFile.h */,
8E1849C70A43DB730084C69D /* MADFile.m */,
);
path = SoundFile;
sourceTree = "<group>";
Expand Down Expand Up @@ -566,6 +568,8 @@
8E757C0A09F32EDC0080F1EE /* Codec Frameworks */ = {
isa = PBXGroup;
children = (
8E53E8600A44C11B007E5BCE /* ID3Tag.framework */,
8E1849C40A43DB5C0084C69D /* MAD.framework */,
8EA9172F0A336CC30087CDE2 /* Shorten.framework */,
8E75775309F31F750080F1EE /* WavPack.framework */,
8E75775009F31F6B0080F1EE /* Vorbis.framework */,
Expand Down Expand Up @@ -594,8 +598,6 @@
);
buildRules = (
);
buildSettings = {
};
dependencies = (
);
name = Cog;
Expand All @@ -610,12 +612,6 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Cog" */;
buildSettings = {
};
buildStyles = (
4A9504CCFFE6A4B311CA0CBA /* Debug */,
4A9504CDFFE6A4B311CA0CBA /* Release */,
);
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* Cog */;
projectDirPath = "";
Expand Down Expand Up @@ -711,6 +707,7 @@
8E6A8E380A0D8AD8002ABE9C /* CoreAudioUtils.m in Sources */,
8E1296DB0A2BA9CE00443124 /* PlaylistHeaderView.m in Sources */,
8E4CAB5B0A32251B00214C1D /* ShnFile.mm in Sources */,
8E1849C90A43DB730084C69D /* MADFile.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -764,7 +761,11 @@
"$(SRCROOT)/Libraries/WavPack/build/Release",
"$(SRCROOT)/Libraries/SndFile/build/Release",
"$(SRCROOT)/Libraries/GME/build/Release",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Libraries/MAD/build/Release\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/Libraries/ID3Tag/build/Release\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
Expand Down Expand Up @@ -802,7 +803,11 @@
"$(SRCROOT)/Libraries/WavPack/build/Release",
"$(SRCROOT)/Libraries/SndFile/build/Release",
"$(SRCROOT)/Libraries/GME/build/Release",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Libraries/MAD/build/Release\"";
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/Libraries/ID3Tag/build/Release\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
INFOPLIST_FILE = Info.plist;
Expand Down
12 changes: 11 additions & 1 deletion English.lproj/MainMenu.nib/classes.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions English.lproj/MainMenu.nib/info.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified English.lproj/MainMenu.nib/keyedobjects.nib
Binary file not shown.
23 changes: 0 additions & 23 deletions Libraries/DecMPA/DecMPA.xcodeproj/project.pbxproj
Expand Up @@ -62,21 +62,6 @@
8EBDF22D09F2884B004F2528 /* mpegAudioHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EBDF1DA09F2884B004F2528 /* mpegAudioHeader.h */; };
/* End PBXBuildFile section */

/* Begin PBXBuildStyle section */
014CEA440018CDF011CA2923 /* Debug */ = {
isa = PBXBuildStyle;
buildSettings = {
};
name = Debug;
};
014CEA450018CDF011CA2923 /* Release */ = {
isa = PBXBuildStyle;
buildSettings = {
};
name = Release;
};
/* End PBXBuildStyle section */

/* Begin PBXFileReference section */
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -345,8 +330,6 @@
);
buildRules = (
);
buildSettings = {
};
dependencies = (
);
name = DecMPA;
Expand All @@ -361,12 +344,6 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "DecMPA" */;
buildSettings = {
};
buildStyles = (
014CEA440018CDF011CA2923 /* Debug */,
014CEA450018CDF011CA2923 /* Release */,
);
hasScannedForEncodings = 1;
mainGroup = 0867D691FE84028FC02AAC07 /* DecMPA */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
Expand Down
Binary file added Libraries/ID3Tag/English.lproj/InfoPlist.strings
Binary file not shown.
83 changes: 83 additions & 0 deletions Libraries/ID3Tag/Files/CHANGES
@@ -0,0 +1,83 @@

libid3tag - ID3 tag manipulation library
Copyright (C) 2000-2004 Underbit Technologies, Inc.

$Id: CHANGES,v 1.11 2004/02/17 02:04:10 rob Exp $

===============================================================================

Version 0.15.1 (beta)

* Updated to autoconf 2.59, automake 1.8.2, libtool 1.5.2.

* Fixed a potential problem in file.c when writing empty ID3v2 tags.

* Added new id3_field_gettextencoding() API routine.

Version 0.15.0 (beta)

* Updated to autoconf 2.57, automake 1.7.5, libtool 1.4.3.

* Added new id3_tag_version(), id3_tag_options(), id3_tag_setlength(),
id3_frame_field(), id3_field_getlatin1(), id3_field_getfulllatin1(),
id3_genre_index(), id3_genre_number(), id3_latin1_ucs4duplicate(),
id3_utf16_ucs4duplicate(), and id3_utf8_ucs4duplicate() API routines.

* Properly exposed the id3_frame_new(), id3_frame_delete(), and
id3_field_type() API routines.

* Fixed a possible segmentation fault rendering ID3v1 tags when a tag
field exceeds the field length limit.

* Fixed a problem whereby the file interface could try to seek and read
data from a non-seekable stream, unrecoverably losing data from the
stream. (N.B. the fix does not work under Win32.)

* Fixed a problem reading ID3v2.2 frames which corrupted their frame IDs
and caused them not to be re-rendered.

* Improved rendering of the ID3v1 genre field from ID3v2 genre
names/numbers. The genre "Other" is used in place of non-translatable
genres.

* Rendering an empty ID3v1 tag now properly returns 0 length even when a
null buffer pointer is passed.

* Changed the file implementation to maintain information about present
but unparseable tags, instead of ignoring all tags and returning an
error.

* Added an external dependency on zlib (libz), which is no longer
included.

* Changed to build a shared library by default.

* Changed to use native Cygwin build by default; give --host=mingw32 to
`configure' to use MinGW (and avoid a dependency on the Cygwin DLL).

Version 0.14.2 (beta)

* Changed Cygwin builds to use MinGW; resulting Win32 executables no
longer have a dependency on Cygwin DLLs.

Version 0.14.1 (beta)

* Updated config.guess and config.sub to latest upstream versions.

* Enabled libtool versioning rather than release numbering.

* Renamed `libid3' to `libid3tag' and enabled installation as a separate
library.

* Several other small fixes.

Version 0.14.0 (beta)

* Added a new ID3 tag manipulation library (libid3). The required zlib
support is provided either by the host system or by the included static
library implementation (libz).

* Improved MSVC++ portability and added MSVC++ project files.

===============================================================================

0 comments on commit 31eac8c

Please sign in to comment.