revamp MSVC build system, separate dynamic and static builds, separate debug and release intermediate directories

This commit is contained in:
Josh Coalson
2002-11-21 09:00:25 +00:00
parent 48404ff9c3
commit bfc8e319c2
76 changed files with 2169 additions and 449 deletions

View File

@@ -40,7 +40,8 @@ m4data_DATA = libFLAC.m4
EXTRA_DIST = \
Makefile.lite \
Makefile.vc \
libFLAC.dsp \
libFLAC_dynamic.dsp \
libFLAC_static.dsp \
libFLAC.m4
# see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention

View File

@@ -1,24 +1,24 @@
# Microsoft Developer Studio Project File - Name="libFLAC" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="libFLAC_dynamic" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=libFLAC - Win32 Debug
CFG=libFLAC_dynamic - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libFLAC.mak".
!MESSAGE NMAKE /f "libFLAC_dynamic.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libFLAC.mak" CFG="libFLAC - Win32 Debug"
!MESSAGE NMAKE /f "libFLAC_dynamic.mak" CFG="libFLAC_dynamic - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libFLAC - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libFLAC - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libFLAC_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "libFLAC_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "libFLAC - Win32 Release"
!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\obj\lib"
# PROP Intermediate_Dir "Release"
# PROP Output_Dir "..\..\obj\release\lib"
# PROP Intermediate_Dir "Release_dynamic"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -53,9 +53,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\bin/libFLAC.dll"
# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll"
!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug"
!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -64,12 +64,12 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\obj\lib"
# PROP Intermediate_Dir "Debug"
# PROP Output_Dir "..\..\obj\debug\lib"
# PROP Intermediate_Dir "Debug_dynamic"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "_CHATTER" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.0.4\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,17 +79,17 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\bin/libFLAC.dll" /pdbtype:sept
# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept
!ENDIF
# Begin Target
# Name "libFLAC - Win32 Release"
# Name "libFLAC - Win32 Debug"
# Name "libFLAC_dynamic - Win32 Release"
# Name "libFLAC_dynamic - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp"
# PROP Default_Filter "c"
# Begin Group "Assembly Files (ia32)"
# PROP Default_Filter ""
@@ -97,7 +97,7 @@ LINK32=link.exe
SOURCE=.\ia32\cpu_asm.nasm
!IF "$(CFG)" == "libFLAC - Win32 Release"
!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release"
USERDEP__CPU_A="ia32/cpu_asm.nasm"
# Begin Custom Build
@@ -108,7 +108,7 @@ InputPath=.\ia32\cpu_asm.nasm
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug"
!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
USERDEP__CPU_A="ia32/cpu_asm.nasm"
# Begin Custom Build
@@ -126,7 +126,7 @@ InputPath=.\ia32\cpu_asm.nasm
SOURCE=.\ia32\fixed_asm.nasm
!IF "$(CFG)" == "libFLAC - Win32 Release"
!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release"
USERDEP__FIXED="ia32/fixed_asm.nasm"
# Begin Custom Build
@@ -137,7 +137,7 @@ InputPath=.\ia32\fixed_asm.nasm
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug"
!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
USERDEP__FIXED="ia32/fixed_asm.nasm"
# Begin Custom Build
@@ -155,7 +155,7 @@ InputPath=.\ia32\fixed_asm.nasm
SOURCE=.\ia32\lpc_asm.nasm
!IF "$(CFG)" == "libFLAC - Win32 Release"
!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release"
USERDEP__LPC_A="ia32/lpc_asm.nasm"
# Begin Custom Build
@@ -166,7 +166,7 @@ InputPath=.\ia32\lpc_asm.nasm
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug"
!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
USERDEP__LPC_A="ia32/lpc_asm.nasm"
# Begin Custom Build
@@ -377,7 +377,7 @@ SOURCE=..\..\include\FLAC\metadata.h
SOURCE=..\..\include\FLAC\ordinals.h.in
!IF "$(CFG)" == "libFLAC - Win32 Release"
!IF "$(CFG)" == "libFLAC_dynamic - Win32 Release"
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
@@ -389,7 +389,7 @@ InputPath=..\..\include\FLAC\ordinals.h.in
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC - Win32 Debug"
!ELSEIF "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build

View File

@@ -0,0 +1,418 @@
# Microsoft Developer Studio Project File - Name="libFLAC_static" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libFLAC_static - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libFLAC_static.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libFLAC_static.mak" CFG="libFLAC_static - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libFLAC_static - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libFLAC_static - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "libFLAC"
# PROP Scc_LocalPath "..\.."
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libFLAC_static - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\obj\release\lib"
# PROP Intermediate_Dir "Release_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I ".\include" /I "..\..\include" /D VERSION=\"1.0.4\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\release\lib/libFLAC_static.lib"
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\obj\debug\lib"
# PROP Intermediate_Dir "Debug_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.0.4\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\debug\lib/libFLAC_static.lib"
!ENDIF
# Begin Target
# Name "libFLAC_static - Win32 Release"
# Name "libFLAC_static - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "c"
# Begin Group "Assembly Files (ia32)"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\ia32\cpu_asm.nasm
!IF "$(CFG)" == "libFLAC_static - Win32 Release"
USERDEP__CPU_A="ia32/cpu_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\cpu_asm.nasm
"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
USERDEP__CPU_A="ia32/cpu_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\cpu_asm.nasm
"ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ia32\fixed_asm.nasm
!IF "$(CFG)" == "libFLAC_static - Win32 Release"
USERDEP__FIXED="ia32/fixed_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\fixed_asm.nasm
"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
USERDEP__FIXED="ia32/fixed_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\fixed_asm.nasm
"ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ia32\lpc_asm.nasm
!IF "$(CFG)" == "libFLAC_static - Win32 Release"
USERDEP__LPC_A="ia32/lpc_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\lpc_asm.nasm
"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
USERDEP__LPC_A="ia32/lpc_asm.nasm"
# Begin Custom Build
InputPath=.\ia32\lpc_asm.nasm
"ia32/lpc_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
%FLAC_NASM% -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ia32\nasm.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\bitbuffer.c
# End Source File
# Begin Source File
SOURCE=.\bitmath.c
# End Source File
# Begin Source File
SOURCE=.\cpu.c
# End Source File
# Begin Source File
SOURCE=.\crc.c
# End Source File
# Begin Source File
SOURCE=.\file_decoder.c
# End Source File
# Begin Source File
SOURCE=.\file_encoder.c
# End Source File
# Begin Source File
SOURCE=.\fixed.c
# End Source File
# Begin Source File
SOURCE=.\format.c
# End Source File
# Begin Source File
SOURCE=.\lpc.c
# End Source File
# Begin Source File
SOURCE=.\md5.c
# End Source File
# Begin Source File
SOURCE=.\memory.c
# End Source File
# Begin Source File
SOURCE=.\metadata_iterators.c
# End Source File
# Begin Source File
SOURCE=.\metadata_object.c
# End Source File
# Begin Source File
SOURCE=.\seekable_stream_decoder.c
# End Source File
# Begin Source File
SOURCE=.\seekable_stream_encoder.c
# End Source File
# Begin Source File
SOURCE=.\stream_decoder.c
# End Source File
# Begin Source File
SOURCE=.\stream_encoder.c
# End Source File
# Begin Source File
SOURCE=.\stream_encoder_framing.c
# End Source File
# End Group
# Begin Group "Private Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\include\private\all.h
# End Source File
# Begin Source File
SOURCE=.\include\private\bitbuffer.h
# End Source File
# Begin Source File
SOURCE=.\include\private\bitmath.h
# End Source File
# Begin Source File
SOURCE=.\include\private\cpu.h
# End Source File
# Begin Source File
SOURCE=.\include\private\crc.h
# End Source File
# Begin Source File
SOURCE=.\include\private\fixed.h
# End Source File
# Begin Source File
SOURCE=.\include\private\format.h
# End Source File
# Begin Source File
SOURCE=.\include\private\lpc.h
# End Source File
# Begin Source File
SOURCE=.\include\private\md5.h
# End Source File
# Begin Source File
SOURCE=.\include\private\memory.h
# End Source File
# Begin Source File
SOURCE=.\include\private\metadata.h
# End Source File
# Begin Source File
SOURCE=.\include\private\stream_encoder_framing.h
# End Source File
# End Group
# Begin Group "Protected Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\include\protected\all.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\file_decoder.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\file_encoder.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\seekable_stream_decoder.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\seekable_stream_encoder.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\stream_decoder.h
# End Source File
# Begin Source File
SOURCE=.\include\protected\stream_encoder.h
# End Source File
# End Group
# Begin Group "Public Header Files"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\FLAC\all.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\assert.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\export.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\file_decoder.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\file_encoder.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\format.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\metadata.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\ordinals.h.in
!IF "$(CFG)" == "libFLAC_static - Win32 Release"
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h
# End Custom Build
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy $(InputDir)\ordinals.h.in $(InputDir)\ordinals.h
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\seekable_stream_decoder.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\seekable_stream_encoder.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\stream_decoder.h
# End Source File
# Begin Source File
SOURCE=..\..\include\FLAC\stream_encoder.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1607,9 +1607,11 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_(FILE *fil
{
unsigned i, len;
FLAC__Metadata_SimpleIteratorStatus status;
FLAC__byte buffer[max(sizeof(FLAC__uint64), FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN/8)]; /* the largest object we'll read in one shot */
FLAC__byte buffer[1024]; /* MSVC needs a constant expression so we put a magic number and assert */
FLAC__ASSERT(0 != file);
FLAC__ASSERT(FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN/8 <= sizeof(buffer));
FLAC__ASSERT(sizeof(FLAC__uint64) <= sizeof(buffer));
FLAC__ASSERT(FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN % 8 == 0);
len = FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN / 8;

View File

@@ -1129,7 +1129,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC
{
FLAC__StreamMetadata_CueSheet_Index index;
memset(&index, 0, sizeof(index));
return FLAC__metadata_object_cuesheet_track_index_index(object, track_num, index_num, &index);
return FLAC__metadata_object_cuesheet_track_insert_index(object, track_num, index_num, index);
}
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)