From b90a60d7e52ab9518b8555f4e3800a0f14be3954 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Mon, 12 Aug 2002 07:19:59 +0000 Subject: [PATCH] update to match the new process calls --- src/plugin_winamp2/in_flac.c | 4 ++-- src/plugin_winamp3/flacpcm.cpp | 4 ++-- src/plugin_xmms/plugin.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugin_winamp2/in_flac.c b/src/plugin_winamp2/in_flac.c index edbbfe23..a737fe5a 100644 --- a/src/plugin_winamp2/in_flac.c +++ b/src/plugin_winamp2/in_flac.c @@ -450,7 +450,7 @@ DWORD WINAPI __stdcall DecodeThread(void *b) done = 1; break; } - else if(!FLAC__file_decoder_process_one_frame(decoder_)) { + else if(!FLAC__file_decoder_process_single(decoder_)) { MessageBox(mod_.hMainWindow, FLAC__FileDecoderStateString[FLAC__file_decoder_get_state(decoder_)], "READ ERROR processing frame", 0); done = 1; break; @@ -559,7 +559,7 @@ FLAC__bool safe_decoder_init_(const char *filename, FLAC__FileDecoder *decoder) } file_info_.abort_flag = false; - if(!FLAC__file_decoder_process_metadata(decoder)) { + if(!FLAC__file_decoder_process_until_end_of_metadata(decoder)) { MessageBox(mod_.hMainWindow, FLAC__FileDecoderStateString[FLAC__file_decoder_get_state(decoder)], "ERROR processing metadata", 0); return false; } diff --git a/src/plugin_winamp3/flacpcm.cpp b/src/plugin_winamp3/flacpcm.cpp index 88c73b60..916db6a3 100644 --- a/src/plugin_winamp3/flacpcm.cpp +++ b/src/plugin_winamp3/flacpcm.cpp @@ -134,7 +134,7 @@ int FlacPcm::processData(MediaInfo *infos, ChunkList *chunk_list, bool *killswit cleanup(); return 0; } - if(!FLAC__seekable_stream_decoder_process_metadata(decoder)) { + if(!FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder)) { cleanup(); return 0; } @@ -152,7 +152,7 @@ int FlacPcm::processData(MediaInfo *infos, ChunkList *chunk_list, bool *killswit eof = true; break; } - else if(!FLAC__seekable_stream_decoder_process_one_frame(decoder)) { + else if(!FLAC__seekable_stream_decoder_process_single(decoder)) { //@@@ how to do this? MessageBox(mod_.hMainWindow, FLAC__FileDecoderStateString[FLAC__file_decoder_get_state(decoder_)], "READ ERROR processing frame", 0); eof = true; break; diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c index f4e40c8b..0145741f 100644 --- a/src/plugin_xmms/plugin.c +++ b/src/plugin_xmms/plugin.c @@ -280,7 +280,7 @@ void *play_loop_(void *arg) file_info_.eof = true; break; } - else if(!FLAC__file_decoder_process_one_frame(decoder_)) { + else if(!FLAC__file_decoder_process_single(decoder_)) { /*@@@ this should probably be a dialog */ fprintf(stderr, "libxmms-flac: READ ERROR processing frame\n"); file_info_.eof = true; @@ -351,7 +351,7 @@ FLAC__bool safe_decoder_init_(const char *filename, FLAC__FileDecoder *decoder) if(FLAC__file_decoder_init(decoder) != FLAC__FILE_DECODER_OK) return false; - if(!FLAC__file_decoder_process_metadata(decoder)) + if(!FLAC__file_decoder_process_until_end_of_metadata(decoder)) return false; return true;