Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6 from JanX2/master

Lots of updates
  • Loading branch information...
commit 600fe7dbde5ea63e0c58540bb83babce1463393e 2 parents 41d0db5 + c664579
@sbooth authored
Showing with 440 additions and 211 deletions.
  1. +4 −0 .gitignore
  2. +68 −56 README.markdown
  3. +74 −0 build_sfbaudioengine_frameworks.sh
  4. +20 −10 cddb/cddb.xcodeproj/project.pbxproj
  5. +5 −1 cdparanoia/cdparanoia.xcodeproj/project.pbxproj
  6. +3 −1 cuetools/cuetools.xcodeproj/project.pbxproj
  7. +5 −13 discid/discid.xcodeproj/project.pbxproj
  8. +3 −1 dumb/dumb.xcodeproj/project.pbxproj
  9. +17 −36 flac/flac.xcodeproj/project.pbxproj
  10. +49 −14 lame/config.h
  11. +1 −4 lame/lame.xcodeproj/project.pbxproj
  12. +5 −1 mac/mac.xcodeproj/project.pbxproj
  13. +15 −2 mad/mad.xcodeproj/project.pbxproj
  14. +4 −4 mp4v2/config.h
  15. +5 −3 mp4v2/mp4v2.xcodeproj/project.pbxproj
  16. +8 −8 mp4v2/project.h
  17. +25 −7 mpg123/config.h
  18. +47 −6 mpg123/mpg123.h
  19. +5 −1 mpg123/mpg123.xcodeproj/project.pbxproj
  20. +22 −12 musicbrainz3/musicbrainz3.xcodeproj/project.pbxproj
  21. +3 −1 ofa1/ofa1.xcodeproj/project.pbxproj
  22. +5 −1 ogg/ogg.xcodeproj/project.pbxproj
  23. +3 −1 shorten/shorten.xcodeproj/project.pbxproj
  24. +5 −1 sndfile/sndfile.xcodeproj/project.pbxproj
  25. +5 −3 speex/speex.xcodeproj/project.pbxproj
  26. +25 −3 taglib/taglib.xcodeproj/project.pbxproj
  27. +1 −1  tta++/tta++.xcodeproj/project.pbxproj
  28. +5 −1 vorbis/vorbis.xcodeproj/project.pbxproj
  29. +3 −19 wavpack/wavpack.xcodeproj/project.pbxproj
View
4 .gitignore
@@ -12,11 +12,13 @@ cddb/libcddb-src
cdparanoia/cdparanoia-src
cuetools/cuetools-src
discid/libdiscid-src
+dumb/dumb-src
ogg/libogg-src
flac/flac-src
lame/lame-src
mad/libmad-src
mp4v2/mp4v2-src
+mpg123/mpg123-src
musepack/musepack-src
musicbrainz3/libmusicbrainz-src
musicbrainz3/neon-src
@@ -26,5 +28,7 @@ sndfile/libsndfile-src
speex/speex-src
taglib/taglib-src
tta/libtta-c-src
+tta++/libtta++-src
vorbis/libvorbis-src
wavpack/wavpack-src
+id3tag/libid3tag-src
View
124 README.markdown
@@ -8,10 +8,16 @@ Usage
This repo doesn't contain the sources for the respective frameworks or libraries. You need to add those yourself.
+You can use the included `build_sfbaudioengine_frameworks.sh` to build the dependencies for SFBAudioEngine. You can invoke it like this:
+
+ /build_sfbaudioengine_frameworks.sh ../SFBAudioEngine/Frameworks`
+
+The path in the argument must exist already!
+
CDDB
----
-[http://libcddb.sourceforge.net/download.html][1]
+<http://libcddb.sourceforge.net/download.html>
(tested version: libcddb-1.3.2.tar.bz2)
@@ -25,9 +31,9 @@ CDDB
discid
------
-[http://musicbrainz.org/doc/libdiscid][2]
+<http://musicbrainz.org/doc/libdiscid>
-(tested version: libdiscid-0.2.2.tar.gz)
+(tested version: libdiscid-0.3.0.tar.gz)
1. Download
2. Decompress
@@ -36,12 +42,26 @@ discid
5. Build
+DUMB (Dynamic Universal Music Bibliotheque)
+-------------------------------------------
+
+<http://dumb.sourceforge.net/>
+
+(tested version: dumb-0.9.3.tar.gz, http://prdownloads.sourceforge.net/dumb/dumb-0.9.3.tar.gz?download)
+
+1. Download
+2. Decompress
+3. Rename folder to "dumb-src"
+4. Move the folder into dumb/
+5. Build
+
+
ogg
---
-[http://xiph.org/downloads/][3]
+<http://xiph.org/downloads/>
-(tested version: libogg-1.2.2.tar.gz)
+(tested version: libogg-1.3.0.tar.gz)
1. Download
2. Decompress
@@ -53,7 +73,7 @@ ogg
flac
----
-[http://xiph.org/downloads/][3]
+<http://xiph.org/downloads/>
(tested version: flac-1.2.1.tar.gz)
@@ -69,7 +89,7 @@ flac
mad
---
-[http://sourceforge.net/projects/mad/files/][4]
+<http://sourceforge.net/projects/mad/files/>
(tested version: libmad-0.15.1b.tar.gz)
@@ -84,11 +104,11 @@ mad
mp4v2
-----
-[http://code.google.com/p/mp4v2/source/checkout][5]
+<http://code.google.com/p/mp4v2/source/checkout>
-(tested version: svn revision 426)
+(tested version: svn revision 501)
-1. svn co -r 426 http://mp4v2.googlecode.com/svn/trunk/ mp4v2-src
+1. svn co -r 501 http://mp4v2.googlecode.com/svn/trunk/ mp4v2-src
2. Move the folder into mp4v2/
3. Build
@@ -96,9 +116,9 @@ mp4v2
musepack
--------
-[http://www.musepack.net/index.php?pg=src][6]
+<http://www.musepack.net/index.php?pg=src>
-(tested version: musepack_src_r435.tar.gz)
+(tested version: musepack_src_r475.tar.gz)
1. Download
2. Decompress
@@ -108,11 +128,11 @@ musepack
6. Build
-musicbrainz3
-------------
+musicbrainz3 (deprecated)
+-------------------------
-[http://musicbrainz.org/doc/libmusicbrainz][7]
-[http://www.webdav.org/neon/][8]
+<http://musicbrainz.org/doc/libmusicbrainz>
+<http://www.webdav.org/neon/>
(tested version: libmusicbrainz-3.0.3.tar.gz, http://www.webdav.org/neon/neon-0.29.5.tar.gz)
@@ -127,22 +147,31 @@ musicbrainz3
taglib
------
-[http://developer.kde.org/~wheeler/taglib.html][9]
+<http://taglib.github.com>
-(tested version: taglib 6b063862c38dce47b5d2)
+(tested version: taglib 08863dec0b)
1. git clone https://github.com/taglib/taglib.git taglib-src
-2. git checkout 6b063862c38dce47b5d2
-3. Move the folder into taglib/
-4. Build
+2. cd taglib-src
+3. git checkout 08863dec0b
+4. Move the folder into taglib/
+5. Build
+
+Alternatively, you can use release version 1.8, but you will have to remove “infotag.h” and “infotag.cpp” from the project:
+
+1. Download
+2. Decompress
+3. Rename folder to "taglib-src"
+4. Move the folder into taglib/
+5. Build
vorbis
------
-[http://xiph.org/downloads/][3]
+<http://xiph.org/downloads/>
-(tested version: libvorbis-1.3.2.tar.bz2)
+(tested version: libvorbis-1.3.3.tar.gz)
1. Download
2. Decompress
@@ -154,7 +183,7 @@ vorbis
wavpack
-------
-[http://www.wavpack.com/downloads.html][10]
+<http://www.wavpack.com/downloads.html>
(tested version: wavpack-4.60.1.tar.bz2)
@@ -169,9 +198,9 @@ wavpack
LAME
----
-[http://lame.sourceforge.net/download.php][11]
+<http://lame.sourceforge.net/download.php>
-(tested version: lame-3.98.4.tar.bz2)
+(tested version: lame-3.99.5.tar.gz)
1. Download
2. Decompress
@@ -183,9 +212,9 @@ LAME
sndfile
-------
-[http://www.mega-nerd.com/libsndfile/][12]
+<http://www.mega-nerd.com/libsndfile/>
-(tested version: libsndfile-1.0.23.tar.gz)
+(tested version: libsndfile-1.0.25.tar.gz)
1. Download
2. Decompress
@@ -197,7 +226,7 @@ sndfile
ofa1
----
-[http://code.google.com/p/musicip-libofa/][13]
+<http://code.google.com/p/musicip-libofa/>
(tested version: libofa-0.9.3.tar.gz)
@@ -232,7 +261,7 @@ cdparanoia
cuetools
--------
-[http://developer.berlios.de/projects/cuetools/][14]
+<http://developer.berlios.de/projects/cuetools/>
(tested version: cuetools-1.3.1.tar.gz)
@@ -246,7 +275,7 @@ cuetools
speex
-----
-[http://www.speex.org/][15]
+<http://www.speex.org/>
(tested version: speex-1.2rc1.tar.gz)
@@ -257,16 +286,16 @@ speex
5. Build
-tta
----
+tta, tta++
+----------
-[http://en.true-audio.com/Free_Downloads][16]
+<http://en.true-audio.com/Free_Downloads>
-(tested version: libtta-c-2.0.tar.gz)
+(tested version: libtta-2.1.tar.gz, libtta++-2.1.tar.gz)
1. Download
2. Decompress
-3. Rename the folder to libtta-c-src
+3. Rename the folder (for tta use libtta-c-src, for tta++ use libtta++-src)
4. Move the folder into tta
5. Apply the patch "tta.patch": 'patch < tta.patch'
6. Build
@@ -275,9 +304,10 @@ tta
mpg123
------
-[http://www.mpg123.de/][17]
+<http://www.mpg123.de/>
+<http://sourceforge.net/projects/mpg123/files/mpg123/>
-(tested version: mpg123-1.13.2.tar.bz2)
+(tested version: mpg123-1.14.4.tar.bz2)
1. Download
2. Decompress
@@ -291,21 +321,3 @@ License
The Xcode projects are distributed under the modified BSD license.
-
- [1]: http://libcddb.sourceforge.net/download.html
- [2]: http://musicbrainz.org/doc/libdiscid
- [3]: http://xiph.org/downloads/
- [4]: http://sourceforge.net/projects/mad/files/
- [5]: http://code.google.com/p/mp4v2/source/checkout
- [6]: http://www.musepack.net/index.php?pg=src
- [7]: http://musicbrainz.org/doc/libmusicbrainz
- [8]: http://www.webdav.org/neon/
- [9]: http://developer.kde.org/~wheeler/taglib.html
- [10]: http://www.wavpack.com/downloads.html
- [11]: http://lame.sourceforge.net/download.php
- [12]: http://www.mega-nerd.com/libsndfile/
- [13]: http://code.google.com/p/musicip-libofa/
- [14]: http://developer.berlios.de/projects/cuetools/
- [15]: http://www.speex.org/
- [16]: http://en.true-audio.com/Free_Downloads
- [17]: http://www.mpg123.de
View
74 build_sfbaudioengine_frameworks.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+if [ ! -d "$1" ]; then
+ echo "'$1' does not exist. aborting."
+ echo "try something like: ../SFBAudioEngine/Frameworks"
+ exit
+fi
+
+DO_CLEAN=1
+
+FRAMEWORKDIR=../$1
+
+rm -rf $1/*
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project dumb/dumb.xcodeproj clean
+fi
+xcodebuild -project dumb/dumb.xcodeproj -target dumb.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project flac/flac.xcodeproj clean
+fi
+xcodebuild -project flac/flac.xcodeproj -target Framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project mac/mac.xcodeproj clean
+fi
+xcodebuild -project mac/mac.xcodeproj -target mac.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project mp4v2/mp4v2.xcodeproj clean
+fi
+xcodebuild -project mp4v2/mp4v2.xcodeproj -target mp4v2 -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project musepack/musepack.xcodeproj clean
+fi
+xcodebuild -project musepack/musepack.xcodeproj -target mpcdec.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project mpg123/mpg123.xcodeproj clean
+fi
+xcodebuild -project mpg123/mpg123.xcodeproj -target mpg123.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project sndfile/sndfile.xcodeproj clean
+fi
+xcodebuild -project sndfile/sndfile.xcodeproj -target sndfile.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project speex/speex.xcodeproj clean
+fi
+xcodebuild -project speex/speex.xcodeproj -target speex.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project taglib/taglib.xcodeproj clean
+fi
+xcodebuild -project taglib/taglib.xcodeproj -target taglib -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project tta/tta++.xcodeproj clean
+fi
+xcodebuild -project tta/tta++.xcodeproj -target tta++.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project vorbis/vorbis.xcodeproj clean
+fi
+xcodebuild -project vorbis/vorbis.xcodeproj -target vorbis.framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
+if [ $DO_CLEAN -ne 0 ]; then
+ xcodebuild -project wavpack/wavpack.xcodeproj clean
+fi
+xcodebuild -project wavpack/wavpack.xcodeproj -target Framework -configuration Release CONFIGURATION_BUILD_DIR=$FRAMEWORKDIR
+
View
30 cddb/cddb.xcodeproj/project.pbxproj
@@ -41,6 +41,9 @@
/* Begin PBXFileReference section */
32B7E37212DA7A23005B82C9 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+ 3DAAA9A9169B0E00005253B6 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
+ 3DAAA9AA169B0E00005253B6 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+ 3DAAA9AB169B0E00005253B6 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8CA35CFD0D2E764100F89E3B /* cddb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cddb.c; path = "libcddb-src/lib/cddb.c"; sourceTree = "<group>"; };
8CA35CFE0D2E764100F89E3B /* cddb_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cddb_cmd.c; path = "libcddb-src/lib/cddb_cmd.c"; sourceTree = "<group>"; };
8CA35CFF0D2E764100F89E3B /* cddb_conn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cddb_conn.c; path = "libcddb-src/lib/cddb_conn.c"; sourceTree = "<group>"; };
@@ -96,6 +99,7 @@
0867D691FE84028FC02AAC07 /* cddb */ = {
isa = PBXGroup;
children = (
+ 3DAAA9A8169B0E00005253B6 /* Configs */,
08FB77ACFE841707C02AAC07 /* Source */,
089C1665FE841158C02AAC07 /* Resources */,
034768DDFF38A45A11DB9C8B /* Products */,
@@ -148,6 +152,17 @@
name = Source;
sourceTree = "<group>";
};
+ 3DAAA9A8169B0E00005253B6 /* Configs */ = {
+ isa = PBXGroup;
+ children = (
+ 3DAAA9A9169B0E00005253B6 /* Base.xcconfig */,
+ 3DAAA9AA169B0E00005253B6 /* Debug.xcconfig */,
+ 3DAAA9AB169B0E00005253B6 /* Release.xcconfig */,
+ );
+ name = Configs;
+ path = ../Configs;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -204,6 +219,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "cddb" */;
@@ -261,13 +277,14 @@
/* Begin XCBuildConfiguration section */
4FADC24308B4156D00ABE55E /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 3DAAA9AA169B0E00005253B6 /* Debug.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
@@ -284,7 +301,9 @@
};
4FADC24408B4156D00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 3DAAA9AB169B0E00005253B6 /* Release.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -304,25 +323,16 @@
4FADC24708B4156D00ABE55E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Debug;
};
4FADC24808B4156D00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Release;
};
View
6 cdparanoia/cdparanoia.xcodeproj/project.pbxproj
@@ -212,6 +212,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "cdparanoia" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -267,12 +270,12 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -285,6 +288,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
4 cuetools/cuetools.xcodeproj/project.pbxproj
@@ -195,6 +195,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "cuetools" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -254,7 +257,6 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
View
18 discid/discid.xcodeproj/project.pbxproj
@@ -145,6 +145,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "discid" */;
@@ -206,17 +207,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "@loader_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
PRODUCT_NAME = discid;
@@ -228,6 +229,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -235,7 +237,7 @@
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "@loader_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
PRODUCT_NAME = discid;
@@ -246,10 +248,7 @@
4FADC24708B4156D00ABE55E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -272,18 +271,13 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Debug;
};
4FADC24808B4156D00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -306,8 +300,6 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Release;
};
View
4 dumb/dumb.xcodeproj/project.pbxproj
@@ -470,6 +470,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "dumb" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -558,7 +561,6 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
View
53 flac/flac.xcodeproj/project.pbxproj
@@ -888,6 +888,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "flac" */;
@@ -1146,9 +1147,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
@@ -1162,6 +1163,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
@@ -1191,13 +1193,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
HEADER_SEARCH_PATHS = "$(SRCROOT)";
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = flac;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
};
@@ -1209,12 +1209,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
HEADER_SEARCH_PATHS = "$(SRCROOT)";
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = flac;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
ZERO_LINK = NO;
@@ -1225,14 +1223,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = getopt;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
};
@@ -1242,13 +1239,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = getopt;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
ZERO_LINK = NO;
@@ -1259,14 +1255,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = replaygain_synthesis;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share $(SRCROOT)/flac-src/src/share/replaygain_synthesis/include";
};
@@ -1276,13 +1271,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = replaygain_synthesis;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share $(SRCROOT)/flac-src/src/share/replaygain_synthesis/include";
ZERO_LINK = NO;
@@ -1293,14 +1287,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = replaygain_analysis;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share";
};
@@ -1310,13 +1303,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = replaygain_analysis;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share";
ZERO_LINK = NO;
@@ -1327,14 +1319,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = grabbag;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
};
@@ -1344,13 +1335,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = grabbag;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
ZERO_LINK = NO;
@@ -1361,14 +1351,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = utf8;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share";
};
@@ -1378,13 +1367,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
INSTALL_PATH = /usr/local/lib;
- PREBINDING = NO;
PRODUCT_NAME = utf8;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include $(SRCROOT)/flac-src/include/share";
ZERO_LINK = NO;
@@ -1397,13 +1385,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
HEADER_SEARCH_PATHS = "$(SRCROOT)";
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = metaflac;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
};
@@ -1415,12 +1401,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "HAVE_CONFIG_H=1";
HEADER_SEARCH_PATHS = "$(SRCROOT)";
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = metaflac;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
ZERO_LINK = NO;
@@ -1431,6 +1415,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1439,7 +1424,6 @@
"$(SRCROOT)/flac-src/include",
"$(SRCROOT)/../ogg/libogg-src/include",
);
- PREBINDING = NO;
PRODUCT_NAME = "iPhone lib";
};
name = Debug;
@@ -1448,15 +1432,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/flac-src/src/libFLAC/include",
"$(SRCROOT)/flac-src/include",
"$(SRCROOT)/../ogg/libogg-src/include",
);
- PREBINDING = NO;
PRODUCT_NAME = "iPhone lib";
ZERO_LINK = NO;
};
@@ -1466,12 +1449,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H=1";
@@ -1482,7 +1465,6 @@
);
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@rpath";
- PREBINDING = NO;
PRODUCT_NAME = FLAC;
};
name = Debug;
@@ -1491,12 +1473,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H=1";
HEADER_SEARCH_PATHS = (
@@ -1506,7 +1488,6 @@
);
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@rpath";
- PREBINDING = NO;
PRODUCT_NAME = FLAC;
ZERO_LINK = NO;
};
View
63 lame/config.h
@@ -1,6 +1,9 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
+#ifndef LAME_CONFIG_H
+#define LAME_CONFIG_H
+
/* debug define */
/* #undef ABORTFP */
@@ -49,6 +52,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 0
+
/* add ieee754_float32_t type */
/* #undef HAVE_IEEE754_FLOAT32_T */
#ifndef HAVE_IEEE754_FLOAT32_T
@@ -193,6 +199,9 @@
/* Define to 1 if you have the <xmmintrin.h> header file. */
/* #undef HAVE_XMMINTRIN_H */
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST
+
/* requested by Frank, seems to be temporary needed for a smooth transition */
#define LAME_LIBRARY_BUILD 1
@@ -218,13 +227,16 @@
#define PACKAGE_NAME "lame"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "lame 3.98.4"
+#define PACKAGE_STRING "lame 3.99.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "lame"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.98.4"
+#define PACKAGE_VERSION "3.99.5"
/* Define to 1 if the C compiler supports function prototypes. */
#define PROTOTYPES 1
@@ -296,23 +308,44 @@
/* build with layer 2 decoding */
#define USE_LAYER_2 1
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
/* Version number of package */
-#define VERSION "3.98.4"
+#define VERSION "3.99.5"
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#if __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-#endif
-
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-/* # undef _ALL_SOURCE */
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
@@ -351,3 +384,5 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
+
+#endif /* LAME_CONFIG_H */
View
5 lame/lame.xcodeproj/project.pbxproj
@@ -265,6 +265,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "lame" */;
@@ -358,13 +359,11 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@rpath";
- PREBINDING = NO;
PRODUCT_NAME = lame;
};
name = Debug;
@@ -377,12 +376,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@rpath";
- PREBINDING = NO;
PRODUCT_NAME = lame;
ZERO_LINK = NO;
};
View
6 mac/mac.xcodeproj/project.pbxproj
@@ -395,6 +395,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "mac" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -471,12 +474,12 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -489,6 +492,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
17 mad/mad.xcodeproj/project.pbxproj
@@ -198,6 +198,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "mad" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -253,17 +256,18 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
HAVE_CONFIG_H,
+ FPM_DEFAULT,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@rpath";
@@ -275,12 +279,16 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_MODEL_TUNING = G5;
- GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ HAVE_CONFIG_H,
+ FPM_DEFAULT,
+ );
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@rpath";
PRODUCT_NAME = mad;
@@ -292,6 +300,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 32E7398910B9D32D00094C8A /* Debug.xcconfig */;
buildSettings = {
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "FPM_DEFAULT=1",
+ );
};
name = Debug;
};
@@ -299,6 +311,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 32E7398A10B9D32D00094C8A /* Release.xcconfig */;
buildSettings = {
+ GCC_PREPROCESSOR_DEFINITIONS = "FPM_DEFAULT=1";
};
name = Release;
};
View
8 mp4v2/config.h
@@ -42,13 +42,13 @@
#define PACKAGE "mp4v2"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "eddyg@myreflection.org"
+#define PACKAGE_BUGREPORT "kidjan@gmail.com"
/* Define to the full name of this package. */
#define PACKAGE_NAME "MP4v2"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MP4v2 trunk-r487"
+#define PACKAGE_STRING "MP4v2 trunk-r501"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mp4v2"
@@ -57,10 +57,10 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "trunk-r487"
+#define PACKAGE_VERSION "trunk-r501"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "trunk-r487"
+#define VERSION "trunk-r501"
View
8 mp4v2/mp4v2.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -728,10 +728,11 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = org.sbooth;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "mp4v2" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -893,12 +894,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -913,6 +914,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
16 mp4v2/project.h
@@ -6,25 +6,25 @@
#define MP4V2_PROJECT_name "MP4v2"
#define MP4V2_PROJECT_name_lower "mp4v2"
#define MP4V2_PROJECT_name_upper "MP4V2"
-#define MP4V2_PROJECT_name_formal "MP4v2 trunk-r485"
+#define MP4V2_PROJECT_name_formal "MP4v2 trunk-r501"
#define MP4V2_PROJECT_url_website "http://code.google.com/p/mp4v2"
#define MP4V2_PROJECT_url_downloads "http://code.google.com/p/mp4v2/downloads/list"
#define MP4V2_PROJECT_url_discussion "http://groups.google.com/group/mp4v2"
#define MP4V2_PROJECT_irc "irc://irc.freenode.net/handbrake"
-#define MP4V2_PROJECT_bugreport "<eddyg@myreflection.org>"
-#define MP4V2_PROJECT_version "trunk-r485"
-#define MP4V2_PROJECT_version_hex 0x00020000
+#define MP4V2_PROJECT_bugreport "<kidjan@gmail.com>"
+#define MP4V2_PROJECT_version "trunk-r501"
+#define MP4V2_PROJECT_version_hex 0x00020100
#define MP4V2_PROJECT_version_major 2
-#define MP4V2_PROJECT_version_minor 0
+#define MP4V2_PROJECT_version_minor 1
#define MP4V2_PROJECT_version_point 0
#define MP4V2_PROJECT_repo_url "http://mp4v2.googlecode.com/svn/trunk"
#define MP4V2_PROJECT_repo_branch "trunk"
#define MP4V2_PROJECT_repo_root "http://mp4v2.googlecode.com/svn"
#define MP4V2_PROJECT_repo_uuid "6e6572fa-98a6-11dd-ad9f-f77439c74b79"
-#define MP4V2_PROJECT_repo_rev 485
-#define MP4V2_PROJECT_repo_date "2011-08-12 15:38:24 -0400 (Fri, 12 Aug 2011)"
+#define MP4V2_PROJECT_repo_rev 501
+#define MP4V2_PROJECT_repo_date "2012-12-28 17:45:40 +0100 (Fri, 28 Dec 2012)"
#define MP4V2_PROJECT_repo_type "developer"
-#define MP4V2_PROJECT_build "Sun Aug 21 12:41:09 EDT 2011"
+#define MP4V2_PROJECT_build "Mon Jan 7 16:52:31 CET 2013"
/*****************************************************************************/
View
32 mpg123/config.h
@@ -285,7 +285,7 @@
/* #undef NO_ERETURN */
/* Define to disable error messages. */
-/* #undef NO_ERROR */
+/* #undef NO_ERRORMSG */
/* Define to disable feeder and buffered readers. */
/* #undef NO_FEEDER */
@@ -327,7 +327,7 @@
#define PACKAGE_NAME "mpg123"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mpg123 1.13.3"
+#define PACKAGE_STRING "mpg123 1.14.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "mpg123"
@@ -336,7 +336,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.13.2"
+#define PACKAGE_VERSION "1.14.4"
/* Define if portaudio v18 API is wanted. */
/* #undef PORTAUDIO18 */
@@ -371,7 +371,10 @@
#define USE_MODULES 1
/* Version number of package */
-#define VERSION "1.13.2"
+#define VERSION "1.14.4"
+
+/* Define to use Win32 named pipes */
+/* #undef WANT_WIN32_FIFO */
/* Define to use Win32 sockets */
/* #undef WANT_WIN32_SOCKETS */
@@ -379,12 +382,24 @@
/* Define to use Unicode for Windows */
/* #undef WANT_WIN32_UNICODE */
+/* WinXP and above for ipv6 */
+/* #undef WINVER */
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
-#ifdef __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
#else
-# undef WORDS_BIGENDIAN
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
@@ -393,6 +408,9 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
+/* WinXP and above for ipv6 */
+/* #undef _WIN32_WINNT */
+
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
View
53 mpg123/mpg123.h
@@ -1,5 +1,5 @@
/*
- libmpg123: MPEG Audio Decoder library (version 1.13.4)
+ libmpg123: MPEG Audio Decoder library (version 1.14.4)
copyright 1995-2010 by the mpg123 project - free software under the terms of the LGPL 2.1
see COPYING and AUTHORS files in distribution or http://mpg123.org
@@ -12,7 +12,7 @@
/* A macro to check at compile time which set of API functions to expect.
This should be incremented at least each time a new symbol is added to the header. */
-#define MPG123_API_VERSION 29
+#define MPG123_API_VERSION 36
/* These aren't actually in use... seems to work without using libtool. */
#ifdef BUILD_MPG123_DLL
@@ -82,6 +82,7 @@
#define mpg123_set_filesize MPG123_LARGENAME(mpg123_set_filesize)
#define mpg123_replace_reader MPG123_LARGENAME(mpg123_replace_reader)
#define mpg123_replace_reader_handle MPG123_LARGENAME(mpg123_replace_reader_handle)
+#define mpg123_framepos MPG123_LARGENAME(mpg123_framepos)
#endif /* largefile hackery */
@@ -133,7 +134,7 @@ EXPORT void mpg123_delete(mpg123_handle *mh);
/** Enumeration of the parameters types that it is possible to set/get. */
enum mpg123_parms
{
- MPG123_VERBOSE, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */
+ MPG123_VERBOSE = 0, /**< set verbosity value for enabling messages to stderr, >= 0 makes sense (integer) */
MPG123_FLAGS, /**< set all flags, p.ex val = MPG123_GAPLESS|MPG123_MONO_MIX (integer) */
MPG123_ADD_FLAGS, /**< add some flags (integer) */
MPG123_FORCE_RATE, /**< when value > 0, force output rate to that value (integer) */
@@ -147,9 +148,11 @@ enum mpg123_parms
MPG123_OUTSCALE, /**< the scale for output samples (amplitude - integer or float according to mpg123 output format, normally integer) */
MPG123_TIMEOUT, /**< timeout for reading from a stream (not supported on win32, integer) */
MPG123_REMOVE_FLAGS, /**< remove some flags (inverse of MPG123_ADD_FLAGS, integer) */
- MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). */
+ MPG123_RESYNC_LIMIT, /**< Try resync on frame parsing for that many bytes or until end of stream (<0 ... integer). This can enlarge the limit for skipping junk on beginning, too (but not reduce it). */
MPG123_INDEX_SIZE /**< Set the frame index size (if supported). Values <0 mean that the index is allowed to grow dynamically in these steps (in positive direction, of course) -- Use this when you really want a full index with every individual frame. */
,MPG123_PREFRAMES /**< Decode/ignore that many frames in advance for layer 3. This is needed to fill bit reservoir after seeking, for example (but also at least one frame in advance is needed to have all "normal" data for layer 3). Give a positive integer value, please.*/
+ ,MPG123_FEEDPOOL /**< For feeder mode, keep that many buffers in a pool to avoid frequent malloc/free. The pool is allocated on mpg123_open_feed(). If you change this parameter afterwards, you can trigger growth and shrinkage during decoding. The default value could change any time. If you care about this, then set it. (integer) */
+ ,MPG123_FEEDBUFFER /**< Minimal size of one internal feeder buffer, again, the default value is subject to change. (integer) */
};
/** Flag bits for MPG123_FLAGS, use the usual binary or to combine. */
@@ -170,6 +173,8 @@ enum mpg123_param_flags
,MPG123_PLAIN_ID3TEXT = 0x800 /**< 100000000000 Do not translate ID3 text data to UTF-8. ID3 strings will contain the raw text data, with the first byte containing the ID3 encoding code. */
,MPG123_IGNORE_STREAMLENGTH = 0x1000 /**< 1000000000000 Ignore any stream length information contained in the stream, which can be contained in a 'TLEN' frame of an ID3v2 tag or a Xing tag */
,MPG123_SKIP_ID3V2 = 0x2000 /**< 10 0000 0000 0000 Do not parse ID3v2 tags, just skip them. */
+ ,MPG123_IGNORE_INFOFRAME = 0x4000 /**< 100 0000 0000 0000 Do not parse the LAME/Xing info frame, treat it as normal MPEG data. */
+ ,MPG123_AUTO_RESAMPLE = 0x8000 /**< 1000 0000 0000 0000 Allow automatic internal resampling of any kind (default on if supported). Especially when going lowlevel with replacing output buffer, you might want to unset this flag. Setting MPG123_DOWNSAMPLE or MPG123_FORCE_RATE will override this. */
};
/** choices for MPG123_RVA */
@@ -278,6 +283,7 @@ enum mpg123_errors
,MPG123_LSEEK_FAILED /**< Low-level seek failed. */
,MPG123_BAD_CUSTOM_IO /**< Custom I/O not prepared. */
,MPG123_LFS_OVERFLOW /**< Offset value overflow during translation of large file API calls -- your client program cannot handle that large file. */
+ ,MPG123_INT_OVERFLOW /**< Some integer overflow. */
};
/** Return a string describing that error errcode means. */
@@ -326,6 +332,16 @@ EXPORT const char* mpg123_current_decoder(mpg123_handle *mh);
*
* Functions to get and select the format of the decoded audio.
*
+ * Before you dive in, please be warned that you might get confused by this. This seems to happen a lot, therefore I am trying to explain in advance.
+ *
+ * The mpg123 library decides what output format to use when encountering the first frame in a stream, or actually any frame that is still valid but differs from the frames before in the prompted output format. At such a deciding point, an internal table of allowed encodings, sampling rates and channel setups is consulted. According to this table, an output format is chosen and the decoding engine set up accordingly (including ptimized routines for different output formats). This might seem unusual but it just follows from the non-existence of "MPEG audio files" with defined overall properties. There are streams, streams are concatenations of (semi) independent frames. We store streams on disk and call them "MPEG audio files", but that does not change their nature as the decoder is concerned (the LAME/Xing header for gapless decoding makes things interesting again).
+ *
+ * To get to the point: What you do with mpg123_format() and friends is to fill the internal table of allowed formats before it is used. That includes removing support for some formats or adding your forced sample rate (see MPG123_FORCE_RATE) that will be used with the crude internal resampler. Also keep in mind that the sample encoding is just a question of choice -- the MPEG frames do only indicate their native sampling rate and channel count. If you want to decode to integer or float samples, 8 or 16 bit ... that is your decision. In a "clean" world, libmpg123 would always decode to 32 bit float and let you handle any sample conversion. But there are optimized routines that work faster by directly decoding to the desired encoding / accuracy. We prefer efficiency over conceptual tidyness.
+ *
+ * People often start out thinking that mpg123_format() should change the actual decoding format on the fly. That is wrong. It only has effect on the next natural change of output format, when libmpg123 will consult its format table again. To make life easier, you might want to call mpg123_format_none() before any thing else and then just allow one desired encoding and a limited set of sample rates / channel choices that you actually intend to deal with. You can force libmpg123 to decode everything to 44100 KHz, stereo, 16 bit integer ... it will duplicate mono channels and even do resampling if needed (unless that feature is disabled in the build, same with some encodings). But I have to stress that the resampling of libmpg123 is very crude and doesn't even contain any kind of "proper" interpolation.
+ *
+ * In any case, watch out for MPG123_NEW_FORMAT as return message from decoding routines and call mpg123_getformat() to get the currently active output format.
+ *
* @{
*/
@@ -512,6 +528,24 @@ EXPORT int mpg123_framebyframe_decode(mpg123_handle *mh, off_t *num, unsigned ch
*/
EXPORT int mpg123_framebyframe_next(mpg123_handle *mh);
+/** Get access to the raw input data for the last parsed frame.
+ * This gives you a direct look (and write access) to the frame body data.
+ * Together with the raw header, you can reconstruct the whole raw MPEG stream without junk and meta data, or play games by actually modifying the frame body data before decoding this frame (mpg123_framebyframe_decode()).
+ * A more sane use would be to use this for CRC checking (see mpg123_info() and MPG123_CRC), the first two bytes of the body make up the CRC16 checksum, if present.
+ * You can provide NULL for a parameter pointer when you are not interested in the value.
+ *
+ * \param header the 4-byte MPEG header
+ * \param bodydata pointer to the frame body stored in the handle (without the header)
+ * \param bodybytes size of frame body in bytes (without the header)
+ * \return MPG123_OK if there was a yet un-decoded frame to get the data from, MPG123_ERR otherwise (without further explanation, the error state of the mpg123_handle is not modified by this function).
+ */
+EXPORT int mpg123_framedata(mpg123_handle *mh, unsigned long *header, unsigned char **bodydata, size_t *bodybytes);
+
+/** Get the input position (byte offset in stream) of the last parsed frame.
+ * This can be used for external seek index building, for example.
+ * It just returns the internally stored offset, regardless of validity -- you ensure that a valid frame has been parsed before! */
+EXPORT off_t mpg123_framepos(mpg123_handle *mh);
+
/*@}*/
@@ -684,7 +718,7 @@ struct mpg123_frameinfo
long rate; /**< The sampling rate in Hz. */
enum mpg123_mode mode; /**< The audio mode (Mono, Stereo, Joint-stero, Dual Channel). */
int mode_ext; /**< The mode extension bit flag. */
- int framesize; /**< The size of the frame (in bytes). */
+ int framesize; /**< The size of the frame (in bytes, including header). */
enum mpg123_flags flags; /**< MPEG Audio flag bits. Just now I realize that it should be declared as int, not enum. It's a bitwise combination of the enum values. */
int emphasis; /**< The emphasis type. */
int bitrate; /**< Bitrate of the frame (kbps). */
@@ -718,6 +752,9 @@ EXPORT int mpg123_set_filesize(mpg123_handle *mh, off_t size);
/** Returns the time (seconds) per frame; <0 is error. */
EXPORT double mpg123_tpf(mpg123_handle *mh);
+/** Returns the samples per frame for the most recently parsed frame; <0 is error. */
+EXPORT int mpg123_spf(mpg123_handle *mh);
+
/** Get and reset the clip count. */
EXPORT long mpg123_clip(mpg123_handle *mh);
@@ -726,6 +763,8 @@ EXPORT long mpg123_clip(mpg123_handle *mh);
enum mpg123_state
{
MPG123_ACCURATE = 1 /**< Query if positons are currently accurate (integer value, 0 if false, 1 if true) */
+ ,MPG123_BUFFERFILL /**< Get fill of internal (feed) input buffer as integer byte count returned as long and as double. An error is returned on integer overflow while converting to (signed) long, but the returned floating point value shold still be fine. */
+ ,MPG123_FRANKENSTEIN /**< Stream consists of carelessly stitched together files (the leading one featuring gapless info). */
};
/** Get various current decoder/stream state information.
@@ -909,6 +948,9 @@ typedef struct
The check function returns a combination of flags. */
EXPORT int mpg123_meta_check(mpg123_handle *mh); /* On error (no valid handle) just 0 is returned. */
+/** Clean up meta data storage (ID3v2 and ICY), freeing memory. */
+EXPORT void mpg123_meta_free(mpg123_handle *mh);
+
/** Point v1 and v2 to existing data structures wich may change on any next read/decode function call.
* v1 and/or v2 can be set to NULL when there is no corresponding data.
* \return Return value is MPG123_OK or MPG123_ERR, */
@@ -1026,7 +1068,6 @@ EXPORT int mpg123_replace_reader_handle(mpg123_handle *mh, ssize_t (*r_read) (vo
/* @} */
-
#ifdef __cplusplus
}
#endif
View
6 mpg123/mpg123.xcodeproj/project.pbxproj
@@ -472,6 +472,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "mpg123" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -589,7 +592,6 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -733,6 +735,7 @@
3284710E15039CCF008C0B79 /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
3284711F15039DED008C0B79 /* Build configuration list for PBXNativeTarget "mpg123-synth_i586" */ = {
isa = XCConfigurationList;
@@ -741,6 +744,7 @@
3284712115039DED008C0B79 /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
View
34 musicbrainz3/musicbrainz3.xcodeproj/project.pbxproj
@@ -204,6 +204,9 @@
32E6FF190DCE6D88006F9032 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
32EF036510689B27008BAF8B /* discid_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = discid_private.h; path = "libdiscid-src/include/discid/discid_private.h"; sourceTree = "<group>"; };
32EF036610689B27008BAF8B /* discid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = discid.h; path = "libdiscid-src/include/discid/discid.h"; sourceTree = "<group>"; };
+ 3DAAA9A2169B0B69005253B6 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
+ 3DAAA9A3169B0B69005253B6 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+ 3DAAA9A4169B0B69005253B6 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8CA3607F0D2F5D0F00F89E3B /* artist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = artist.cpp; path = "libmusicbrainz-src/src/artist.cpp"; sourceTree = "<group>"; };
8CA360800D2F5D0F00F89E3B /* artistalias.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = artistalias.cpp; path = "libmusicbrainz-src/src/artistalias.cpp"; sourceTree = "<group>"; };
8CA360810D2F5D0F00F89E3B /* disc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = disc.cpp; path = "libmusicbrainz-src/src/disc.cpp"; sourceTree = "<group>"; };
@@ -287,6 +290,7 @@
0867D691FE84028FC02AAC07 /* musicbrainz3 */ = {
isa = PBXGroup;
children = (
+ 3DAAA9A1169B0B69005253B6 /* Configs */,
320092B3105D71C70055BE17 /* neon */,
32009283105D70ED0055BE17 /* discid */,
08FB77ACFE841707C02AAC07 /* musicbrainz3 */,
@@ -460,6 +464,17 @@
name = neon;
sourceTree = "<group>";
};
+ 3DAAA9A1169B0B69005253B6 /* Configs */ = {
+ isa = PBXGroup;
+ children = (
+ 3DAAA9A2169B0B69005253B6 /* Base.xcconfig */,
+ 3DAAA9A3169B0B69005253B6 /* Debug.xcconfig */,
+ 3DAAA9A4169B0B69005253B6 /* Release.xcconfig */,
+ );
+ name = Configs;
+ path = ../Configs;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -567,6 +582,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "musicbrainz3" */;
@@ -676,17 +692,17 @@
4FADC24308B4156D00ABE55E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = "$(SRCROOT)/neon-src";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "@loader_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = (
@@ -709,6 +725,7 @@
4FADC24408B4156D00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -717,7 +734,7 @@
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = NDEBUG;
HEADER_SEARCH_PATHS = "$(SRCROOT)/neon-src";
INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "@loader_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
OTHER_LDFLAGS = (
@@ -739,26 +756,19 @@
};
4FADC24708B4156D00ABE55E /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 3DAAA9A3169B0B69005253B6 /* Debug.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Debug;
};
4FADC24808B4156D00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 3DAAA9A4169B0B69005253B6 /* Release.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Release;
};
View
4 ofa1/ofa1.xcodeproj/project.pbxproj
@@ -268,6 +268,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ofa1" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -326,7 +329,6 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
View
6 ogg/ogg.xcodeproj/project.pbxproj
@@ -123,6 +123,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ogg" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -169,12 +172,12 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = "$(SRCROOT)/libogg-src/include";
@@ -188,6 +191,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
4 shorten/shorten.xcodeproj/project.pbxproj
@@ -198,6 +198,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "shorten" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -259,7 +262,6 @@
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
View
6 sndfile/sndfile.xcodeproj/project.pbxproj
@@ -482,6 +482,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "sndfile" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -601,13 +604,13 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -620,6 +623,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
8 speex/speex.xcodeproj/project.pbxproj
@@ -506,6 +506,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "speex" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -591,12 +594,12 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = HAVE_CONFIG_H;
@@ -610,6 +613,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -627,7 +631,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 32E7398910B9D32D00094C8A /* Debug.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
};
name = Debug;
};
@@ -635,7 +638,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 32E7398A10B9D32D00094C8A /* Release.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
};
name = Release;
};
View
28 taglib/taglib.xcodeproj/project.pbxproj
@@ -202,6 +202,10 @@
32E92DC11613E46C00917F63 /* ownershipframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 32E92DBF1613E46C00917F63 /* ownershipframe.h */; settings = {ATTRIBUTES = (Public, ); }; };
32E92DC41613E4A800917F63 /* tpropertymap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32E92DC21613E4A800917F63 /* tpropertymap.cpp */; };
32E92DC51613E4A800917F63 /* tpropertymap.h in Headers */ = {isa = PBXBuildFile; fileRef = 32E92DC31613E4A800917F63 /* tpropertymap.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 3DAAA941169AEB60005253B6 /* opusfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DAAA93D169AEB60005253B6 /* opusfile.cpp */; };
+ 3DAAA942169AEB60005253B6 /* opusfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DAAA93E169AEB60005253B6 /* opusfile.h */; };
+ 3DAAA943169AEB60005253B6 /* opusproperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DAAA93F169AEB60005253B6 /* opusproperties.cpp */; };
+ 3DAAA944169AEB60005253B6 /* opusproperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DAAA940169AEB60005253B6 /* opusproperties.h */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -370,7 +374,6 @@
3261F77D11A9A0B700E08DCD /* wavproperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavproperties.h; sourceTree = "<group>"; };
3261F77E11A9A0B700E08DCD /* tag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tag.cpp; sourceTree = "<group>"; };
3261F77F11A9A0B700E08DCD /* tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tag.h; sourceTree = "<group>"; };
- 3261F78011A9A0B700E08DCD /* taglib.pro */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = taglib.pro; sourceTree = "<group>"; };
3261F78111A9A0B700E08DCD /* taglib_config.h.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = taglib_config.h.cmake; sourceTree = "<group>"; };
3261F78311A9A0B700E08DCD /* taglib_export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = taglib_export.h; sourceTree = "<group>"; };
3261F78411A9A0B700E08DCD /* tagunion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tagunion.cpp; sourceTree = "<group>"; };
@@ -506,6 +509,10 @@
32E92DBF1613E46C00917F63 /* ownershipframe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ownershipframe.h; sourceTree = "<group>"; };
32E92DC21613E4A800917F63 /* tpropertymap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tpropertymap.cpp; sourceTree = "<group>"; };
32E92DC31613E4A800917F63 /* tpropertymap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tpropertymap.h; sourceTree = "<group>"; };
+ 3DAAA93D169AEB60005253B6 /* opusfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opusfile.cpp; sourceTree = "<group>"; };
+ 3DAAA93E169AEB60005253B6 /* opusfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opusfile.h; sourceTree = "<group>"; };
+ 3DAAA93F169AEB60005253B6 /* opusproperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opusproperties.cpp; sourceTree = "<group>"; };
+ 3DAAA940169AEB60005253B6 /* opusproperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opusproperties.h; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* taglib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = taglib.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
@@ -699,7 +706,6 @@
3261F76B11A9A0B700E08DCD /* riff */,
3261F77E11A9A0B700E08DCD /* tag.cpp */,
3261F77F11A9A0B700E08DCD /* tag.h */,
- 3261F78011A9A0B700E08DCD /* taglib.pro */,
3261F78111A9A0B700E08DCD /* taglib_config.h.cmake */,
3261F78311A9A0B700E08DCD /* taglib_export.h */,
3261F78411A9A0B700E08DCD /* tagunion.cpp */,
@@ -888,6 +894,7 @@
3261F75811A9A0B700E08DCD /* oggpage.h */,
3261F75911A9A0B700E08DCD /* oggpageheader.cpp */,
3261F75A11A9A0B700E08DCD /* oggpageheader.h */,
+ 3DAAA93C169AEB60005253B6 /* opus */,
3261F75B11A9A0B700E08DCD /* speex */,
3261F76211A9A0B700E08DCD /* vorbis */,
3261F76911A9A0B700E08DCD /* xiphcomment.cpp */,
@@ -1158,6 +1165,17 @@
name = "Other Sources";
sourceTree = "<group>";
};
+ 3DAAA93C169AEB60005253B6 /* opus */ = {
+ isa = PBXGroup;
+ children = (
+ 3DAAA93D169AEB60005253B6 /* opusfile.cpp */,
+ 3DAAA93E169AEB60005253B6 /* opusfile.h */,
+ 3DAAA93F169AEB60005253B6 /* opusproperties.cpp */,
+ 3DAAA940169AEB60005253B6 /* opusproperties.h */,
+ );
+ path = opus;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -1266,6 +1284,8 @@
32E92DC11613E46C00917F63 /* ownershipframe.h in Headers */,
32E92DC51613E4A800917F63 /* tpropertymap.h in Headers */,
3226274B16265E100041896F /* infotag.h in Headers */,
+ 3DAAA942169AEB60005253B6 /* opusfile.h in Headers */,
+ 3DAAA944169AEB60005253B6 /* opusproperties.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1297,6 +1317,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "taglib" */;
@@ -1427,6 +1448,8 @@
32E92DC01613E46C00917F63 /* ownershipframe.cpp in Sources */,
32E92DC41613E4A800917F63 /* tpropertymap.cpp in Sources */,
3226274A16265E100041896F /* infotag.cpp in Sources */,
+ 3DAAA941169AEB60005253B6 /* opusfile.cpp in Sources */,
+ 3DAAA943169AEB60005253B6 /* opusproperties.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1446,7 +1469,6 @@
);
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
View
2  tta++/tta++.xcodeproj/project.pbxproj
@@ -125,7 +125,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0440;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "tta++" */;
compatibilityVersion = "Xcode 3.2";
View
6 vorbis/vorbis.xcodeproj/project.pbxproj
@@ -438,6 +438,9 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "vorbis" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
@@ -529,12 +532,12 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = (
@@ -553,6 +556,7 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
View
22 wavpack/wavpack.xcodeproj/project.pbxproj
@@ -331,6 +331,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0440;
ORGANIZATIONNAME = sbooth.org;
};
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "wavpack" */;
@@ -458,10 +459,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(NATIVE_ARCH)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
@@ -496,7 +495,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
@@ -547,7 +545,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
@@ -577,7 +574,6 @@
"$(SRCROOT)/wavpack-src/include",
);
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = wavpack;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
};
@@ -590,7 +586,6 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
"PACKAGE_NAME=\\\"wavpack\\\"",
@@ -619,7 +614,6 @@
"$(SRCROOT)/wavpack-src/include",
);
INSTALL_PATH = /usr/local/bin;
- PREBINDING = NO;
PRODUCT_NAME = wavpack;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/flac-src/include";
ZERO_LINK = NO;
@@ -632,7 +626,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
@@ -662,7 +655,6 @@
"$(SRCROOT)/wavpack-src/include",
);