Skip to content

Commit

Permalink
CI + Updates for OS X 10.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
macmade committed Jun 20, 2014
1 parent 99a1231 commit a09821f
Show file tree
Hide file tree
Showing 64 changed files with 86 additions and 66 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: objective-c
compiler: clang
script: make && make test
18 changes: 14 additions & 4 deletions MP4Parse.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@
05DE45A013378714002269FF /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = XS-Labs;
LastUpgradeCheck = 0600;
ORGANIZATIONNAME = "XS-Labs";
};
buildConfigurationList = 05DE45A313378714002269FF /* Build configuration list for PBXProject "MP4Parse" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -377,19 +377,24 @@
05DE45A613378714002269FF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -400,16 +405,21 @@
05DE45A713378714002269FF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0460"
LastUpgradeVersion = "0600"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>MP4Parse.xcscheme</key>
<key>MP4Parse.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
MP4Parse
========

[![Build Status](https://travis-ci.org/macmade/MP4Parse.svg?branch=master)](https://travis-ci.org/macmade/MP4Parse)

About
-----

Expand Down
4 changes: 2 additions & 2 deletions makefile-code/C++.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# $Id$

# Flag to let the makefile knows that the code specific options were included
CODE_HASOPTIONS := 1
CODE_HASOPTIONS := 1

#-------------------------------------------------------------------------------
# Extensions for files
Expand All @@ -58,7 +58,7 @@ EXT_OBJECT = .o
#-------------------------------------------------------------------------------

CC = g++
LIBTOOL = glibtool
LIBTOOL = libtool

#-------------------------------------------------------------------------------
# Arguments for the compiler tools
Expand Down
4 changes: 2 additions & 2 deletions makefile-code/Objective-C.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# $Id$

# Flag to let the makefile knows that the code specific options were included
CODE_HASOPTIONS := 1
CODE_HASOPTIONS := 1

#-------------------------------------------------------------------------------
# Extensions for files
Expand All @@ -58,7 +58,7 @@ EXT_OBJECT = .o
#-------------------------------------------------------------------------------

CC = gcc
LIBTOOL = glibtool
LIBTOOL = libtool

#-------------------------------------------------------------------------------
# Arguments for the compiler tools
Expand Down
5 changes: 4 additions & 1 deletion source/MP4.Atom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@

using namespace MP4;

Atom::~Atom( void )
{}

std::string Atom::getType( void )
{
return this->_type;
}
}
2 changes: 1 addition & 1 deletion source/MP4.BXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string BXML::description( void )
void BXML::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
4 changes: 2 additions & 2 deletions source/MP4.BinaryStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ float BinaryStream::readFloat( void )

for( i = 0; i > -24; i-- )
{
if( mantissa & ( 1 << i + 23 ) )
if( mantissa & ( 1 << ( i + 23 ) ) )
{
flt += pow( 2, i + exp );
}
Expand Down Expand Up @@ -340,7 +340,7 @@ double BinaryStream::readDouble( void )

for( i = 0; i > -24; i-- )
{
if( mantissa & ( 1 << i + 23 ) )
if( mantissa & ( 1 << ( i + 23 ) ) )
{
flt += pow( 2, i + exp );
}
Expand Down
2 changes: 1 addition & 1 deletion source/MP4.CO64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string CO64::description( void )
void CO64::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.CPRT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string CPRT::description( void )
void CPRT::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.CTTS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string CTTS::description( void )
void CTTS::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.ContainerAtom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ std::string ContainerAtom::description( void )
}

return s;
}
}
2 changes: 1 addition & 1 deletion source/MP4.DREF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string DREF::description( void )
void DREF::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.ELST.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string ELST::description( void )
void ELST::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.FREE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string FREE::description( void )
void FREE::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.FRMA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string FRMA::description( void )
void FRMA::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.FTYP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ void FTYP::processData( MP4::BinaryStream * stream, size_t length )
_compatibleBrands.push_back( s );
}
}
}
}
2 changes: 1 addition & 1 deletion source/MP4.File.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ std::string File::description( void )
}

return s;
}
}
2 changes: 1 addition & 1 deletion source/MP4.HDLR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string HDLR::description( void )
void HDLR::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.HMHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string HMHD::description( void )
void HMHD::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.IINF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string IINF::description( void )
void IINF::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.ILOC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string ILOC::description( void )
void ILOC::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.IMIF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string IMIF::description( void )
void IMIF::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.IPMC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string IPMC::description( void )
void IPMC::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MDAT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string MDAT::description( void )
void MDAT::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MDHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ void MDHD::processData( MP4::BinaryStream * stream, size_t length )
this->_language = stream->readBigEndianISO639Code();

stream->ignore( length - parsedLength );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MEHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string MEHD::description( void )
void MEHD::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MFHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string MFHD::description( void )
void MFHD::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MFRO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string MFRO::description( void )
void MFRO::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.MVHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ void MVHD::processData( MP4::BinaryStream * stream, size_t length )

this->_nextTrackId = stream->readBigEndianUnsignedInteger();
}
}
}
2 changes: 1 addition & 1 deletion source/MP4.PADB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string PADB::description( void )
void PADB::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.PDIN.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string PDIN::description( void )
void PDIN::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.PITM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string PITM::description( void )
void PITM::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SBGP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SBGP::description( void )
void SBGP::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SCHI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SCHI::description( void )
void SCHI::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SCHM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SCHM::description( void )
void SCHM::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SDTP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SDTP::description( void )
void SDTP::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SGPD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SGPD::description( void )
void SGPD::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.SMHD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string SMHD::description( void )
void SMHD::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.STCO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string STCO::description( void )
void STCO::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
2 changes: 1 addition & 1 deletion source/MP4.STDP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ std::string STDP::description( void )
void STDP::processData( MP4::BinaryStream * stream, size_t length )
{
stream->ignore( length );
}
}
Loading

0 comments on commit a09821f

Please sign in to comment.