- forgot to remove those in previous commit

noticed by STeve Andre' <andres at msu dot edu>
This commit is contained in:
ajacoutot 2007-12-08 18:42:42 +00:00
parent 89eecaa99f
commit 979fae2490
7 changed files with 0 additions and 115 deletions

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-lib-src_soundtouch_configure,v 1.3 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/configure.orig Sat Dec 2 11:12:39 2006
+++ lib-src/soundtouch/configure Sat Dec 2 11:14:59 2006
@@ -2443,7 +2443,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
#AC_MAINTAINER_MODE
-CXXFLAGS= ac_ext=cpp
+#CXXFLAGS= ac_ext=cpp
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-lib-src_soundtouch_include_STTypes_h,v 1.2 2007/06/06 09:35:18 ajacoutot Exp $
--- lib-src/soundtouch/include/STTypes.h.orig Wed Mar 28 09:32:07 2007
+++ lib-src/soundtouch/include/STTypes.h Wed Mar 28 09:33:00 2007
@@ -92,7 +92,9 @@ namespace soundtouch
/// However, if you're having difficulties getting the optimized routines
/// compiled with your compler (e.g. some gcc compiler versions may be picky),
/// you may wish to disable the optimizations to make the library compile.
+#ifndef __OpenBSD__
#define ALLOW_OPTIMIZATIONS 1
+#endif
// If defined, allows the SIMD-optimized routines to take minor shortcuts

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile_in,v 1.4 2007/06/06 09:35:18 ajacoutot Exp $
--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig Wed Mar 28 09:33:27 2007
+++ lib-src/soundtouch/source/SoundTouch/Makefile.in Wed Mar 28 09:33:57 2007
@@ -197,7 +197,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
+AM_CXXFLAGS = -I../../include -fcheck-new
all: all-am
.SUFFIXES:

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_SoundStretch_Makefile_in,v 1.4 2007/06/06 09:35:18 ajacoutot Exp $
--- lib-src/soundtouch/source/example/SoundStretch/Makefile.in.orig Wed Mar 28 09:35:39 2007
+++ lib-src/soundtouch/source/example/SoundStretch/Makefile.in Wed Mar 28 09:35:54 2007
@@ -189,7 +189,7 @@ EXTRA_DIST = soundstretch.dsp soundstretch.dsw
soundstretch_SOURCES = main.cpp RunParameters.cpp WavFile.cpp
soundstretch_LDADD = ../../SoundTouch/libSoundTouch.la ../bpm/libBPM.la -lm
soundstretch_LDFLAGS = -s
-soundstretch_CXXFLAGS = -O3 -I../bpm
+soundstretch_CXXFLAGS = -I../bpm
all: all-am
.SUFFIXES:

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib-src_soundtouch_source_example_bpm_Makefile_in,v 1.2 2006/12/17 12:12:59 ajacoutot Exp $
--- lib-src/soundtouch/source/example/bpm/Makefile.in.orig Sat Dec 2 11:17:54 2006
+++ lib-src/soundtouch/source/example/bpm/Makefile.in Sat Dec 2 11:18:16 2006
@@ -192,7 +192,7 @@ lib_LTLIBRARIES = libBPM.la
libBPM_la_SOURCES = BPMDetect.cpp PeakFinder.cpp
# other compiler flags to add
-AM_CXXFLAGS = -O3 -I../../../include
+AM_CXXFLAGS = -I../../../include
all: all-am
.SUFFIXES:

View File

@ -1,20 +0,0 @@
$ OpenBSD $
--- src/export/ExportFLAC.cpp.orig Sun Sep 16 11:28:32 2007
+++ src/export/ExportFLAC.cpp Sun Sep 16 11:33:31 2007
@@ -229,7 +229,6 @@ bool ExportFLAC::Export(AudacityProject *project,
gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
- encoder->set_filename(OSFILENAME(fName));
encoder->set_channels(numChannels);
encoder->set_sample_rate(int(rate + 0.5));
@@ -264,7 +263,7 @@ bool ExportFLAC::Export(AudacityProject *project,
encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
- encoder->init();
+ encoder->init(const_cast<const char *>(OSFILENAME(fName)));
int numWaveTracks;
WaveTrack **waveTracks;

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-src_import_ImportFLAC_cpp,v 1.1 2007/09/18 18:27:00 mgrimm Exp $
--- src/import/ImportFLAC.cpp.orig Sun Sep 16 11:40:41 2007
+++ src/import/ImportFLAC.cpp Sun Sep 16 11:54:55 2007
@@ -273,17 +273,12 @@ FLACImportFileHandle::FLACImportFileHandle(wxString na
bool FLACImportFileHandle::Init()
{
- bool success = mFile->set_filename(OSFILENAME(mName));
- if (!success) {
+ if (FLAC__STREAM_DECODER_INIT_STATUS_OK != mFile->init(const_cast<const char *>(OSFILENAME(mName)))) {
return false;
}
- FLAC::Decoder::File::State state = mFile->init();
- if (state != FLAC__FILE_DECODER_OK) {
- return false;
- }
mFile->process_until_end_of_metadata();
- state = mFile->get_state();
- if (state != FLAC__FILE_DECODER_OK) {
+ FLAC::Decoder::File::State state = mFile->get_state();
+ if (state != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
return false;
}
if (!mFile->is_valid() || mFile->get_was_error())
@@ -349,7 +344,7 @@ bool FLACImportFileHandle::Import(TrackFactory *trackF
mChannels[1]->SetTeamed(true);
}
- mFile->process_until_end_of_file();
+ mFile->process_until_end_of_stream();
*outTracks = new Track *[*outNumTracks];
for(c = 0; c < *outNumTracks; c++) {