audacity-flac.patch

   1 --- audacity-src-1.3.2-beta/acinclude.m4.orig   2006-10-29 01:06:04.000000000 +0200
   2 +++ audacity-src-1.3.2-beta/acinclude.m4        2006-12-29 01:37:20.738111908 +0100
   3 @@ -467,7 +467,7 @@
   4     dnl See if FLAC is installed in the system
   5
   6     AC_CHECK_LIB(FLAC,
   7 -                FLAC__file_decoder_new,
   8 +                FLAC__stream_decoder_init_file,
   9                  lib_found="yes",
  10                  lib_found="no",
  11                  -lFLAC++ -lFLAC)
  12 --- audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp.orig      2006-10-29 01:05:28.000000000 +0200
  13 +++ audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp   2006-12-29 02:15:32.764727062 +0100
  14 @@ -264,17 +264,13 @@
  15
  16  bool FLACImportFileHandle::Init()
  17  {
  18 -   bool success = mFile->set_filename(OSFILENAME(mName));
  19 -   if (!success) {
  20 -      return false;
  21 -   }
  22 -   FLAC::Decoder::File::State state = mFile->init();
  23 -   if (state != FLAC__FILE_DECODER_OK) {
  24 +   FLAC__StreamDecoderInitStatus initstate = mFile->init(OSFILENAME(mName));
  25 +   if (initstate != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
  26        return false;
  27     }
  28     mFile->process_until_end_of_metadata();
  29 -   state = mFile->get_state();
  30 -   if (state != FLAC__FILE_DECODER_OK) {
  31 +   FLAC::Decoder::Stream::State state = mFile->get_state();
  32 +   if (state >= FLAC__STREAM_DECODER_END_OF_STREAM) {
  33        return false;
  34     }
  35     if (!mFile->is_valid() || mFile->get_was_error())
  36 @@ -340,7 +336,7 @@
  37        mChannels[1]->SetTeamed(true);
  38     }
  39
  40 -   mFile->process_until_end_of_file();
  41 +   mFile->process_until_end_of_stream();
  42
  43     *outTracks = new Track *[*outNumTracks];
  44     for(c = 0; c < *outNumTracks; c++) {
  45 --- audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp.orig      2006-10-29 01:05:27.000000000 +0200
  46 +++ audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp   2006-12-29 04:06:39.436639042 +0100
  47 @@ -58,7 +58,6 @@
  48        gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
  49
  50     FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
  51 -   encoder->set_filename(OSFILENAME(fName));
  52     encoder->set_channels(numChannels);
  53     encoder->set_sample_rate(int(rate + 0.5));
  54
  55 @@ -72,7 +71,7 @@
  56     encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
  57     encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
  58
  59 -   encoder->init();
  60 +   encoder->init(OSFILENAME(fName));
  61
  62     int numWaveTracks;
  63     WaveTrack **waveTracks;