|
 |
278585d |
diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure
|
|
|
278585d |
--- audacity-src-1.3.2-beta-orig/configure 2006-10-29 01:05:36.000000000 +0200
|
|
|
278585d |
+++ audacity-src-1.3.2-beta/configure 2007-02-24 03:12:59.000000000 +0100
|
|
|
278585d |
@@ -5162,9 +5162,9 @@
|
|
|
278585d |
|
|
|
278585d |
|
|
|
278585d |
|
|
|
278585d |
- { echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
|
|
|
278585d |
-echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6; }
|
|
|
278585d |
-if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
|
|
|
278585d |
+ { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_file in -lFLAC" >&5
|
|
|
278585d |
+echo $ECHO_N "checking for FLAC__stream_decoder_init_file in -lFLAC... $ECHO_C" >&6; }
|
|
|
278585d |
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_file+set}" = set; then
|
|
|
278585d |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
|
278585d |
else
|
|
|
278585d |
ac_check_lib_save_LIBS=$LIBS
|
|
|
278585d |
@@ -5182,11 +5182,11 @@
|
|
|
278585d |
#ifdef __cplusplus
|
|
|
278585d |
extern "C"
|
|
|
278585d |
#endif
|
|
|
278585d |
-char FLAC__file_decoder_new ();
|
|
|
278585d |
+char FLAC__stream_decoder_init_file ();
|
|
|
278585d |
int
|
|
|
278585d |
main ()
|
|
|
278585d |
{
|
|
|
278585d |
-return FLAC__file_decoder_new ();
|
|
|
278585d |
+return FLAC__stream_decoder_init_file ();
|
|
|
278585d |
;
|
|
|
278585d |
return 0;
|
|
|
278585d |
}
|
|
|
278585d |
@@ -5225,21 +5225,21 @@
|
|
|
278585d |
ac_status=$?
|
|
|
278585d |
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
278585d |
(exit $ac_status); }; }; then
|
|
|
278585d |
- ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
|
|
|
278585d |
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=yes
|
|
|
278585d |
else
|
|
|
278585d |
echo "$as_me: failed program was:" >&5
|
|
|
278585d |
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
278585d |
|
|
|
278585d |
- ac_cv_lib_FLAC_FLAC__file_decoder_new=no
|
|
|
278585d |
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=no
|
|
|
278585d |
fi
|
|
|
278585d |
|
|
|
278585d |
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
|
|
278585d |
conftest$ac_exeext conftest.$ac_ext
|
|
|
278585d |
LIBS=$ac_check_lib_save_LIBS
|
|
|
278585d |
fi
|
|
|
278585d |
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
|
|
|
278585d |
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6; }
|
|
|
278585d |
-if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
|
|
|
278585d |
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&5
|
|
|
278585d |
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&6; }
|
|
|
278585d |
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file = yes; then
|
|
|
278585d |
lib_found="yes"
|
|
|
278585d |
else
|
|
|
278585d |
lib_found="no"
|
|
|
278585d |
diff -Nur audacity-src-1.3.2-beta-orig/src/export/ExportFLAC.cpp audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp
|
|
|
278585d |
--- audacity-src-1.3.2-beta-orig/src/export/ExportFLAC.cpp 2006-10-29 01:05:27.000000000 +0200
|
|
|
278585d |
+++ audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp 2007-02-24 03:09:44.000000000 +0100
|
|
|
278585d |
@@ -58,7 +58,6 @@
|
|
|
278585d |
gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
|
|
|
278585d |
|
|
|
278585d |
FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
|
|
|
278585d |
- encoder->set_filename(OSFILENAME(fName));
|
|
|
278585d |
encoder->set_channels(numChannels);
|
|
|
278585d |
encoder->set_sample_rate(int(rate + 0.5));
|
|
|
278585d |
|
|
|
278585d |
@@ -72,7 +71,7 @@
|
|
|
278585d |
format=int16Sample;
|
|
|
278585d |
encoder->set_bits_per_sample(16);
|
|
|
278585d |
}
|
|
|
278585d |
- encoder->init();
|
|
|
278585d |
+ encoder->init(OSFILENAME(fName));
|
|
|
278585d |
|
|
|
278585d |
int numWaveTracks;
|
|
|
278585d |
WaveTrack **waveTracks;
|
|
|
278585d |
diff -Nur audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp
|
|
|
278585d |
--- audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp 2006-10-29 01:05:28.000000000 +0200
|
|
|
278585d |
+++ audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp 2007-02-24 03:04:04.000000000 +0100
|
|
|
278585d |
@@ -264,19 +264,15 @@
|
|
|
278585d |
|
|
|
278585d |
bool FLACImportFileHandle::Init()
|
|
|
278585d |
{
|
|
|
278585d |
- bool success = mFile->set_filename(OSFILENAME(mName));
|
|
|
278585d |
- if (!success) {
|
|
|
278585d |
- return false;
|
|
|
278585d |
- }
|
|
|
278585d |
- FLAC::Decoder::File::State state = mFile->init();
|
|
|
278585d |
- if (state != FLAC__FILE_DECODER_OK) {
|
|
|
278585d |
+ FLAC__StreamDecoderInitStatus state = mFile->init(OSFILENAME(mName));
|
|
|
278585d |
+ if (state != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
|
|
|
278585d |
return false;
|
|
|
278585d |
}
|
|
|
278585d |
mFile->process_until_end_of_metadata();
|
|
|
278585d |
- state = mFile->get_state();
|
|
|
278585d |
- if (state != FLAC__FILE_DECODER_OK) {
|
|
|
278585d |
- return false;
|
|
|
278585d |
- }
|
|
|
278585d |
+ // FLAC__StreamDecoderState decstate = mFile->get_state();
|
|
|
278585d |
+ // if (state != FLAC__STREAM_DECODER_FILE_DECODER_OK) {
|
|
|
278585d |
+ // return false;
|
|
|
278585d |
+ // }
|
|
|
278585d |
if (!mFile->is_valid() || mFile->get_was_error())
|
|
|
278585d |
{
|
|
|
278585d |
// This probably is not a FLAC file at all
|
|
|
278585d |
@@ -340,7 +336,7 @@
|
|
|
278585d |
mChannels[1]->SetTeamed(true);
|
|
|
278585d |
}
|
|
|
278585d |
|
|
|
278585d |
- mFile->process_until_end_of_file();
|
|
|
278585d |
+ mFile->process_until_end_of_stream();
|
|
|
278585d |
|
|
|
278585d |
*outTracks = new Track *[*outNumTracks];
|
|
|
278585d |
for(c = 0; c < *outNumTracks; c++) {
|