[xiph-cvs] cvs commit: Tremor Makefile.am misc.h vorbisfile.c

[Monty]

xiphmont    03/03/30 18:40:57

  Modified:    .        Makefile.am misc.h vorbisfile.c
  Log:
  Fix several minor bits of merge weirdness spotted by slothead.

Revision  Changes    Path
1.8       +1 -1      Tremor/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Tremor/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am	29 Mar 2003 03:07:21 -0000	1.7
+++ Makefile.am	30 Mar 2003 23:40:56 -0000	1.8
@@ -4,7 +4,7 @@
 
 lib_LTLIBRARIES = libvorbisidec.la
 
-libvorbisidec_la_SOURCES = mdct.c block.c window.c misc.c\
+libvorbisidec_la_SOURCES = mdct.c block.c window.c \
                         synthesis.c info.c \
                         floor1.c floor0.c vorbisfile.c \
                         res012.c mapping0.c registry.c codebook.c \

<p><p>1.8       +0 -20     Tremor/misc.h

Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/Tremor/misc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- misc.h	29 Mar 2003 03:07:21 -0000	1.7
+++ misc.h	30 Mar 2003 23:40:56 -0000	1.8
@@ -20,26 +20,6 @@
 #include "ivorbiscodec.h"
 #include "os_types.h"
 
-//#define _VDBG_GRAPHFILE "_0.m"
-extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line); 
-extern void _VDBG_free(void *ptr,char *file,long line); 
-
-#undef _ogg_malloc
-#undef _ogg_calloc
-#undef _ogg_realloc
-#undef _ogg_free
-
-#define _ogg_malloc(x) _VDBG_malloc(NULL,(x),__FILE__,__LINE__)
-#define _ogg_calloc(x,y) _VDBG_malloc(NULL,(x)*(y),__FILE__,__LINE__)
-#define _ogg_realloc(x,y) _VDBG_malloc((x),(y),__FILE__,__LINE__)
-#define _ogg_free(x) _VDBG_free((x),__FILE__,__LINE__)
-
-
-extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
-extern void _vorbis_block_ripcord(vorbis_block *vb);
-extern void _analysis_output(char *base,int i,ogg_int32_t *v,int point,
-			     int n,int bark,int dB);
-
 #include "asm_arm.h"
   
 #ifndef _V_WIDE_MATH

<p><p>1.6       +3 -3      Tremor/vorbisfile.c

Index: vorbisfile.c
===================================================================
RCS file: /usr/local/cvsroot/Tremor/vorbisfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vorbisfile.c	29 Mar 2003 03:07:21 -0000	1.5
+++ vorbisfile.c	30 Mar 2003 23:40:56 -0000	1.6
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.c,v 1.5 2003/03/29 03:07:21 xiphmont Exp $
+ last mod: $Id: vorbisfile.c,v 1.6 2003/03/30 23:40:56 xiphmont Exp $
 
  ********************************************************************/
 
@@ -936,7 +936,7 @@
       acc+=ov_time_total(vf,i);
     return(acc);
   }else{
-    return(((ogg_int64_t)vf->pcmlengths[i])*1000/vf->vi[i].rate);
+    return(((ogg_int64_t)vf->pcmlengths[i*2+1])*1000/vf->vi[i].rate);
   }
 }
 
@@ -1446,7 +1446,7 @@
 ogg_int64_t ov_time_tell(OggVorbis_File *vf){
   int link=0;
   ogg_int64_t pcm_total=0;
-  ogg_int64_t time_total=0.f;
+  ogg_int64_t time_total=0;
   
   if(vf->ready_state<OPENED)return(OV_EINVAL);
   if(vf->seekable){

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.