X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fregistry.c;h=eba9037895e1c260b09e68fb1186693b5706c3e5;hb=b57f18e9f8c99670ce2d3625cd8e164f30722251;hp=f1d7b4eb5abe0f6d99b6e951a618e8e754577f55;hpb=63bb426cb18452a6576d67abbaaa859df28d41b9;p=platform%2Fupstream%2Flibvorbis.git diff --git a/lib/registry.c b/lib/registry.c index f1d7b4e..eba9037 100644 --- a/lib/registry.c +++ b/lib/registry.c @@ -5,56 +5,41 @@ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 * + * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: registry for time, floor, res backends and channel mappings - last mod: $Id: registry.c,v 1.13 2001/12/20 01:00:29 segher Exp $ + last mod: $Id$ ********************************************************************/ #include "vorbis/codec.h" #include "codec_internal.h" #include "registry.h" -#include "registry-api.h" #include "misc.h" - - /* seems like major overkill now; the backend numbers will grow into the infrastructure soon enough */ -extern vorbis_func_time time0_exportbundle; -extern vorbis_func_floor floor0_exportbundle; -extern vorbis_func_floor floor1_exportbundle; -extern vorbis_func_residue residue0_exportbundle; -extern vorbis_func_residue residue1_exportbundle; -extern vorbis_func_residue residue2_exportbundle; -extern vorbis_func_mapping mapping0_exportbundle; - -vorbis_func_time *_time_P[]={ - &time0_exportbundle, -}; +extern const vorbis_func_floor floor0_exportbundle; +extern const vorbis_func_floor floor1_exportbundle; +extern const vorbis_func_residue residue0_exportbundle; +extern const vorbis_func_residue residue1_exportbundle; +extern const vorbis_func_residue residue2_exportbundle; +extern const vorbis_func_mapping mapping0_exportbundle; -vorbis_func_floor *_floor_P[]={ +const vorbis_func_floor *const _floor_P[]={ &floor0_exportbundle, &floor1_exportbundle, }; -vorbis_func_residue *_residue_P[]={ +const vorbis_func_residue *const _residue_P[]={ &residue0_exportbundle, &residue1_exportbundle, &residue2_exportbundle, }; -vorbis_func_mapping *_mapping_P[]={ +const vorbis_func_mapping *const _mapping_P[]={ &mapping0_exportbundle, }; - -/* make Windows happy; can't access the registry directly outside of - libvorbis, and vorbisenc needs a few functions */ -void residue_free_info(vorbis_info_residue *r,int type){ - _residue_P[type]->free_info(r); -} -