diff options
author | Dave Chapman <dave@dchapman.com> | 2005-02-19 11:58:42 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-02-19 11:58:42 +0000 |
commit | 52e43cb6e164627993dc1ef4edc0eeb0bd7f21dd (patch) | |
tree | 4f8b08fd31701c49205dbb59daefe6aa61476567 /apps/codecs/Tremor/vorbisfile.c | |
parent | 8243127dc4986bbd3225cb090fcc0c290fb87937 (diff) | |
download | rockbox-52e43cb6e164627993dc1ef4edc0eeb0bd7f21dd.tar.gz rockbox-52e43cb6e164627993dc1ef4edc0eeb0bd7f21dd.zip |
Cosmetic changes to remove compiler warnings and compile cleanly under Rockbox
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6015 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/Tremor/vorbisfile.c')
-rw-r--r-- | apps/codecs/Tremor/vorbisfile.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index 7448b1ed1d..7b9913b881 100644 --- a/apps/codecs/Tremor/vorbisfile.c +++ b/apps/codecs/Tremor/vorbisfile.c | |||
@@ -657,10 +657,12 @@ static int _fetch_and_process_packet(OggVorbis_File *vf, | |||
657 | 657 | ||
658 | /* if, eg, 64 bit stdio is configured by default, this will build with | 658 | /* if, eg, 64 bit stdio is configured by default, this will build with |
659 | fseek64 */ | 659 | fseek64 */ |
660 | #if 0 | ||
660 | static int _fseek64_wrap(FILE *f,ogg_int64_t off,int whence){ | 661 | static int _fseek64_wrap(FILE *f,ogg_int64_t off,int whence){ |
661 | if(f==NULL)return(-1); | 662 | if(f==NULL)return(-1); |
662 | return fseek(f,off,whence); | 663 | return fseek(f,off,whence); |
663 | } | 664 | } |
665 | #endif | ||
664 | 666 | ||
665 | static int _ov_open1(void *f,OggVorbis_File *vf,char *initial, | 667 | static int _ov_open1(void *f,OggVorbis_File *vf,char *initial, |
666 | long ibytes, ov_callbacks callbacks){ | 668 | long ibytes, ov_callbacks callbacks){ |
@@ -764,6 +766,7 @@ int ov_open_callbacks(void *f,OggVorbis_File *vf,char *initial,long ibytes, | |||
764 | return _ov_open2(vf); | 766 | return _ov_open2(vf); |
765 | } | 767 | } |
766 | 768 | ||
769 | #if 0 | ||
767 | int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ | 770 | int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ |
768 | ov_callbacks callbacks = { | 771 | ov_callbacks callbacks = { |
769 | (size_t (*)(void *, size_t, size_t, void *)) fread, | 772 | (size_t (*)(void *, size_t, size_t, void *)) fread, |
@@ -774,6 +777,7 @@ int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ | |||
774 | 777 | ||
775 | return ov_open_callbacks((void *)f, vf, initial, ibytes, callbacks); | 778 | return ov_open_callbacks((void *)f, vf, initial, ibytes, callbacks); |
776 | } | 779 | } |
780 | #endif | ||
777 | 781 | ||
778 | /* Only partially open the vorbis file; test for Vorbisness, and load | 782 | /* Only partially open the vorbis file; test for Vorbisness, and load |
779 | the headers for the first chain. Do not seek (although test for | 783 | the headers for the first chain. Do not seek (although test for |
@@ -786,6 +790,7 @@ int ov_test_callbacks(void *f,OggVorbis_File *vf,char *initial,long ibytes, | |||
786 | return _ov_open1(f,vf,initial,ibytes,callbacks); | 790 | return _ov_open1(f,vf,initial,ibytes,callbacks); |
787 | } | 791 | } |
788 | 792 | ||
793 | #if 0 | ||
789 | int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ | 794 | int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ |
790 | ov_callbacks callbacks = { | 795 | ov_callbacks callbacks = { |
791 | (size_t (*)(void *, size_t, size_t, void *)) fread, | 796 | (size_t (*)(void *, size_t, size_t, void *)) fread, |
@@ -796,6 +801,7 @@ int ov_test(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){ | |||
796 | 801 | ||
797 | return ov_test_callbacks((void *)f, vf, initial, ibytes, callbacks); | 802 | return ov_test_callbacks((void *)f, vf, initial, ibytes, callbacks); |
798 | } | 803 | } |
804 | #endif | ||
799 | 805 | ||
800 | int ov_test_open(OggVorbis_File *vf){ | 806 | int ov_test_open(OggVorbis_File *vf){ |
801 | if(vf->ready_state!=PARTOPEN)return(OV_EINVAL); | 807 | if(vf->ready_state!=PARTOPEN)return(OV_EINVAL); |
@@ -988,7 +994,7 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos){ | |||
988 | int lastblock=0; | 994 | int lastblock=0; |
989 | int accblock=0; | 995 | int accblock=0; |
990 | int thisblock; | 996 | int thisblock; |
991 | int eosflag; | 997 | int eosflag=0; |
992 | 998 | ||
993 | work_os=ogg_stream_create(vf->current_serialno); /* get the memory ready */ | 999 | work_os=ogg_stream_create(vf->current_serialno); /* get the memory ready */ |
994 | while(1){ | 1000 | while(1){ |