Commit b90a60d7 authored by Josh Coalson's avatar Josh Coalson
Browse files

update to match the new process calls

parent 338e9d01
......@@ -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;
}
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment