X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/3fbdc96d45fbf2abcc93ed2e8ad206bc540be92b..4778e04402e59a57185c5bc111c45836e247d1c3:/server/decode.c
diff --git a/server/decode.c b/server/decode.c
index 36d98ca..0c8893c 100644
--- a/server/decode.c
+++ b/server/decode.c
@@ -1,40 +1,28 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007-2009 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file server/decode.c
* @brief General-purpose decoder for use by speaker process
*/
-#include
-#include "types.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "disorder-server.h"
+
#include
#include
-#include
/* libFLAC has had an API change and stupidly taken away the old API */
#if HAVE_FLAC_FILE_DECODER_H
@@ -45,12 +33,9 @@
#define FLAC__FileDecoderState FLAC__StreamDecoderState
#endif
-#include "log.h"
-#include "syscalls.h"
-#include "defs.h"
#include "wav.h"
#include "speaker-protocol.h"
-#include "version.h"
+
/** @brief Encoding lookup table type */
struct decoder {
@@ -402,13 +387,20 @@ static void decode_flac(void) {
fatal(0, "FLAC__file_decoder_init: %s", FLAC__FileDecoderStateString[fs]);
FLAC__file_decoder_process_until_end_of_file(fd);
#else
- FLAC__StreamDecoder *sd = 0;
+ FLAC__StreamDecoder *sd = FLAC__stream_decoder_new();
FLAC__StreamDecoderInitStatus is;
+ if (!sd)
+ fatal(0, "FLAC__stream_decoder_new failed");
+
if((is = FLAC__stream_decoder_init_file(sd, path, flac_write, flac_metadata,
flac_error, 0)))
fatal(0, "FLAC__stream_decoder_init_file %s: %s",
path, FLAC__StreamDecoderInitStatusString[is]);
+
+ FLAC__stream_decoder_process_until_end_of_stream(sd);
+ FLAC__stream_decoder_finish(sd);
+ FLAC__stream_decoder_delete(sd);
#endif
}