1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
--- rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp.old 2006-12-04 19:08:26.000000000 +0100
+++ rezound-0.12.2beta/src/backend/CFLACSoundTranslator.cpp 2006-12-04 19:33:45.000000000 +0100
@@ -42,6 +42,12 @@
#include "CSound.h"
#include "AStatusComm.h"
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
CFLACSoundTranslator::CFLACSoundTranslator()
{
}
@@ -75,15 +81,23 @@
for(unsigned t=0;t<MAX_CHANNELS;t++)
accessers[t]=NULL;
+#ifdef LEGACY_FLAC
set_filename(filename.c_str());
+#endif
set_metadata_ignore_all();
//set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
//set_metadata_respond(FLAC__METADATA_TYPE_CUESHEET);
+#ifdef LEGACY_FLAC
State s=init();
if(s!=FLAC__FILE_DECODER_OK)
throw runtime_error(string(__func__)+" -- "+s.as_cstring());
+#else
+ FLAC__StreamDecoderInitStatus s=init(filename.c_str());
+ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK)
+ throw runtime_error(string(__func__)+" -- FLAC__STREAM_DECODER_INIT_STATUS not OK");
+#endif
}
virtual ~MyFLACDecoderFile()
@@ -170,7 +184,11 @@
// update status bar and detect user cancel
FLAC__uint64 filePosition;
+#ifdef LEGACY_FLAC
FLAC__file_decoder_get_decode_position(decoder_, &filePosition);
+#else
+ FLAC__stream_decoder_get_decode_position(decoder_, &filePosition);
+#endif
return statusBar.update(filePosition) ? FLAC__STREAM_DECODER_WRITE_STATUS_ABORT : FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
@@ -215,7 +233,11 @@
bool CFLACSoundTranslator::onLoadSound(const string filename,CSound *sound) const
{
MyFLACDecoderFile f(filename,sound);
+#ifdef LEGACY_FLAC
return f.process_until_end_of_file();
+#else
+ return f.process_until_end_of_stream();
+#endif
}
@@ -258,7 +280,9 @@
MyFLACEncoderFile f(saveLength);
+#ifdef LEGACY_FLAC
f.set_filename(filename.c_str());
+#endif
f.set_channels(sound->getChannelCount());
@@ -274,8 +298,13 @@
//f.set_metadata(...) // ??? to do to set cues and user notes, etc
+#ifdef LEGACY_FLAC
MyFLACEncoderFile::State s=f.init();
if(s==FLAC__STREAM_ENCODER_OK)
+#else
+ FLAC__StreamEncoderInitStatus s=f.init(filename.c_str());
+ if(s==FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+#endif
{
#define BUFFER_SIZE 65536
TAutoBuffer<FLAC__int32> buffers[MAX_CHANNELS];
@@ -328,7 +357,11 @@
return true;
}
else
+#ifdef LEGACY_FLAC
throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- "+s.as_cstring());
+#else
+ throw runtime_error(string(__func__)+" -- error creating FLAC encoder -- ");
+#endif
}
|
GitWeb