-
Notifications
You must be signed in to change notification settings - Fork 727
/
patch-src_backend_CrezSoundTranslator.cpp
65 lines (52 loc) · 2.19 KB
/
patch-src_backend_CrezSoundTranslator.cpp
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
--- src/backend/CrezSoundTranslator.cpp.orig 2013-02-10 06:35:01 UTC
+++ src/backend/CrezSoundTranslator.cpp
@@ -43,7 +43,7 @@ CrezSoundTranslator::~CrezSoundTranslator()
// need to include this I use some of the template *methods* for types that are no where else
// so the explicit instantation at the bottom of CSound.cpp doesn't instantiate everything
-#include <TPoolFile.cpp>
+// #include <TPoolFile.cpp>
struct RFormatInfo1
{
@@ -63,7 +63,7 @@ struct RFormatInfo1
{
// unpack the values from r into the data members
- register unsigned offset=0;
+ unsigned offset=0;
memcpy(&version,r+offset,sizeof(version));
lethe(&version);
@@ -103,7 +103,7 @@ struct RFormatInfo2
{
// unpack the values from r into the data members
- register unsigned offset=0;
+ unsigned offset=0;
memcpy(&version,r+offset,sizeof(version));
lethe(&version);
@@ -149,7 +149,7 @@ struct RFormatInfo3
{
// pack the values of the data members into r
- register unsigned offset=0;
+ unsigned offset=0;
uint32_t tVersion=hetle(version);
memcpy(r+offset,&tVersion,sizeof(version));
@@ -175,7 +175,7 @@ struct RFormatInfo3
{
// unpack the values from r into the data members
- register unsigned offset=0;
+ unsigned offset=0;
memcpy(&version,r+offset,sizeof(version));
lethe(&version);
@@ -221,7 +221,7 @@ typedef TPoolAccesser<RFormatInfo3::PackedChunk,CSound
// loads data from poolfile as type src_t and writes into dest as sample_t
template<typename src_t> inline bool CrezSoundTranslator::load_samples_from_X_to_native(unsigned i,CSound::PoolFile_t &loadFromFile,CSound *sound,const TStaticPoolAccesser<src_t,CSound::PoolFile_t> &src,const sample_pos_t size,CStatusBar &statusBar,Endians endian)
{
- const register sample_pos_t chunkSize=size/100;
+ const sample_pos_t chunkSize=size/100;
CSound::CInternalRezPoolAccesser dest=sound->getAudioInternal(i);
sample_pos_t pos=0;
@@ -276,7 +276,7 @@ inline bool CrezSoundTranslator::load_samples__sample_
{
CSound::CInternalRezPoolAccesser dest=sound->getAudioInternal(i);
- const register sample_pos_t chunkSize=size/100;
+ const sample_pos_t chunkSize=size/100;
for(unsigned int t=0;t<100 && chunkSize>0;t++)
{