claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where output resolution was being determined before it was read from the FLAC file

Browse Source
This commit is contained in:
Josh Coalson
2002-09-05 06:58:31 +00:00
parent a70b3b68fc
commit 9a30d66376
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugin_winamp2/in_flac.c
View File

@@ -143,11 +143,7 @@ int play(char *fn)
int maxlatency;
int thread_id;
HANDLE input_file = INVALID_HANDLE_VALUE;
#ifdef FLAC__DO_DITHER
const unsigned output_bits_per_sample = min(file_info_.bits_per_sample, 16);
#else
const unsigned output_bits_per_sample = file_info_.bits_per_sample;
#endif
unsigned output_bits_per_sample;
if(0 == decoder_) {
return 1;
@@ -163,6 +159,12 @@ int play(char *fn)
return 1;
}
#ifdef FLAC__DO_DITHER
output_bits_per_sample = min(file_info_.bits_per_sample, 16);
#else
output_bits_per_sample = file_info_.bits_per_sample;
#endif
strcpy(lastfn_, fn);
paused_ = 0;
decode_pos_ms_ = 0;

3
src/plugin_xmms/plugin.c
View File

@@ -160,7 +160,6 @@ void FLAC_XMMS__play_file(char *filename)
{
FILE *f;
gchar *ret;
const AFormat output_format = file_info_.sample_format;
wide_samples_in_reservoir_ = 0;
audio_error_ = false;
@@ -181,7 +180,7 @@ void FLAC_XMMS__play_file(char *filename)
file_info_.is_playing = true;
if(flac_ip.output->open_audio(output_format, file_info_.sample_rate, file_info_.channels) == 0) {
if(flac_ip.output->open_audio(file_info_.sample_format, file_info_.sample_rate, file_info_.channels) == 0) {
audio_error_ = true;
safe_decoder_finish_(decoder_);
return;