From d4be38bad90c0cdf619e54109e9aafa716a0bb63 Mon Sep 17 00:00:00 2001 From: cwolf Date: Thu, 18 Oct 2001 17:42:31 +0000 Subject: [PATCH] Get rid of shmmap stuff svn path=/trunk/vorbis/; revision=2162 --- lib/vorbisenc.c | 25 +------------------------ win32/vorbis_dynamic.dsp | 6 +++--- win32/vorbisenc_dynamic.dsp | 4 ++-- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c index 1ec36c9..03c069a 100644 --- a/lib/vorbisenc.c +++ b/lib/vorbisenc.c @@ -11,7 +11,7 @@ ******************************************************************** function: simple programmatic interface for encoder mode setup - last mod: $Id: vorbisenc.c,v 1.17 2001/10/02 00:14:32 segher Exp $ + last mod: $Id: vorbisenc.c,v 1.18 2001/10/18 17:39:34 cwolf Exp $ ********************************************************************/ @@ -29,35 +29,12 @@ #include "os.h" #include "misc.h" -/* - * If this module gets built into a separate shared library - * on win32 (DLL), then the backend mappings from registry.c - * need to be referenced from a file-mapped shared memory segment. - */ -#if defined(_MSC_VER) && defined(STANDALONE_VORBISENC_DLL) -# include "shmmap.h" - - SHARED_MAP *g_shared_map; - -# define _time_P g_shared_map->p_time_P -# define _floor_P g_shared_map->p_floor_P -# define _residue_P g_shared_map->p_residue_P -# define _mapping_P g_shared_map->p_mapping_P -#endif - /* deepcopy all but the codebooks; in this usage, they're static (don't copy as they could be big) */ static void codec_setup_partialcopy(codec_setup_info *ci, codec_setup_info *cs){ int i; -#if defined(_MSC_VER) && defined(STANDALONE_VORBISENC_DLL) - int maplen; - - if ((g_shared_map = table_map2mem(&maplen)) == (SHARED_MAP*)0) - ; /* some error handling for memory exhaustion */ -#endif - memcpy(ci,cs,sizeof(*ci)); /* to get the flat numbers */ /* codebooks */ diff --git a/win32/vorbis_dynamic.dsp b/win32/vorbis_dynamic.dsp index e2acf4d..cbf9fcd 100644 --- a/win32/vorbis_dynamic.dsp +++ b/win32/vorbis_dynamic.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /D "STANDALONE_VORBISENC_DLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /D "STANDALONE_VORBISENC_DLL" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -152,7 +152,7 @@ SOURCE=..\lib\registry.c !ELSEIF "$(CFG)" == "vorbis_dynamic - Win32 Debug" -# ADD CPP /I "..\include" /I "..\src" +# ADD CPP /I "..\src" !ENDIF diff --git a/win32/vorbisenc_dynamic.dsp b/win32/vorbisenc_dynamic.dsp index 2ce5248..22124aa 100644 --- a/win32/vorbisenc_dynamic.dsp +++ b/win32/vorbisenc_dynamic.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STANDALONE_VORBISENC_DLL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_IMPORT" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STANDALONE_VORBISENC_DLL" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /I "..\win32\src" /I "..\..\vorbis\lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_IMPORT" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -- 2.7.4