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
|
diff -u plugins/codec_flac/FlacDecoder.cpp /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacDecoder.cpp
--- /tmp/kwave-0.7.9.orig/plugins/codec_flac/FlacDecoder.cpp 2007-07-01 09:50:18.000000000 +0200
+++ plugins/codec_flac/FlacDecoder.cpp 2007-06-17 10:28:45.000000000 +0200
@@ -54,7 +54,7 @@
//***************************************************************************
::FLAC__StreamDecoderReadStatus FlacDecoder::read_callback(
- FLAC__byte buffer[], unsigned int *bytes)
+ FLAC__byte buffer[], size_t *bytes)
{
Q_ASSERT(bytes);
Q_ASSERT(m_source);
@@ -67,7 +67,7 @@
}
// read into application buffer
- unsigned long int len = *bytes;
+ Q_LONG len = *bytes;
*bytes = m_source->readBlock((char*)(&(buffer[0])), len);
if (!*bytes) return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
diff -u plugins/codec_flac/FlacDecoder.h /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacDecoder.h
--- /tmp/kwave-0.7.9.orig/plugins/codec_flac/FlacDecoder.h 2007-07-01 09:49:39.000000000 +0200
+++ plugins/codec_flac/FlacDecoder.h 2007-06-17 10:28:45.000000000 +0200
@@ -101,7 +101,7 @@
* @return read state
*/
virtual ::FLAC__StreamDecoderReadStatus read_callback(
- FLAC__byte buffer[], unsigned int *bytes);
+ FLAC__byte buffer[], size_t *bytes);
/**
* FLAC decoder interface: write callback.
diff -u plugins/codec_flac/FlacEncoder.cpp /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacEncoder.cpp
--- /tmp/kwave-0.7.9.orig/plugins/codec_flac/FlacEncoder.cpp 2007-07-01 09:50:18.000000000 +0200
+++ plugins/codec_flac/FlacEncoder.cpp 2007-06-17 10:28:45.000000000 +0200
@@ -73,8 +73,8 @@
/***************************************************************************/
::FLAC__StreamEncoderWriteStatus FlacEncoder::write_callback(
- const FLAC__byte buffer[], unsigned int bytes,
- unsigned int /* samples */, unsigned int /* current_frame */)
+ const FLAC__byte buffer[], size_t bytes,
+ unsigned /* samples */, unsigned /* current_frame */)
{
// qDebug("FlacEncoder::write_callback(%u)", samples); // ###
Q_ASSERT(m_dst);
diff -u plugins/codec_flac/FlacEncoder.h /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacEncoder.h
--- /tmp/kwave-0.7.9.orig/plugins/codec_flac/FlacEncoder.h 2007-07-01 09:49:39.000000000 +0200
+++ plugins/codec_flac/FlacEncoder.h 2007-06-17 10:28:45.000000000 +0200
@@ -70,8 +70,8 @@
* @return FLAC stream encoder write status
*/
virtual ::FLAC__StreamEncoderWriteStatus write_callback(
- const FLAC__byte buffer[], unsigned int bytes,
- unsigned int samples, unsigned int current_frame);
+ const FLAC__byte buffer[], size_t bytes,
+ unsigned samples, unsigned current_frame);
/**
* Callback for encoding meta data
|
GitWeb
