sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Audio: Fix some type warning

Browse Source 
Former-commit-id: 37c2bdbdfc591ff3cc031ee1498ae1050183b4bd [formerly e96bf359c986942fc707834c9c5992eca9c57b22] [formerly a1c53ad3ae4218aea8163f5f33245e352b820a34 [formerly a3c51b11bd591e8accad191bfa5547323436e4cb]]
Former-commit-id: 5d7faba8324c26970f0ca0681d695e6650cff32f [formerly c564a0adc734737472ea066e5d362637f9697138]
Former-commit-id: 7979614ff5460597b01e042e7e520ad7d55c7493
This commit is contained in:
Lynix
2016-09-04 19:56:11 +02:00
parent 8a9ec2883a
commit ffe938d422
9 changed files with 47 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Nazara/Audio/Formats/sndfileLoader.cpp
View File

@@ -97,7 +97,7 @@ namespace Nz
return m_format;
}
UInt32 GetSampleCount() const override
UInt64 GetSampleCount() const override
{
return m_sampleCount;
}
@@ -131,7 +131,7 @@ namespace Nz
bool Open(Stream& stream, bool forceMono)
{
SF_INFO infos;
infos.format = 0; // Format inconnu
infos.format = 0; // Unknown format
m_handle = sf_open_virtual(&callbacks, SFM_READ, &infos, &stream);
if (!m_handle)
@@ -154,7 +154,7 @@ namespace Nz
return false;
}
m_sampleCount = static_cast<UInt32>(infos.channels*infos.frames);
m_sampleCount = infos.channels*infos.frames;
m_sampleRate = infos.samplerate;
// Durée de la musique (s) = samples / channels*rate
@@ -180,7 +180,7 @@ namespace Nz
return true;
}
unsigned int Read(void* buffer, unsigned int sampleCount) override
UInt64 Read(void* buffer, UInt64 sampleCount) override
{
// Si la musique a été demandée en mono, nous devons la convertir à la volée lors de la lecture
if (m_mixToMono)
@@ -190,13 +190,13 @@ namespace Nz
sf_count_t readSampleCount = sf_read_short(m_handle, m_mixBuffer.data(), m_format * sampleCount);
MixToMono(m_mixBuffer.data(), static_cast<Int16*>(buffer), m_format, sampleCount);
return static_cast<unsigned int>(readSampleCount / m_format);
return readSampleCount / m_format;
}
else
return static_cast<unsigned int>(sf_read_short(m_handle, static_cast<Int16*>(buffer), sampleCount));
return sf_read_short(m_handle, static_cast<Int16*>(buffer), sampleCount);
}
void Seek(UInt32 offset) override
void Seek(UInt64 offset) override
{
sf_seek(m_handle, offset*m_sampleRate / 1000, SEEK_SET);
}
@@ -208,8 +208,8 @@ namespace Nz
SNDFILE* m_handle;
bool m_mixToMono;
UInt32 m_duration;
unsigned int m_sampleCount;
unsigned int m_sampleRate;
UInt32 m_sampleRate;
UInt64 m_sampleCount;
};
bool IsSupported(const String& extension)