1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00

Introduce end-of-line normalization

Ensures that all files that Git considers to be text will have
normalized (LF) line endings in the repository. When core.eol is set to
native (which is the default), Git will convert the line endings of
normalized files in your working directory back to your platform's
native line ending.

See also https://git-scm.com/docs/gitattributes
This commit is contained in:
Benjamin Drung
2016-05-16 21:31:38 +02:00
parent 8d360fe5f3
commit 787f2afd10
535 changed files with 107946 additions and 107944 deletions

View File

@@ -1,107 +1,107 @@
# Linux makefile for scorealign
# please use either make -f Makfile.linux
# -OR- ln -s Makfile.linux Makefile
# profile = -pg
profile =
DEBUGFLAGS =
optimize = -g $(DEBUGFLAGS) $(profile)
# optimize = -O
#PORTSMF LIBRARY PATH:
# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
# (if you do not have this directory, look for portsmf in the portmedia project
# on sourceforge)
PORTSMF = ../portsmf
INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
#OPTIONS FOR LINUX:
c_opts = $(optimize) -DLINUX $(INCLUDES)
cc = gcc $(c_opts)
c++ = g++ $(c_opts)
cclink = gcc
c++link = g++
syslibs = -lm
scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o \
snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o \
snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o \
fft3/FFT.o $(PORTSMF)/mfmidi.o $(PORTSMF)/allegro.o \
$(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o \
$(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o \
regression.o sautils.o curvefit.o hillclimb.o
.SUFFIXES: .cpp .c .h .aur .o
.cpp.o:
$(c++) -c $< -o $*.o
.c.o:
$(cc) -c $< -o $*.o
all: scorealign
header:
echo "**********************************************************"
echo "**********************************************************"
clean:
echo "removing objects"
find . -name "*~" | xargs rm -f
rm -f $(scorealign_o)
rm -f core*
cleaner: clean
rm -f TAGS
cleanest: cleaner
rm -f scorealign
rm -f scorealign.ncb
rm -f scorealign.opt
rm -f scorealign.plg
TAGS:
find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
tags: TAGS
backup: cleanest
tar cvf ../scorealign.tar .
gzip ../scorealign.tar
echo "please rename ../scorealign.tar.gz"
scorealign: $(scorealign_o)
$(c++link) $(scorealign_o) -o scorealign $(syslibs)
test0:
./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
test:
./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
bigtest:
./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
bigtest2:
./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
# DEPENDENCIES
# Linux makefile for scorealign
# please use either make -f Makfile.linux
# -OR- ln -s Makfile.linux Makefile
# profile = -pg
profile =
DEBUGFLAGS =
optimize = -g $(DEBUGFLAGS) $(profile)
# optimize = -O
#PORTSMF LIBRARY PATH:
# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
# (if you do not have this directory, look for portsmf in the portmedia project
# on sourceforge)
PORTSMF = ../portsmf
INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
#OPTIONS FOR LINUX:
c_opts = $(optimize) -DLINUX $(INCLUDES)
cc = gcc $(c_opts)
c++ = g++ $(c_opts)
cclink = gcc
c++link = g++
syslibs = -lm
scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o \
snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o \
snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o \
fft3/FFT.o $(PORTSMF)/mfmidi.o $(PORTSMF)/allegro.o \
$(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o \
$(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o \
regression.o sautils.o curvefit.o hillclimb.o
.SUFFIXES: .cpp .c .h .aur .o
.cpp.o:
$(c++) -c $< -o $*.o
.c.o:
$(cc) -c $< -o $*.o
all: scorealign
header:
echo "**********************************************************"
echo "**********************************************************"
clean:
echo "removing objects"
find . -name "*~" | xargs rm -f
rm -f $(scorealign_o)
rm -f core*
cleaner: clean
rm -f TAGS
cleanest: cleaner
rm -f scorealign
rm -f scorealign.ncb
rm -f scorealign.opt
rm -f scorealign.plg
TAGS:
find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
tags: TAGS
backup: cleanest
tar cvf ../scorealign.tar .
gzip ../scorealign.tar
echo "please rename ../scorealign.tar.gz"
scorealign: $(scorealign_o)
$(c++link) $(scorealign_o) -o scorealign $(syslibs)
test0:
./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
test:
./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
bigtest:
./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
bigtest2:
./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
# DEPENDENCIES

View File

@@ -1,100 +1,100 @@
# OS X Makefile for scorealign
# NOTE: This is out of date. See the score-align.vcproj -OR- Makefile.linux
# profile = -pg
profile =
DEBUGFLAGS =
#optimize = -g $(DEBUGFLAGS) $(profile)
optimize = -O
#PORTSMF LIBRARY PATH:
# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
# (if you do not have this directory, look for portsmf in the portmedia project
# on sourceforge)
PORTSMF = ../portsmf
INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
#OPTIONS FOR LINUX:
c_opts = $(optimize) -DLINUX $(INCLUDES)
cc = gcc $(c_opts)
c++ = g++ $(c_opts)
cclink = gcc
c++link = g++
syslibs = -lm
scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o fft3/FFT.o mfmidi.o $(PORTSMF)/allegro.o $(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o $(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o regression.o
.SUFFIXES: .cpp .c .h .aur .o
.cpp.o:
$(c++) -c $< -o $*.o
.c.o:
$(cc) -c $< -o $*.o
all: scorealign
header:
echo "**********************************************************"
echo "**********************************************************"
clean:
echo "removing objects"
find . -name "*~" | xargs rm -f
rm -f $(scorealign_o)
rm -f core*
cleaner: clean
rm -f TAGS
cleanest: cleaner
rm -f scorealign
rm -f scorealign.ncb
rm -f scorealign.opt
rm -f scorealign.plg
TAGS:
find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
tags: TAGS
backup: cleanest
tar cvf ../scorealign.tar .
gzip ../scorealign.tar
echo "please rename ../scorealign.tar.gz"
scorealign: $(scorealign_o)
$(c++link) $(scorealign_o) -o scorealign $(syslibs)
test0:
./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
test:
./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
bigtest:
./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
bigtest2:
./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
# DEPENDENCIES
# OS X Makefile for scorealign
# NOTE: This is out of date. See the score-align.vcproj -OR- Makefile.linux
# profile = -pg
profile =
DEBUGFLAGS =
#optimize = -g $(DEBUGFLAGS) $(profile)
optimize = -O
#PORTSMF LIBRARY PATH:
# (set this to the location of allegro.cpp, allegrosmfrd.cpp, allegrosmfwr.cpp, etc.)
# (if you do not have this directory, look for portsmf in the portmedia project
# on sourceforge)
PORTSMF = ../portsmf
INCLUDES = -Isnd -Ifft3 -I$(PORTSMF)
#OPTIONS FOR LINUX:
c_opts = $(optimize) -DLINUX $(INCLUDES)
cc = gcc $(c_opts)
c++ = g++ $(c_opts)
cclink = gcc
c++link = g++
syslibs = -lm
scorealign_o = comp_chroma.o gen_chroma.o scorealign.o snd/audionone.o snd/sndcvt.o snd/sndheader.o snd/sndio.o snd/snd.o snd/ieeecvt.o snd/sndlinux.o snd/sndfaillinux.o fft3/FFT.o mfmidi.o $(PORTSMF)/allegro.o $(PORTSMF)/allegrosmfrd.o $(PORTSMF)/allegrosmfwr.o $(PORTSMF)/allegrord.o $(PORTSMF)/strparse.o trace.o regression.o
.SUFFIXES: .cpp .c .h .aur .o
.cpp.o:
$(c++) -c $< -o $*.o
.c.o:
$(cc) -c $< -o $*.o
all: scorealign
header:
echo "**********************************************************"
echo "**********************************************************"
clean:
echo "removing objects"
find . -name "*~" | xargs rm -f
rm -f $(scorealign_o)
rm -f core*
cleaner: clean
rm -f TAGS
cleanest: cleaner
rm -f scorealign
rm -f scorealign.ncb
rm -f scorealign.opt
rm -f scorealign.plg
TAGS:
find . \( -name "*.cpp" -o -name "*.h" \) -print | etags -
tags: TAGS
backup: cleanest
tar cvf ../scorealign.tar .
gzip ../scorealign.tar
echo "please rename ../scorealign.tar.gz"
scorealign: $(scorealign_o)
$(c++link) $(scorealign_o) -o scorealign $(syslibs)
test0:
./scorealign /home/rbd/wdh/music/nyquist-temp.wav /home/rbd/wdh/music/chrom_nyquist-temp.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
test:
./scorealign /home/rbd/scorealign/data/live-beeth-s5m1-25s-mono.wav /home/rbd/scorealign/data/midi-beeth-s5m1-25s-mono.wav > output.txt
diff output.txt /home/rbd/wdh/music/output.txt | less
bigtest:
./scorealign data/live-Beethoven_Symphony_No5_Mvt1.wav data/midi-Beethoven_Symphony_No5_Mvt1.wav
bigtest2:
./scorealign data/midi-Beethoven_Symphony_No5_Mvt1.wav data/live-Beethoven_Symphony_No5_Mvt1.wav
# DEPENDENCIES

View File

@@ -1,197 +1,197 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="compare_transcripts"
ProjectGUID="{C7876B12-4C66-4C26-9318-3363CD9A3FE9}"
RootNamespace="compare_transcripts"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\compare_transcripts\compare.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="compare_transcripts"
ProjectGUID="{C7876B12-4C66-4C26-9318-3363CD9A3FE9}"
RootNamespace="compare_transcripts"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\compare_transcripts\compare.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -1,70 +1,70 @@
#include "stdio.h"
#include "stdlib.h"
#include "string.h"
#include "math.h"
bool read_stuff(FILE *f, int &p, float &start, float &dur)
{
int n, chan, vel;
int c;
while ((c = getc(f)) == '#') {
while ((c = getc(f)) != '\n' && c != EOF) ;
}
ungetc(c, f);
int fields = fscanf(f, "%d %d %d %d %f %f", &n, &chan, &p, &vel, &start, &dur);
if (fields == EOF) {
return false;
} else if (fields != 6) {
printf("Error scanning file\n");
exit(1);
}
while ((c = getc(f)) != '\n' && c != EOF) ;
return true;
}
void print_usage(char *progname)
{
printf("%s file1 file2\n", progname);
}
int main(int argc, char *argv[])
{
char *file1;
char *file2;
char *progname = strrchr(argv[0], '/');
progname = progname ? progname + 1 : argv[0];
if (argc < 3) {
print_usage(progname);
return 1;
}
file1 = argv[1];
file2 = argv[2];
FILE *f1 = fopen(file1, "r");
FILE *f2 = fopen(file2, "r");
int count = 0;
float sum = 0.0;
float sumsqr = 0.0;
while (true) {
int p1, p2;
float start1, start2;
float dur1, dur2;
bool ok1 = read_stuff(f1, p1, start1, dur1);
bool ok2 = read_stuff(f2, p2, start2, dur2);
if (ok1 != ok2 || p1 != p2) {
printf("Transcripts are not compatible\n");
exit(1);
}
if (!ok1) break;
count++;
float diff = start2 - start1;
sum += diff;
sumsqr += diff * diff;
}
float avg = sum / count;
float stddev = sqrt((sumsqr / count) - (avg * avg));
printf("average error = %g\nstandard deviation = %g\n", avg, stddev);
return 0;
#include "stdio.h"
#include "stdlib.h"
#include "string.h"
#include "math.h"
bool read_stuff(FILE *f, int &p, float &start, float &dur)
{
int n, chan, vel;
int c;
while ((c = getc(f)) == '#') {
while ((c = getc(f)) != '\n' && c != EOF) ;
}
ungetc(c, f);
int fields = fscanf(f, "%d %d %d %d %f %f", &n, &chan, &p, &vel, &start, &dur);
if (fields == EOF) {
return false;
} else if (fields != 6) {
printf("Error scanning file\n");
exit(1);
}
while ((c = getc(f)) != '\n' && c != EOF) ;
return true;
}
void print_usage(char *progname)
{
printf("%s file1 file2\n", progname);
}
int main(int argc, char *argv[])
{
char *file1;
char *file2;
char *progname = strrchr(argv[0], '/');
progname = progname ? progname + 1 : argv[0];
if (argc < 3) {
print_usage(progname);
return 1;
}
file1 = argv[1];
file2 = argv[2];
FILE *f1 = fopen(file1, "r");
FILE *f2 = fopen(file2, "r");
int count = 0;
float sum = 0.0;
float sumsqr = 0.0;
while (true) {
int p1, p2;
float start1, start2;
float dur1, dur2;
bool ok1 = read_stuff(f1, p1, start1, dur1);
bool ok2 = read_stuff(f2, p2, start2, dur2);
if (ok1 != ok2 || p1 != p2) {
printf("Transcripts are not compatible\n");
exit(1);
}
if (!ok1) break;
count++;
float diff = start2 - start1;
sum += diff;
sumsqr += diff * diff;
}
float avg = sum / count;
float stddev = sqrt((sumsqr / count) - (avg * avg));
printf("average error = %g\nstandard deviation = %g\n", avg, stddev);
return 0;
}

View File

@@ -1,20 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compare_transcripts", "compare_transcripts.vcproj", "{C7876B12-4C66-4C26-9318-3363CD9A3FE9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Debug|Win32.ActiveCfg = Debug|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Debug|Win32.Build.0 = Debug|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Release|Win32.ActiveCfg = Release|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compare_transcripts", "compare_transcripts.vcproj", "{C7876B12-4C66-4C26-9318-3363CD9A3FE9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Debug|Win32.ActiveCfg = Debug|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Debug|Win32.Build.0 = Debug|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Release|Win32.ActiveCfg = Release|Win32
{C7876B12-4C66-4C26-9318-3363CD9A3FE9}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@@ -1,28 +1,28 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "score-align", "score-align.vcproj", "{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
ProjectSection(ProjectDependencies) = postProject
{AB1E315A-3503-4EA6-8888-9652EA4A11E6} = {AB1E315A-3503-4EA6-8888-9652EA4A11E6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libsndfile\libsndfile.vcproj", "{AB1E315A-3503-4EA6-8888-9652EA4A11E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.ActiveCfg = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.Build.0 = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.ActiveCfg = Release|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.Build.0 = Release|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Debug|Win32.ActiveCfg = Debug|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Debug|Win32.Build.0 = Debug|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Release|Win32.ActiveCfg = Release|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "score-align", "score-align.vcproj", "{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
ProjectSection(ProjectDependencies) = postProject
{AB1E315A-3503-4EA6-8888-9652EA4A11E6} = {AB1E315A-3503-4EA6-8888-9652EA4A11E6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libsndfile\libsndfile.vcproj", "{AB1E315A-3503-4EA6-8888-9652EA4A11E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.ActiveCfg = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.Build.0 = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.ActiveCfg = Release|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.Build.0 = Release|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Debug|Win32.ActiveCfg = Debug|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Debug|Win32.Build.0 = Debug|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Release|Win32.ActiveCfg = Release|Win32
{AB1E315A-3503-4EA6-8888-9652EA4A11E6}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@@ -1,304 +1,304 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="score-align"
ProjectGUID="{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
RootNamespace="scorealign"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Debug\portsmf.lib Debug\libsndfile.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="libsndfile"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Release\portsmf.lib Release\libsndfile.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\alignfiles.cpp"
>
</File>
<File
RelativePath=".\audiofilereader.cpp"
>
</File>
<File
RelativePath=".\audioreader.cpp"
>
</File>
<File
RelativePath=".\comp_chroma.cpp"
>
</File>
<File
RelativePath=".\curvefit.cpp"
>
</File>
<File
RelativePath=".\gen_chroma.cpp"
>
</File>
<File
RelativePath=".\hillclimb.cpp"
>
</File>
<File
RelativePath=".\main.cpp"
>
</File>
<File
RelativePath=".\regression.cpp"
>
</File>
<File
RelativePath=".\sautils.cpp"
>
</File>
<File
RelativePath=".\scorealign.cpp"
>
</File>
<Filter
Name="fft3"
>
<File
RelativePath=".\fft3\FFT3.cpp"
>
</File>
<File
RelativePath=".\fft3\FFT3.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\alignfiles.h"
>
</File>
<File
RelativePath=".\audiofilereader.h"
>
</File>
<File
RelativePath=".\comp_chroma.h"
>
</File>
<File
RelativePath=".\curvefit.h"
>
</File>
<File
RelativePath=".\fft3\FFT.h"
>
</File>
<File
RelativePath=".\gen_chroma.h"
>
</File>
<File
RelativePath=".\hillclimb.h"
>
</File>
<File
RelativePath=".\regression.h"
>
</File>
<File
RelativePath=".\sautils.h"
>
</File>
<File
RelativePath=".\scorealign.h"
>
</File>
<File
RelativePath=".\snd\snd\switches.h"
>
</File>
<File
RelativePath=".\snd\snd\swlogic.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="score-align"
ProjectGUID="{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
RootNamespace="scorealign"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Debug\portsmf.lib Debug\libsndfile.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="libsndfile"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Release\portsmf.lib Release\libsndfile.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\alignfiles.cpp"
>
</File>
<File
RelativePath=".\audiofilereader.cpp"
>
</File>
<File
RelativePath=".\audioreader.cpp"
>
</File>
<File
RelativePath=".\comp_chroma.cpp"
>
</File>
<File
RelativePath=".\curvefit.cpp"
>
</File>
<File
RelativePath=".\gen_chroma.cpp"
>
</File>
<File
RelativePath=".\hillclimb.cpp"
>
</File>
<File
RelativePath=".\main.cpp"
>
</File>
<File
RelativePath=".\regression.cpp"
>
</File>
<File
RelativePath=".\sautils.cpp"
>
</File>
<File
RelativePath=".\scorealign.cpp"
>
</File>
<Filter
Name="fft3"
>
<File
RelativePath=".\fft3\FFT3.cpp"
>
</File>
<File
RelativePath=".\fft3\FFT3.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\alignfiles.h"
>
</File>
<File
RelativePath=".\audiofilereader.h"
>
</File>
<File
RelativePath=".\comp_chroma.h"
>
</File>
<File
RelativePath=".\curvefit.h"
>
</File>
<File
RelativePath=".\fft3\FFT.h"
>
</File>
<File
RelativePath=".\gen_chroma.h"
>
</File>
<File
RelativePath=".\hillclimb.h"
>
</File>
<File
RelativePath=".\regression.h"
>
</File>
<File
RelativePath=".\sautils.h"
>
</File>
<File
RelativePath=".\scorealign.h"
>
</File>
<File
RelativePath=".\snd\snd\switches.h"
>
</File>
<File
RelativePath=".\snd\snd\swlogic.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -1,19 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scorealign-vc2010", "scorealign-vc2010.vcxproj", "{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.ActiveCfg = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.Build.0 = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.ActiveCfg = Release|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scorealign-vc2010", "scorealign-vc2010.vcxproj", "{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.ActiveCfg = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Debug|Win32.Build.0 = Debug|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.ActiveCfg = Release|Win32
{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@@ -1,304 +1,304 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="scorealign-vc2010"
ProjectGUID="{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
RootNamespace="scorealign"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Debug\portsmf.lib Debug\libsndfile.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="libsndfile"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Release\portsmf.lib Release\libsndfile.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\alignfiles.cpp"
>
</File>
<File
RelativePath=".\audiofilereader.cpp"
>
</File>
<File
RelativePath=".\audioreader.cpp"
>
</File>
<File
RelativePath=".\comp_chroma.cpp"
>
</File>
<File
RelativePath=".\curvefit.cpp"
>
</File>
<File
RelativePath=".\gen_chroma.cpp"
>
</File>
<File
RelativePath=".\hillclimb.cpp"
>
</File>
<File
RelativePath=".\main.cpp"
>
</File>
<File
RelativePath=".\regression.cpp"
>
</File>
<File
RelativePath=".\sautils.cpp"
>
</File>
<File
RelativePath=".\scorealign.cpp"
>
</File>
<Filter
Name="fft3"
>
<File
RelativePath=".\fft3\FFT3.cpp"
>
</File>
<File
RelativePath=".\fft3\FFT3.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\alignfiles.h"
>
</File>
<File
RelativePath=".\audiofilereader.h"
>
</File>
<File
RelativePath=".\comp_chroma.h"
>
</File>
<File
RelativePath=".\curvefit.h"
>
</File>
<File
RelativePath=".\fft3\FFT.h"
>
</File>
<File
RelativePath=".\gen_chroma.h"
>
</File>
<File
RelativePath=".\hillclimb.h"
>
</File>
<File
RelativePath=".\regression.h"
>
</File>
<File
RelativePath=".\sautils.h"
>
</File>
<File
RelativePath=".\scorealign.h"
>
</File>
<File
RelativePath=".\snd\snd\switches.h"
>
</File>
<File
RelativePath=".\snd\snd\swlogic.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="scorealign-vc2010"
ProjectGUID="{5F04DE5D-0A34-496E-8A34-BE30BA9C70A1}"
RootNamespace="scorealign"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Debug\portsmf.lib Debug\libsndfile.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="libsndfile"
AddModuleNamesToAssembly=""
GenerateDebugInformation="true"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="fft3;libsndfile;..\portsmf"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib ..\portsmf\Release\portsmf.lib Release\libsndfile.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\alignfiles.cpp"
>
</File>
<File
RelativePath=".\audiofilereader.cpp"
>
</File>
<File
RelativePath=".\audioreader.cpp"
>
</File>
<File
RelativePath=".\comp_chroma.cpp"
>
</File>
<File
RelativePath=".\curvefit.cpp"
>
</File>
<File
RelativePath=".\gen_chroma.cpp"
>
</File>
<File
RelativePath=".\hillclimb.cpp"
>
</File>
<File
RelativePath=".\main.cpp"
>
</File>
<File
RelativePath=".\regression.cpp"
>
</File>
<File
RelativePath=".\sautils.cpp"
>
</File>
<File
RelativePath=".\scorealign.cpp"
>
</File>
<Filter
Name="fft3"
>
<File
RelativePath=".\fft3\FFT3.cpp"
>
</File>
<File
RelativePath=".\fft3\FFT3.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\alignfiles.h"
>
</File>
<File
RelativePath=".\audiofilereader.h"
>
</File>
<File
RelativePath=".\comp_chroma.h"
>
</File>
<File
RelativePath=".\curvefit.h"
>
</File>
<File
RelativePath=".\fft3\FFT.h"
>
</File>
<File
RelativePath=".\gen_chroma.h"
>
</File>
<File
RelativePath=".\hillclimb.h"
>
</File>
<File
RelativePath=".\regression.h"
>
</File>
<File
RelativePath=".\sautils.h"
>
</File>
<File
RelativePath=".\scorealign.h"
>
</File>
<File
RelativePath=".\snd\snd\switches.h"
>
</File>
<File
RelativePath=".\snd\snd\swlogic.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -1,25 +1,25 @@
#include "stdarg.h"
#include "stdio.h"
#ifdef __linux__
#define _vsnprintf vsnprintf
#elif defined(__MACH__)
#define _vsnprintf vsnprintf
#else
#include "crtdbg.h"
#endif
void trace(char *format, ...)
{
char msg[256];
va_list args;
va_start(args, format);
_vsnprintf(msg, 256, format, args);
va_end(args);
#if defined(_DEBUG) && !defined(__linux__)
_CrtDbgReport(_CRT_WARN, NULL, NULL, NULL, msg);
#else
printf(msg);
#endif
}
#include "stdarg.h"
#include "stdio.h"
#ifdef __linux__
#define _vsnprintf vsnprintf
#elif defined(__MACH__)
#define _vsnprintf vsnprintf
#else
#include "crtdbg.h"
#endif
void trace(char *format, ...)
{
char msg[256];
va_list args;
va_start(args, format);
_vsnprintf(msg, 256, format, args);
va_end(args);
#if defined(_DEBUG) && !defined(__linux__)
_CrtDbgReport(_CRT_WARN, NULL, NULL, NULL, msg);
#else
printf(msg);
#endif
}

View File

@@ -1,2 +1,2 @@
void trace(char *format, ...);
void trace(char *format, ...);