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

msvc fixes

Browse Source
This commit is contained in:
Josh Coalson
2007-09-12 03:01:17 +00:00
parent 9fbcdcd1a9
commit 6d6afdce3e
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/c/decode/file/main.c
View File

@@ -128,11 +128,11 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder
fwrite("WAVEfmt ", 1, 8, f) < 8 || fwrite("WAVEfmt ", 1, 8, f) < 8 ||
!write_little_endian_uint32(f, 16) || !write_little_endian_uint32(f, 16) ||
!write_little_endian_uint16(f, 1) || !write_little_endian_uint16(f, 1) ||
!write_little_endian_uint16(f, channels) || !write_little_endian_uint16(f, (FLAC__uint16)channels) ||
!write_little_endian_uint32(f, sample_rate) || !write_little_endian_uint32(f, sample_rate) ||
!write_little_endian_uint32(f, sample_rate * channels * (bps/8)) || !write_little_endian_uint32(f, sample_rate * channels * (bps/8)) ||
!write_little_endian_uint16(f, channels * (bps/8)) || /* block align */ !write_little_endian_uint16(f, (FLAC__uint16)(channels * (bps/8))) || /* block align */
!write_little_endian_uint16(f, bps) || !write_little_endian_uint16(f, (FLAC__uint16)bps) ||
fwrite("data", 1, 4, f) < 4 || fwrite("data", 1, 4, f) < 4 ||
!write_little_endian_uint32(f, total_size) !write_little_endian_uint32(f, total_size)
) { ) {
@@ -144,8 +144,8 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder
/* write decoded PCM samples */ /* write decoded PCM samples */
for(i = 0; i < frame->header.blocksize; i++) { for(i = 0; i < frame->header.blocksize; i++) {
if( if(
!write_little_endian_int16(f, buffer[0][i]) || /* left channel */ !write_little_endian_int16(f, (FLAC__int16)buffer[0][i]) || /* left channel */
!write_little_endian_int16(f, buffer[1][i]) /* right channel */ !write_little_endian_int16(f, (FLAC__int16)buffer[1][i]) /* right channel */
) { ) {
fprintf(stderr, "ERROR: write error\n"); fprintf(stderr, "ERROR: write error\n");
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;

17
src/utils/flacdiff/main.cpp
View File

@@ -23,12 +23,17 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "FLAC++/decoder.h" #include "FLAC++/decoder.h"
#if defined _MSC_VER || defined __MINGW32__ #if defined _MSC_VER || defined __MINGW32__
#if _MSC_VER <= 1600 /* @@@ [2G limit] */ #if _MSC_VER <= 1600 /* @@@ [2G limit] */
#define fseeko fseek #define fseeko fseek
#define ftello ftell #define ftello ftell
#endif #endif
#endif #endif
#ifdef _MSC_VER
// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
#pragma warning ( disable : 4800 )
#endif
class AutoFILE { class AutoFILE {
protected: protected: