[xine-cvs] CVS: xine-lib/src/demuxers demux_flac.c,1.5,1.6

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15373/src/demuxers

Modified Files:
	demux_flac.c 
Log Message:
Build system improvements:
 - use replacement functions (macro AC_REPLACE_FUNCS and variable LTLIBOBJS),
   each function is in a file placed into lib/ directory, 
   it was not necessary, but it looks nice, IMHO
 - headers cleanups (this was needed):
     - prototypes of replacement funtions and macros are placed
       into separate os_internal.h (and included by config.h)
     - drop include inttypes.h from public xine.h, replaced by custom
       os_type.h, idea origins from Ogg/Vorbis public headers
     - disable generating inttypes.h: generated replacement isn't enough for 
       xine-lib but nobody complained (and for M$VC we have special version)
     - better including headers for win32, let dvdnav use its mutex wrapper
 - updated M$VC port

Result:
  - xine is compiled nicely by MinGW, CygWin and paritaly M$VC
  - frontends in M$VC port don't require additional helping headers
  - moved some platform specific things from xine-utils and win32/contrib
    to lib/

Finally I can start with real coding. :-) 



Index: demux_flac.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_flac.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_flac.c	9 Jul 2004 13:16:59 -0000	1.5
+++ demux_flac.c	20 Sep 2004 19:30:04 -0000	1.6
@@ -142,7 +142,7 @@
       flac->channels = ((flac->sample_rate >> 9) & 0x07) + 1;
       flac->bits_per_sample = ((flac->sample_rate >> 4) & 0x1F) + 1;
       flac->sample_rate >>= 12;
-      flac->total_samples = BE_64(&streaminfo[10]) & 0x0FFFFFFFFFLL;  /* 36 bits */
+      flac->total_samples = BE_64(&streaminfo[10]) & UINT64_C(0x0FFFFFFFFF);  /* 36 bits */
       lprintf ("%d Hz, %d bits, %d channels, %lld total samples\n", 
         flac->sample_rate, flac->bits_per_sample, 
         flac->channels, flac->total_samples);