ogg123 now plays FLAC files!

-  Added stuff into configure.in to detect FLAC libraries and headers
   (should autodetect correctly, but you can also force it off with
   --without-flac) as well as setup conditional building.
- FLAC is not required to build ogg123 (unlike curl).
- Reads both FLAC and Ogg FLAC
- Refactored vorbis comment pretty printing into separate file since it
  is shared by both FLAC and Vorbis readers (and future Speex reader will
  need it too)
- Fixed bug caused by assuming Vorbis comments were null terminated.

svn path=/trunk/vorbis-tools/; revision=4222

configure.in

@@ -90,7 +90,7 @@ AC_ARG_ENABLE(oggenc, [  --disable-oggenc   Skip building oggenc], build_oggenc=
 AC_ARG_ENABLE(ogginfo,[  --disable-ogginfo  Skip building ogginfo], build_ogginfo="$enableval", build_ogginfo="yes")
 AC_ARG_ENABLE(vcut,   [  --disable-vcut     Skip building vcut], build_vcut="$enableval", build_vcut="yes")
 AC_ARG_ENABLE(vorbiscomment, [  --disable-vorbiscomment   Skip building vorbiscomment], build_vorbiscomment="$enableval", build_vorbiscomment="yes")
-
+AC_ARG_WITH(flac,     [  --without-flac     Do not compile FLAC support], build_flac="$enableval", build_flac="yes")
 
 dnl --------------------------------------------------
 dnl Check for generally needed libraries
@@ -110,7 +110,7 @@ AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
 AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
 
 dnl --------------------------------------------------
-dnl Check for ogg123 critical libraries
+dnl Check for ogg123 critical libraries and other optional libraries
 dnl --------------------------------------------------
 
 if test "x$build_ogg123" = xyes; then
@@ -124,7 +124,29 @@ if test "x$build_ogg123" = xyes; then
     AC_MSG_WARN([Prerequisites for ogg123 not met, ogg123 will not be built])
   fi
 fi
- 
+
+FLAC_LIBS=
+
+AC_CHECK_LIB(m,log,FLAC_EXTRA_LIBS="-lm")
+AC_CHECK_LIB(FLAC, FLAC__stream_decoder_process_single,have_libFLAC=yes,
+  AC_MSG_WARN(libFLAC missing)
+  have_libFLAC=no, $FLAC_EXTRA_LIBS
+)
+AC_CHECK_HEADER(FLAC/stream_decoder.h,,
+  AC_MSG_WARN(libFLAC headers missing)
+  have_libFLAC=no,[ ])
+
+if test "x$have_libFLAC" = xyes; then
+   if test "x$build_flac" = xyes; then
+      AC_DEFINE(HAVE_LIBFLAC)
+      FLAC_LIBS="$FLAC_EXTRA_LIBS -lFLAC -lOggFLAC"
+   fi
+else
+   build_flac="no"
+fi
+AM_CONDITIONAL(HAVE_LIBFLAC, test "x$build_flac" = xyes)
+AC_SUBST(FLAC_LIBS)
+
 dnl --------------------------------------------------
 dnl Check for library functions
 dnl --------------------------------------------------

ogg123/Makefile.am

@@ -8,11 +8,25 @@ ogg123sources = audio.c buffer.c callbacks.c \
                 cfgfile_options.c cmdline_options.c \
                 file_transport.c format.c http_transport.c \
                 ogg123.c oggvorbis_format.c playlist.c \
-                status.c transport.c  \
+                status.c transport.c  vorbis_comments.c \
                 audio.h buffer.h callbacks.h compat.h \
                 cfgfile_options.h cmdline_options.h \
                 format.h ogg123.h playlist.h status.h \
-                transport.h
+                transport.h vorbis_comments.h
+flacsources = flac_format.c easyflac.c easyflac.h
+
+
+if HAVE_LIBFLAC
+
+buildsources = $(ogg123sources) $(flacsources)
+flaclibs = @FLAC_LIBS@
+
+else
+
+buildsources = $(ogg123sources)
+flaclibs = 
+
+endif
 
 
 if BUILD_OGG123
@@ -31,16 +45,16 @@ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ @CURL_CFLAGS@ \
 ogg123_LDADD = @SHARE_LIBS@ \
 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
-               @PTHREAD_LIBS@ @I18N_LIBS@
+               @PTHREAD_LIBS@ @I18N_LIBS@ $(flaclibs)
 ogg123_DEPENDENCIES = @SHARE_LIBS@
-ogg123_SOURCES = $(ogg123sources)
+ogg123_SOURCES = $(buildsources)
 
 man_MANS = $(mans) 
 doc_DATA = $(docs)
 
 endif
 
-EXTRA_DIST = $(ogg123sources) $(mans) $(docs)
+EXTRA_DIST = $(ogg123sources) $(flacsources) $(mans) $(docs)
 
 
 debug:

ogg123/easyflac.c

+/* EasyFLAC - A thin decoding wrapper around libFLAC and libOggFLAC to
+ * make your code less ugly.  See easyflac.h for explanation.
+ *
+ * Copyright 2003 - Stan Seibert <volsung@xiph.org>
+ * This code is licensed under a BSD style license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdlib.h>
+#include "easyflac.h"
+
+
+FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder)
+{
+	return decoder->is_oggflac;
+}
+
+
+EasyFLAC__StreamDecoder *EasyFLAC__stream_decoder_new(FLAC__bool is_oggflac)
+{
+	EasyFLAC__StreamDecoder *decoder = malloc(sizeof(EasyFLAC__StreamDecoder));
+
+	if (decoder != NULL)
+	{
+		decoder->is_oggflac = is_oggflac;
+		
+		if (decoder->is_oggflac)
+			decoder->oggflac = OggFLAC__stream_decoder_new();
+		else
+			decoder->flac = FLAC__stream_decoder_new();
+
+		if (  (decoder->is_oggflac && decoder->oggflac == NULL)
+		    ||(!decoder->is_oggflac && decoder->flac == NULL)  )
+		{
+			free(decoder);
+			decoder = NULL;
+		}
+	}
+
+	return decoder;
+}
+
+
+void EasyFLAC__stream_decoder_delete(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		OggFLAC__stream_decoder_delete(decoder->oggflac);
+	else
+		FLAC__stream_decoder_delete(decoder->flac);
+
+	free(decoder);
+}
+
+
+/* Wrappers around the callbacks for OggFLAC */
+
+FLAC__StreamDecoderReadStatus oggflac_read_callback(const OggFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	return (*e_decoder->callbacks.read)(e_decoder, buffer, bytes, e_decoder->callbacks.client_data);
+}
+
+
+FLAC__StreamDecoderWriteStatus oggflac_write_callback(const OggFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	return (*(e_decoder->callbacks.write))(e_decoder, frame, buffer, e_decoder->callbacks.client_data);
+}
+
+
+void oggflac_metadata_callback(const OggFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	(*e_decoder->callbacks.metadata)(e_decoder, metadata, e_decoder->callbacks.client_data);
+}
+
+
+void oggflac_error_callback(const OggFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	(*e_decoder->callbacks.error)(e_decoder, status, e_decoder->callbacks.client_data);
+}
+
+
+/* Wrappers around the callbacks for FLAC */
+
+FLAC__StreamDecoderReadStatus flac_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	return (*e_decoder->callbacks.read)(e_decoder, buffer, bytes, e_decoder->callbacks.client_data);
+}
+
+
+FLAC__StreamDecoderWriteStatus flac_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	return (*e_decoder->callbacks.write)(e_decoder, frame, buffer, e_decoder->callbacks.client_data);
+}
+
+
+void flac_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	(*e_decoder->callbacks.metadata)(e_decoder, metadata, e_decoder->callbacks.client_data);
+}
+
+
+void flac_error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{
+	EasyFLAC__StreamDecoder *e_decoder = (EasyFLAC__StreamDecoder *) client_data;
+
+	(*e_decoder->callbacks.error)(e_decoder, status, e_decoder->callbacks.client_data);
+}
+
+
+FLAC__bool EasyFLAC__set_read_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderReadCallback value)
+{
+	decoder->callbacks.read = value;
+
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_read_callback(decoder->oggflac, &oggflac_read_callback);
+	else
+		return FLAC__stream_decoder_set_read_callback(decoder->flac, &flac_read_callback);
+}
+
+
+FLAC__bool EasyFLAC__set_write_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderWriteCallback value)
+{
+	decoder->callbacks.write = value;
+
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_write_callback(decoder->oggflac, &oggflac_write_callback);
+	else
+		return FLAC__stream_decoder_set_write_callback(decoder->flac, &flac_write_callback);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderMetadataCallback value)
+{
+	decoder->callbacks.metadata = value;
+
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_callback(decoder->oggflac, &oggflac_metadata_callback);
+	else
+		return FLAC__stream_decoder_set_metadata_callback(decoder->flac, &flac_metadata_callback);
+}
+
+
+FLAC__bool EasyFLAC__set_error_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderErrorCallback value)
+{
+	decoder->callbacks.error = value;
+
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_error_callback(decoder->oggflac, &oggflac_error_callback);
+	else
+		return FLAC__stream_decoder_set_error_callback(decoder->flac, &flac_error_callback);
+}
+
+
+FLAC__bool EasyFLAC__set_client_data(EasyFLAC__StreamDecoder *decoder, void *value)
+{
+	decoder->callbacks.client_data = value;
+	
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_client_data(decoder->oggflac, decoder);
+	else
+		return FLAC__stream_decoder_set_client_data(decoder->flac, decoder);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_respond(EasyFLAC__StreamDecoder *decoder, FLAC__MetadataType type)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_respond(decoder->oggflac, type);
+	else
+		return FLAC__stream_decoder_set_metadata_respond(decoder->flac, type);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_respond_application(EasyFLAC__StreamDecoder *decoder, const FLAC__byte id[4])
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_respond_application(decoder->oggflac, id);
+	else
+		return FLAC__stream_decoder_set_metadata_respond_application(decoder->flac, id);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_respond_all(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_respond_all(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_set_metadata_respond_all(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_ignore(EasyFLAC__StreamDecoder *decoder, FLAC__MetadataType type)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_ignore(decoder->oggflac, type);
+	else
+		return FLAC__stream_decoder_set_metadata_ignore(decoder->flac, type);
+}
+
+
+FLAC__bool EasyFLAC__set_metadata_ignore_application(EasyFLAC__StreamDecoder *decoder, const FLAC__byte id[4])
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_ignore_application(decoder->oggflac, id);
+	else
+		return FLAC__stream_decoder_set_metadata_ignore_application(decoder->flac, id);
+}
+
+FLAC__bool EasyFLAC__set_metadata_ignore_all(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_set_metadata_ignore_all(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_set_metadata_ignore_all(decoder->flac);
+}
+
+
+FLAC__StreamDecoderState EasyFLAC__get_state(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_state(decoder->flac);
+}
+
+
+unsigned EasyFLAC__get_channels(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_channels(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_channels(decoder->flac);
+}
+
+
+FLAC__ChannelAssignment EasyFLAC__get_channel_assignment(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_channel_assignment(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_channel_assignment(decoder->flac);
+}
+
+
+unsigned EasyFLAC__get_bits_per_sample(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_bits_per_sample(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_bits_per_sample(decoder->flac);
+}
+
+
+unsigned EasyFLAC__get_sample_rate(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_sample_rate(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_sample_rate(decoder->flac);
+}
+
+
+unsigned EasyFLAC__get_blocksize(const EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_get_blocksize(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_get_blocksize(decoder->flac);
+}
+
+
+FLAC__StreamDecoderState EasyFLAC__init(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+	{
+		OggFLAC__stream_decoder_init(decoder->oggflac);
+		return OggFLAC__stream_decoder_get_FLAC_stream_decoder_state(decoder->oggflac);
+	}
+	else
+		return FLAC__stream_decoder_init(decoder->flac);
+}
+
+
+void EasyFLAC__finish(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		OggFLAC__stream_decoder_finish(decoder->oggflac);
+	else
+		FLAC__stream_decoder_finish(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__flush(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_flush(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_flush(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__reset(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_reset(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_reset(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__process_single(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_process_single(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_process_single(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__process_until_end_of_metadata(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_process_until_end_of_metadata(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_process_until_end_of_metadata(decoder->flac);
+}
+
+
+FLAC__bool EasyFLAC__process_until_end_of_stream(EasyFLAC__StreamDecoder *decoder)
+{
+	if (decoder->is_oggflac)
+		return OggFLAC__stream_decoder_process_until_end_of_stream(decoder->oggflac);
+	else
+		return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac);
+}

ogg123/easyflac.h

+/* EasyFLAC - A thin decoding wrapper around libFLAC and libOggFLAC to
+ * make your code less ugly.
+ *
+ * Copyright 2003 - Stan Seibert <volsung@xiph.org>
+ * This code is licensed under a BSD style license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************
+ *
+ * The motivation for this wrapper is to avoid issues where you need to
+ * decode both FLAC and Ogg FLAC but don't want to enclose all of your code
+ * in enormous if blocks where the body of the two branches is essentially 
+ * the same.  For example, you don't want to do something like this:
+ *
+ *  if (is_ogg_flac)
+ *  {
+ *      OggFLAC__blah_blah();
+ *      OggFLAC__more_stuff();
+ *  }
+ *  else
+ *  {
+ *      FLAC__blah_blah();
+ *      FLAC__more_stuff();
+ *  }
+ * 
+ * when you really just want this:
+ *
+ * EasyFLAC__blah_blah();
+ * EasyFLAC__more_stuff();
+ *
+ * This is even more cumbersome when you have to deal with constants.
+ *
+ * EasyFLAC uses essentially the same API as
+ * FLAC__stream_decoder with two additions:
+ * 
+ * - EasyFLAC__is_oggflac() for those rare occassions when you might
+ * need to distiguish the difference cases.
+ *
+ * - EasyFLAC__stream_decoder_new() takes a parameter to select when
+ * you are reading FLAC or Ogg FLAC.
+ *
+ * The constants are all FLAC__stream_decoder_*.
+ *
+ * WARNING: Always call EasyFLAC__set_client_data() even if all you
+ * want to do is set the client data to NULL.
+ */
+
+#ifndef __EASYFLAC_H
+#define __EASYFLAC_H
+
+#include <FLAC/stream_decoder.h>
+#include <OggFLAC/stream_decoder.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct EasyFLAC__StreamDecoder  EasyFLAC__StreamDecoder;
+
+
+typedef FLAC__StreamDecoderReadStatus (*EasyFLAC__StreamDecoderReadCallback)(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
+typedef FLAC__StreamDecoderWriteStatus (*EasyFLAC__StreamDecoderWriteCallback)(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+typedef void (*EasyFLAC__StreamDecoderMetadataCallback)(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+typedef void (*EasyFLAC__StreamDecoderErrorCallback)(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+
+struct EasyFLAC__StreamDecoder {
+	FLAC__bool is_oggflac;
+	FLAC__StreamDecoder *flac;
+	OggFLAC__StreamDecoder *oggflac;
+	struct {
+		EasyFLAC__StreamDecoderReadCallback     read;
+		EasyFLAC__StreamDecoderWriteCallback    write;
+		EasyFLAC__StreamDecoderMetadataCallback metadata;
+		EasyFLAC__StreamDecoderErrorCallback    error;
+		void *client_data;
+	} callbacks;
+};
+
+
+
+FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder);
+
+EasyFLAC__StreamDecoder *EasyFLAC__stream_decoder_new(FLAC__bool is_oggflac);
+void EasyFLAC__stream_decoder_delete(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__set_read_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderReadCallback value);
+FLAC__bool EasyFLAC__set_write_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderWriteCallback value);
+FLAC__bool EasyFLAC__set_metadata_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderMetadataCallback value);
+FLAC__bool EasyFLAC__set_error_callback(EasyFLAC__StreamDecoder *decoder, EasyFLAC__StreamDecoderErrorCallback value);
+FLAC__bool EasyFLAC__set_client_data(EasyFLAC__StreamDecoder *decoder, void *value);
+FLAC__bool EasyFLAC__set_metadata_respond(EasyFLAC__StreamDecoder *decoder, FLAC__MetadataType type);
+FLAC__bool EasyFLAC__set_metadata_respond_application(EasyFLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
+FLAC__bool EasyFLAC__set_metadata_respond_all(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__set_metadata_ignore(EasyFLAC__StreamDecoder *decoder, FLAC__MetadataType type);
+FLAC__bool EasyFLAC__set_metadata_ignore_application(EasyFLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
+FLAC__bool EasyFLAC__set_metadata_ignore_all(EasyFLAC__StreamDecoder *decoder);
+FLAC__StreamDecoderState EasyFLAC__get_state(const EasyFLAC__StreamDecoder *decoder);
+unsigned EasyFLAC__get_channels(const EasyFLAC__StreamDecoder *decoder);
+FLAC__ChannelAssignment EasyFLAC__get_channel_assignment(const EasyFLAC__StreamDecoder *decoder);
+unsigned EasyFLAC__get_bits_per_sample(const EasyFLAC__StreamDecoder *decoder);
+unsigned EasyFLAC__get_sample_rate(const EasyFLAC__StreamDecoder *decoder);
+unsigned EasyFLAC__get_blocksize(const EasyFLAC__StreamDecoder *decoder);
+FLAC__StreamDecoderState EasyFLAC__init(EasyFLAC__StreamDecoder *decoder);
+void EasyFLAC__finish(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__flush(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__reset(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__process_single(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__process_until_end_of_metadata(EasyFLAC__StreamDecoder *decoder);
+FLAC__bool EasyFLAC__process_until_end_of_stream(EasyFLAC__StreamDecoder *decoder);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

ogg123/flac_format.c

+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS BEFORE DISTRIBUTING.                     *
+ *                                                                  *
+ * THE Ogg123 SOURCE CODE IS (C) COPYRIGHT 2000-2003                *
+ * by Stan Seibert <volsung@xiph.org> AND OTHER CONTRIBUTORS        *
+ * http://www.xiph.org/                                             *
+ *                                                                  *
+ ********************************************************************
+
+ last mod: $Id: flac_format.c,v 1.1 2003/01/11 22:51:44 volsung Exp $
+
+ ********************************************************************/