AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove now-obsolete libOggFLAC stuff

Browse Source
This commit is contained in:
Josh Coalson 2006-10-16 16:18:34 +00:00
parent b1f323810b
commit 0b9442c3b6
10 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/Doxyfile
View File

@ -452,9 +452,7 @@ WARN_LOGFILE =
# with spaces.
INPUT = ../include/FLAC \
../include/FLAC++ \
../include/OggFLAC \
../include/OggFLAC++
../include/FLAC++
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@ -997,7 +995,7 @@ PREDEFINED = FLAC__NO_DLL
# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
EXPAND_AS_DEFINED = FLAC_API FLACPP_API OggFLAC_API OggFLACPP_API
EXPAND_AS_DEFINED = FLAC_API FLACPP_API
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
# doxygen's preprocessor will remove all function-like macros that are alone

2
doc/html/license.html
View File

@ -59,7 +59,7 @@
<br />
The FLAC project also makes available software that implements the formats, which is distributed according to <a href="http://www.opensource.org/docs/definition.php">Open Source</a> licenses as follows:<br />
<br />
The reference implementation libraries are licensed under <a href="http://www.xiph.org/licenses/bsd/">Xiph's variant of the BSD License</a>, a.k.a. the Xiph License. This is a trivial variation of the popular <a href="http://www.opensource.org/licenses/bsd-license.php">BSD License</a> where the Xiph.org Foundation is substituted for the University of California, Berkeley. In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works. The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic. In the source code these libraries are called <span class="commandname">libFLAC</span>, <span class="commandname">libFLAC++</span>, <span class="commandname">libOggFLAC</span>, and <span class="commandname">libOggFLAC++</span>.<br />
The reference implementation libraries are licensed under <a href="http://www.xiph.org/licenses/bsd/">Xiph's variant of the BSD License</a>, a.k.a. the Xiph License. This is a trivial variation of the popular <a href="http://www.opensource.org/licenses/bsd-license.php">BSD License</a> where the Xiph.org Foundation is substituted for the University of California, Berkeley. In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works. The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic. In the source code these libraries are called <span class="commandname">libFLAC</span> and <span class="commandname">libFLAC++</span>.<br />
<br />
The rest of the software that the FLAC project provides is licensed under the <a href="http://www.gnu.org/licenses/licenses.html#GPL">GNU General Public License</a> (GPL). This software includes various utilities for converting files to and from FLAC format, plugins for audio players, et cetera. In general, the GPL allows redistribution as long as derived works are also made available in source code form according to compatible terms.<br />
<br />

3
include/FLAC++/decoder.h
View File

@ -183,9 +183,6 @@ namespace FLAC {
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
// hackery solely for the use of libOggFLAC++
Stream(::FLAC__StreamDecoder *);
::FLAC__StreamDecoder *decoder_;
static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);

3
include/FLAC++/encoder.h
View File

@ -195,9 +195,6 @@ namespace FLAC {
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
// hackery solely for the use of libOggFLAC++
Stream(::FLAC__StreamEncoder *);
::FLAC__StreamEncoder *encoder_;
static ::FLAC__StreamEncoderReadStatus read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data);

10
src/libFLAC++/stream_decoder.cpp
View File

@ -50,18 +50,8 @@ namespace FLAC {
decoder_(::FLAC__stream_decoder_new())
{ }
Stream::Stream(::FLAC__StreamDecoder *decoder):
decoder_(decoder)
{ }
Stream::~Stream()
{
// WATCHOUT: must check for NULL not only because
// ::FLAC__stream_encoder_new() might have failed in
// the constructor, but also because
// OggFLAC::Encoder::Stream deletes the encoder_ before
// we get to it here to make the C inheritance magic
// work.
if(0 != decoder_) {
::FLAC__stream_decoder_finish(decoder_);
::FLAC__stream_decoder_delete(decoder_);

10
src/libFLAC++/stream_encoder.cpp
View File

@ -51,18 +51,8 @@ namespace FLAC {
encoder_(::FLAC__stream_encoder_new())
{ }
Stream::Stream(::FLAC__StreamEncoder *encoder):
encoder_(encoder)
{ }
Stream::~Stream()
{
// WATCHOUT: must check for NULL not only because
// ::FLAC__stream_encoder_new() might have failed in
// the constructor, but also because
// OggFLAC::Encoder::Stream deletes the encoder_ before
// we get to it here to make the C inheritance magic
// work.
if(0 != encoder_) {
::FLAC__stream_encoder_finish(encoder_);
::FLAC__stream_encoder_delete(encoder_);

14
src/libFLAC/include/private/md5.h
View File

@ -28,12 +28,6 @@
#define md5byte unsigned char
/*
* Due to an unholy abomination in libOggFLAC (it requires access to
* these internal MD5 functions) we have to #include "FLAC/export.h"
* and export them when building a DLL
*/
#include "FLAC/export.h"
#include "FLAC/ordinals.h"
struct FLAC__MD5Context {
@ -44,11 +38,11 @@ struct FLAC__MD5Context {
unsigned capacity;
};
FLAC_API void FLAC__MD5Init(struct FLAC__MD5Context *context);
FLAC_API void FLAC__MD5Update(struct FLAC__MD5Context *context, md5byte const *buf, unsigned len);
FLAC_API void FLAC__MD5Final(md5byte digest[16], struct FLAC__MD5Context *context);
void FLAC__MD5Init(struct FLAC__MD5Context *context);
void FLAC__MD5Update(struct FLAC__MD5Context *context, md5byte const *buf, unsigned len);
void FLAC__MD5Final(md5byte digest[16], struct FLAC__MD5Context *context);
void FLAC__MD5Transform(FLAC__uint32 buf[4], FLAC__uint32 const in[16]);
FLAC_API FLAC__bool FLAC__MD5Accumulate(struct FLAC__MD5Context *ctx, const FLAC__int32 * const signal[], unsigned channels, unsigned samples, unsigned bytes_per_sample);
FLAC__bool FLAC__MD5Accumulate(struct FLAC__MD5Context *ctx, const FLAC__int32 * const signal[], unsigned channels, unsigned samples, unsigned bytes_per_sample);
#endif /* !MD5_H */

2
src/test_libFLAC++/Makefile.lite
View File

@ -29,7 +29,7 @@ INCLUDES = -I$(topdir)/include
ifeq ($(DARWIN_BUILD),yes)
EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC++.a $(libdir)/libFLAC.a -lm
else
LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lOggFLAC -lFLAC -L$(OGG_LIB_DIR) -logg -lm
LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC -L$(OGG_LIB_DIR) -logg -lm
endif
SRCS_CPP = \

2
src/test_libFLAC/Makefile.lite
View File

@ -29,7 +29,7 @@ INCLUDES = -I../libFLAC/include -I$(topdir)/include
ifeq ($(DARWIN_BUILD),yes)
EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC.a -lm
else
LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lOggFLAC -lFLAC -L$(OGG_LIB_DIR) -logg -lm
LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC -L$(OGG_LIB_DIR) -logg -lm
endif
SRCS_C = \

2
test/test_seeking.sh
View File

@ -121,7 +121,7 @@ if [ $has_ogg = "yes" ] ; then
echo "generating Ogg FLAC files for seeking:"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.ogg --ogg noise8m32.raw || die "ERROR generating Ogg FLAC file"
run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.ogg --ogg noise.raw || die "ERROR generating Ogg FLAC file"
# seek tables are not used in libOggFLAC
# seek tables are not used in Ogg FLAC
echo "testing tiny.ogg:"
if run_test_seeking tiny.ogg 100 ; then : ; else