Moved SoundStretch from "source/example" to "source" directory

Makefile.am

@@ -52,7 +52,7 @@ EXTRA_DIST=                  \
        README.html
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = soundtouch-1.0.pc
+pkgconfig_DATA = soundtouch-1.4.pc
 
 ## This removes stuff from the distribution which may be present
 ## from a cvs checkout or other build reasons

configure.ac

@@ -124,13 +124,12 @@ AC_CONFIG_FILES([
 	Makefile
 	source/Makefile
 		source/SoundTouch/Makefile
-		source/example/Makefile
+		source/SoundStretch/Makefile
-		source/example/SoundStretch/Makefile
 	include/Makefile
 ])
 
 AC_OUTPUT(
-	soundtouch-1.0.pc
+	soundtouch-1.4.pc
 )
 
 dnl use 'echo' to put stuff here if you want a message to the builder

source/Makefile.am

@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/config/am_include.mk
 
-SUBDIRS=SoundTouch example
+SUBDIRS=SoundTouch SoundStretch
 
 # set to something if you want other stuff to be included in the distribution tarball
 #EXTRA_DIST=

source/SoundStretch/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 ##
-## $Id$
+## $Id: Makefile.am 37 2008-12-25 16:33:39Z oparviai $
 ##
 ## Copyright (C) 2003 - David W. Durham
 ## 
@@ -31,7 +31,7 @@ bin_PROGRAMS=soundstretch
 noinst_HEADERS=RunParameters.h WavFile.h
 
 # extra files to include in distrubution tarball
-EXTRA_DIST=soundstretch.dsp soundstretch.dsw
+EXTRA_DIST=soundstretch.dsp soundstretch.dsw soundstretch.sln soundstretch.vcproj
 
 ## for every name listed under bin_PROGRAMS, you have a <prog>_SOURCES. This lists
 ## all the sources in the current directory that are used to build soundstretch.
@@ -41,7 +41,7 @@ soundstretch_SOURCES=main.cpp RunParameters.cpp WavFile.cpp
 ## created by the above soundstretch_SOURCES are automatically linked in, so here I
 ## list object files from other directories as well as flags passed to the
 ## linker. 
-soundstretch_LDADD=../../SoundTouch/libSoundTouch.la -lm
+soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm
 
 ## linker flags
 soundstretch_LDFLAGS=-s

source/SoundStretch/RunParameters.cpp

@@ -8,10 +8,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date$
+// Last changed  : $Date: 2008-12-25 14:38:45 +0200 (to, 25 joulu 2008) $
 // File revision : $Revision: 4 $
 //
-// $Id$
+// $Id: RunParameters.cpp 34 2008-12-25 12:38:45Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //

source/SoundStretch/RunParameters.h

@@ -8,10 +8,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date$
+// Last changed  : $Date: 2008-02-10 18:26:55 +0200 (su, 10 helmi 2008) $
 // File revision : $Revision: 4 $
 //
-// $Id$
+// $Id: RunParameters.h 11 2008-02-10 16:26:55Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //

source/SoundStretch/WavFile.cpp

@@ -17,10 +17,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date$
+// Last changed  : $Date: 2008-12-25 18:33:39 +0200 (to, 25 joulu 2008) $
 // File revision : $Revision: 4 $
 //
-// $Id$
+// $Id: WavFile.cpp 37 2008-12-25 16:33:39Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //

source/SoundStretch/WavFile.h

@@ -16,10 +16,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date$
+// Last changed  : $Date: 2008-12-25 14:38:45 +0200 (to, 25 joulu 2008) $
 // File revision : $Revision: 4 $
 //
-// $Id$
+// $Id: WavFile.h 34 2008-12-25 12:38:45Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //

source/SoundStretch/main.cpp

@@ -8,10 +8,10 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Last changed  : $Date$
+// Last changed  : $Date: 2008-12-25 18:33:39 +0200 (to, 25 joulu 2008) $
 // File revision : $Revision: 4 $
 //
-// $Id$
+// $Id: main.cpp 37 2008-12-25 16:33:39Z oparviai $
 //
 ////////////////////////////////////////////////////////////////////////////////
 //

source/SoundStretch/soundstretch.dsw

@@ -1,7 +1,7 @@
 Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 #
-# $Id$
+# $Id: soundstretch.dsw 11 2008-02-10 16:26:55Z oparviai $
 
 ###############################################################################
 

source/SoundStretch/soundstretch.sln

@@ -1,11 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\..\SoundTouch\SoundTouch.vcproj", "{121A2AA5-7B1F-4871-8436-FB9C837F11D4}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundstretch", "soundstretch.vcproj", "{5AACDFFA-D491-44B8-A332-DA7ACCAAF2AF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{121A2AA5-7B1F-4871-8436-FB9C837F11D4} = {121A2AA5-7B1F-4871-8436-FB9C837F11D4}
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509} = {68A5DD20-7057-448B-8FE0-B6AC8D205509}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\SoundTouch\SoundTouch.vcproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
+	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
@@ -16,14 +16,14 @@ Global
 	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{121A2AA5-7B1F-4871-8436-FB9C837F11D4}.Debug.ActiveCfg = Debug|Win32
-		{121A2AA5-7B1F-4871-8436-FB9C837F11D4}.Debug.Build.0 = Debug|Win32
-		{121A2AA5-7B1F-4871-8436-FB9C837F11D4}.Release.ActiveCfg = Release|Win32
-		{121A2AA5-7B1F-4871-8436-FB9C837F11D4}.Release.Build.0 = Release|Win32
 		{5AACDFFA-D491-44B8-A332-DA7ACCAAF2AF}.Debug.ActiveCfg = Debug|Win32
 		{5AACDFFA-D491-44B8-A332-DA7ACCAAF2AF}.Debug.Build.0 = Debug|Win32
 		{5AACDFFA-D491-44B8-A332-DA7ACCAAF2AF}.Release.ActiveCfg = Release|Win32
 		{5AACDFFA-D491-44B8-A332-DA7ACCAAF2AF}.Release.Build.0 = Release|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug.ActiveCfg = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug.Build.0 = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release.ActiveCfg = Release|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

source/SoundStretch/soundstretch.vcproj

@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include,..\bpm"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -43,7 +43,7 @@
 				OutputFile="Debug/soundstretchD.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/soundstretchD.pdb"
@@ -57,7 +57,7 @@
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy          Debug\soundstretchD.exe          ..\..\..\bin\"/>
+				CommandLine="copy          Debug\soundstretchD.exe          ..\..\bin\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -89,7 +89,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\include,..\bpm"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -110,7 +110,7 @@
 				OutputFile=".\Release/soundstretch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				GenerateDebugInformation="TRUE"
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/soundstretch.map"
@@ -122,7 +122,7 @@
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy          Release\soundstretch.exe          ..\..\..\bin\"/>
+				CommandLine="copy          Release\soundstretch.exe          ..\..\bin\"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool

source/SoundTouch/SoundTouch.vcproj

@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="SoundTouch"
+	ProjectGUID="{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>

source/example/Makefile.am

@@ -1,28 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## Copyright (C) 2003 - David W. Durham
-## 
-## This file is part of SoundTouch, an audio processing library for pitch/time adjustments
-## 
-## SoundTouch is free software; you can redistribute it and/or modify it under the
-## terms of the GNU General Public License as published by the Free Software
-## Foundation; either version 2 of the License, or (at your option) any later
-## version.
-## 
-## SoundTouch is distributed in the hope that it will be useful, but WITHOUT ANY
-## WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-## A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License along with
-## this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-## Place - Suite 330, Boston, MA  02111-1307, USA
-
-include $(top_srcdir)/config/am_include.mk
-
-SUBDIRS=SoundStretch
-
-# set to something if you want other stuff to be included in the distribution tarball
-#EXTRA_DIST=
-