update to match the new process calls
authorJosh Coalson <jcoalson@users.sourceforce.net>
Mon, 12 Aug 2002 07:19:59 +0000 (07:19 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Mon, 12 Aug 2002 07:19:59 +0000 (07:19 +0000)
src/plugin_winamp2/in_flac.c
src/plugin_winamp3/flacpcm.cpp
src/plugin_xmms/plugin.c

index edbbfe2..a737fe5 100644 (file)
@@ -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;
        }
index 88c73b6..916db6a 100644 (file)
@@ -134,7 +134,7 @@ int FlacPcm::processData(MediaInfo *infos, ChunkList *chunk_list, bool *killswit
                        cleanup();\r
                        return 0;\r
                }\r
-               if(!FLAC__seekable_stream_decoder_process_metadata(decoder)) {\r
+               if(!FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder)) {\r
                        cleanup();\r
                        return 0;\r
                }\r
@@ -152,7 +152,7 @@ int FlacPcm::processData(MediaInfo *infos, ChunkList *chunk_list, bool *killswit
                        eof = true;\r
                        break;\r
                }\r
-               else if(!FLAC__seekable_stream_decoder_process_one_frame(decoder)) {\r
+               else if(!FLAC__seekable_stream_decoder_process_single(decoder)) {\r
                        //@@@ how to do this?  MessageBox(mod_.hMainWindow, FLAC__FileDecoderStateString[FLAC__file_decoder_get_state(decoder_)], "READ ERROR processing frame", 0);\r
                        eof = true;\r
                        break;\r
index f4e40c8..0145741 100644 (file)
@@ -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;