Skip to content

Commit 8adf485

Browse files
madebrmadebr
authored
fix(system): Use 64-bit compatible miles (#1563)
1 parent 95ac37d commit 8adf485

File tree

15 files changed

+49
-49
lines changed

15 files changed

+49
-49
lines changed

‎Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ static void AILCALLBACK setSampleCompleted( HSAMPLE sampleCompleted );
7474
static void AILCALLBACK set3DSampleCompleted( H3DSAMPLE sample3DCompleted );
7575
static void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted );
7676

77-
static U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle);
78-
static void AILCALLBACK streamingFileClose(U32 fileHandle);
79-
static S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type);
80-
static U32 AILCALLBACK streamingFileRead(U32 fileHandle, void *buffer, U32 bytes);
77+
static U32 AILCALLBACK streamingFileOpen(char const *fileName, void **file_handle);
78+
static void AILCALLBACK streamingFileClose(void *fileHandle);
79+
static S32 AILCALLBACK streamingFileSeek(void *fileHandle, S32 offset, U32 type);
80+
static U32 AILCALLBACK streamingFileRead(void *fileHandle, void *buffer, U32 bytes);
8181

8282
//-------------------------------------------------------------------------------------------------
8383
MilesAudioManager::MilesAudioManager() :
@@ -235,7 +235,7 @@ void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FIL
235235
continue;
236236
}
237237

238-
playingArray[AIL_sample_user_data(playing->m_sample, 0)] = playing;
238+
playingArray[(int)AIL_sample_user_data(playing->m_sample, 0)] = playing;
239239
}
240240

241241
for (Int i = 1; i <= maxChannels && i <= channelCount; ++i) {
@@ -296,7 +296,7 @@ void MilesAudioManager::audioDebugDisplay(DebugDisplayInterface *dd, void *, FIL
296296
continue;
297297
}
298298

299-
playingArray[AIL_3D_user_data(playing->m_3DSample, 0)] = playing;
299+
playingArray[(int)AIL_3D_user_data(playing->m_3DSample, 0)] = playing;
300300
}
301301

302302
for (Int i = 1; i <= maxChannels && i <= channelCount; ++i)
@@ -2912,7 +2912,7 @@ void MilesAudioManager::initSamplePools( void )
29122912
DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 2D samples", i + 1));
29132913
if (sample) {
29142914
AIL_init_sample(sample);
2915-
AIL_set_sample_user_data(sample, 0, i + 1);
2915+
AIL_set_sample_user_data(sample, 0, (void *)(i + 1));
29162916
m_availableSamples.push_back(sample);
29172917
++m_num2DSamples;
29182918
}
@@ -2922,7 +2922,7 @@ void MilesAudioManager::initSamplePools( void )
29222922
H3DSAMPLE sample = AIL_allocate_3D_sample_handle(m_provider3D[m_selectedProvider].id);
29232923
DEBUG_ASSERTCRASH(sample, ("Couldn't get %d 3D samples", i + 1));
29242924
if (sample) {
2925-
AIL_set_3D_user_data(sample, 0, i + 1);
2925+
AIL_set_3D_user_data(sample, 0, (void *)(i + 1));
29262926
m_available3DSamples.push_back(sample);
29272927
++m_num3DSamples;
29282928
}
@@ -3058,32 +3058,32 @@ void AILCALLBACK setStreamCompleted( HSTREAM streamCompleted )
30583058
}
30593059

30603060
//-------------------------------------------------------------------------------------------------
3061-
U32 AILCALLBACK streamingFileOpen(char const *fileName, U32 *file_handle)
3061+
U32 AILCALLBACK streamingFileOpen(char const *fileName, void **file_handle)
30623062
{
30633063
#if defined(RTS_DEBUG)
30643064
if (sizeof(U32) != sizeof(File*)) {
30653065
RELEASE_CRASH(("streamingFileOpen - This function requires work in order to compile on non 32-bit platforms."));
30663066
}
30673067
#endif
30683068

3069-
(*file_handle) = (U32) TheFileSystem->openFile(fileName, File::READ | File::STREAMING);
3069+
(*file_handle) = (void *) TheFileSystem->openFile(fileName, File::READ | File::STREAMING);
30703070
return ((*file_handle) != 0);
30713071
}
30723072

30733073
//-------------------------------------------------------------------------------------------------
3074-
void AILCALLBACK streamingFileClose(U32 fileHandle)
3074+
void AILCALLBACK streamingFileClose(void *fileHandle)
30753075
{
30763076
((File*) fileHandle)->close();
30773077
}
30783078

30793079
//-------------------------------------------------------------------------------------------------
3080-
S32 AILCALLBACK streamingFileSeek(U32 fileHandle, S32 offset, U32 type)
3080+
S32 AILCALLBACK streamingFileSeek(void *fileHandle, S32 offset, U32 type)
30813081
{
30823082
return ((File*) fileHandle)->seek(offset, (File::seekMode) type);
30833083
}
30843084

30853085
//-------------------------------------------------------------------------------------------------
3086-
U32 AILCALLBACK streamingFileRead(U32 file_handle, void *buffer, U32 bytes)
3086+
U32 AILCALLBACK streamingFileRead(void *file_handle, void *buffer, U32 bytes)
30873087
{
30883088
return ((File*) file_handle)->read(buffer, bytes);
30893089
}

‎Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ AudibleSoundClass::Initialize_Miles_Handle (void)
637637
//
638638
// Associate this object instance with the handle
639639
//
640-
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
640+
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
641641
}
642642

643643
return ;

‎Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ SimplePersistFactoryClass<FilteredSoundClass, CHUNKID_FILTERED_SOUND> _FilteredS
5757
//
5858
/////////////////////////////////////////////////////////////////////////////////
5959
FilteredSoundClass::FilteredSoundClass (void)
60-
: m_hFilter (INVALID_MILES_HANDLE)
60+
: m_hFilter ((HPROVIDER)INVALID_MILES_HANDLE)
6161
{
6262
return ;
6363
}
@@ -69,7 +69,7 @@ FilteredSoundClass::FilteredSoundClass (void)
6969
//
7070
////////////////////////////////////////////////////////////////////////////////////////////////
7171
FilteredSoundClass::FilteredSoundClass (const FilteredSoundClass &src)
72-
: m_hFilter (INVALID_MILES_HANDLE),
72+
: m_hFilter ((HPROVIDER)INVALID_MILES_HANDLE),
7373
SoundPseudo3DClass (src)
7474
{
7575
(*this) = src;
@@ -113,7 +113,7 @@ FilteredSoundClass::Initialize_Miles_Handle (void)
113113
SoundPseudo3DClass::Initialize_Miles_Handle ();
114114
m_hFilter = WWAudioClass::Get_Instance ()->Get_Reverb_Filter ();
115115
if ((m_SoundHandle != NULL) &&
116-
(m_hFilter != INVALID_MILES_HANDLE)) {
116+
(m_hFilter != (HPROVIDER)INVALID_MILES_HANDLE)) {
117117

118118
//
119119
// Pass the filter onto the sample

‎Core/Libraries/Source/WWVegas/WWAudio/Listener.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Listener3DClass::Initialize_Miles_Handle (void)
8484

8585

8686
// Associate this object instance with the handle
87-
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
87+
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
8888
}
8989

9090
return ;

‎Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ Sound3DClass::Initialize_Miles_Handle (void)
532532
Seek (m_CurrentPosition);
533533

534534
// Associate this object instance with the handle
535-
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (S32)this);
535+
m_SoundHandle->Set_Sample_User_Data (INFO_OBJECT_PTR, (void *)this);
536536
}
537537

538538
return ;

‎Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ WWAudioClass::WWAudioClass (void)
109109
m_PlaybackRate (44100),
110110
m_PlaybackBits (16),
111111
m_PlaybackStereo (true),
112-
m_ReverbFilter (INVALID_MILES_HANDLE),
112+
m_ReverbFilter ((HPROVIDER)INVALID_MILES_HANDLE),
113113
m_UpdateTimer (-1),
114114
m_Driver3DPseudo (NULL),
115115
m_MusicVolume (DEF_MUSIC_VOL),
@@ -2104,7 +2104,7 @@ WWAudioClass::Initialize (const char *registry_subkey_name)
21042104
HPROENUM next = HPROENUM_FIRST;
21052105
char *name = NULL;
21062106
if (::AIL_enumerate_filters (&next, &m_ReverbFilter, &name) == 0) {
2107-
m_ReverbFilter = INVALID_MILES_HANDLE;
2107+
m_ReverbFilter = (HPROVIDER)INVALID_MILES_HANDLE;
21082108
}
21092109
}
21102110

@@ -2143,7 +2143,7 @@ WWAudioClass::Initialize
21432143
HPROENUM next = HPROENUM_FIRST;
21442144
char *name = NULL;
21452145
if (::AIL_enumerate_filters (&next, &m_ReverbFilter, &name) == 0) {
2146-
m_ReverbFilter = INVALID_MILES_HANDLE;
2146+
m_ReverbFilter = (HPROVIDER)INVALID_MILES_HANDLE;
21472147
}
21482148
}
21492149

@@ -2740,7 +2740,7 @@ WWAudioClass::Save_To_Registry
27402740
//
27412741
////////////////////////////////////////////////////////////////////////////////////////////
27422742
U32 AILCALLBACK
2743-
WWAudioClass::File_Open_Callback (char const *filename, U32 *file_handle)
2743+
WWAudioClass::File_Open_Callback (char const *filename, void **file_handle)
27442744
{
27452745
U32 retval = false;
27462746

@@ -2751,7 +2751,7 @@ WWAudioClass::File_Open_Callback (char const *filename, U32 *file_handle)
27512751
//
27522752
FileClass *file = Get_Instance ()->Get_File (filename);
27532753
if (file != NULL && file->Open ()) {
2754-
(*file_handle) = (U32)file;
2754+
(*file_handle) = (void *)file;
27552755
retval = true;
27562756
}
27572757
}
@@ -2766,7 +2766,7 @@ WWAudioClass::File_Open_Callback (char const *filename, U32 *file_handle)
27662766
//
27672767
////////////////////////////////////////////////////////////////////////////////////////////
27682768
void AILCALLBACK
2769-
WWAudioClass::File_Close_Callback (U32 file_handle)
2769+
WWAudioClass::File_Close_Callback (void *file_handle)
27702770
{
27712771
if (Get_Instance () != NULL) {
27722772

@@ -2789,7 +2789,7 @@ WWAudioClass::File_Close_Callback (U32 file_handle)
27892789
//
27902790
////////////////////////////////////////////////////////////////////////////////////////////
27912791
S32 AILCALLBACK
2792-
WWAudioClass::File_Seek_Callback (U32 file_handle, S32 offset, U32 type)
2792+
WWAudioClass::File_Seek_Callback (void *file_handle, S32 offset, U32 type)
27932793
{
27942794
S32 retval = 0;
27952795

@@ -2834,7 +2834,7 @@ WWAudioClass::File_Seek_Callback (U32 file_handle, S32 offset, U32 type)
28342834
//
28352835
////////////////////////////////////////////////////////////////////////////////////////////
28362836
U32 AILCALLBACK
2837-
WWAudioClass::File_Read_Callback (U32 file_handle, void *buffer, U32 bytes)
2837+
WWAudioClass::File_Read_Callback (void *file_handle, void *buffer, U32 bytes)
28382838
{
28392839
U32 retval = 0;
28402840

‎Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,10 @@ class WWAudioClass
485485
//////////////////////////////////////////////////////////////////////
486486
// Miles File Callbacks
487487
//////////////////////////////////////////////////////////////////////
488-
static U32 AILCALLBACK File_Open_Callback (char const *filename, U32 *file_handle);
489-
static void AILCALLBACK File_Close_Callback (U32 file_handle);
490-
static S32 AILCALLBACK File_Seek_Callback (U32 file_handle, S32 offset, U32 type);
491-
static U32 AILCALLBACK File_Read_Callback (U32 file_handle, void *buffer, U32 bytes);
488+
static U32 AILCALLBACK File_Open_Callback (char const *filename, void **file_handle);
489+
static void AILCALLBACK File_Close_Callback (void *file_handle);
490+
static S32 AILCALLBACK File_Seek_Callback (void *file_handle, S32 offset, U32 type);
491+
static U32 AILCALLBACK File_Read_Callback (void *file_handle, void *buffer, U32 bytes);
492492

493493
private:
494494

‎Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ Sound2DHandleClass::Get_Sample_MS_Position (S32 *len, S32 *pos)
310310
//
311311
//////////////////////////////////////////////////////////////////////
312312
void
313-
Sound2DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
313+
Sound2DHandleClass::Set_Sample_User_Data (S32 i, void *val)
314314
{
315315
if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
316316
::AIL_set_sample_user_data (SampleHandle, i, val);
@@ -325,10 +325,10 @@ Sound2DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
325325
// Get_Sample_User_Data
326326
//
327327
//////////////////////////////////////////////////////////////////////
328-
U32
328+
void *
329329
Sound2DHandleClass::Get_Sample_User_Data (S32 i)
330330
{
331-
U32 retval = 0;
331+
void *retval = NULL;
332332

333333
if (SampleHandle != (HSAMPLE)INVALID_MILES_HANDLE) {
334334
retval = ::AIL_sample_user_data (SampleHandle, i);

‎Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class Sound2DHandleClass : public SoundHandleClass
9090
U32 Get_Sample_Loop_Count (void);
9191
void Set_Sample_MS_Position (U32 ms);
9292
void Get_Sample_MS_Position (S32 *len, S32 *pos);
93-
void Set_Sample_User_Data (S32 i, U32 val);
94-
U32 Get_Sample_User_Data (S32 i);
93+
void Set_Sample_User_Data (S32 i, void *val);
94+
void * Get_Sample_User_Data (S32 i);
9595
S32 Get_Sample_Playback_Rate (void);
9696
void Set_Sample_Playback_Rate (S32 rate);
9797

‎Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Sound3DHandleClass::Get_Sample_MS_Position (S32 *len, S32 *pos)
307307
//
308308
//////////////////////////////////////////////////////////////////////
309309
void
310-
Sound3DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
310+
Sound3DHandleClass::Set_Sample_User_Data (S32 i, void *val)
311311
{
312312
if (SampleHandle != (H3DSAMPLE)INVALID_MILES_HANDLE) {
313313
::AIL_set_3D_object_user_data (SampleHandle, i, val);
@@ -321,10 +321,10 @@ Sound3DHandleClass::Set_Sample_User_Data (S32 i, U32 val)
321321
// Get_Sample_User_Data
322322
//
323323
//////////////////////////////////////////////////////////////////////
324-
U32
324+
void *
325325
Sound3DHandleClass::Get_Sample_User_Data (S32 i)
326326
{
327-
U32 retval = 0;
327+
void *retval = NULL;
328328

329329
if (SampleHandle != (H3DSAMPLE)INVALID_MILES_HANDLE) {
330330
retval = AIL_3D_object_user_data (SampleHandle, i);

0 commit comments

Comments
 (0)