mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-07-27 17:41:49 +03:00
Compare commits
3 Commits
2.4.4
...
be29c31511
| Author | SHA1 | Date | |
|---|---|---|---|
| be29c31511 | |||
| 1099a9ee8e | |||
| 08c3590a0a |
@@ -134,7 +134,7 @@ public:
|
|||||||
format.nSamplesPerSec = spec.freq;
|
format.nSamplesPerSec = spec.freq;
|
||||||
format.wFormatTag = FAUDIO_FORMAT_PCM;
|
format.wFormatTag = FAUDIO_FORMAT_PCM;
|
||||||
format.wBitsPerSample = SDL_AUDIO_BITSIZE(spec.format);
|
format.wBitsPerSample = SDL_AUDIO_BITSIZE(spec.format);
|
||||||
format.nBlockAlign = format.nChannels * format.wBitsPerSample;
|
format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
|
||||||
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
||||||
format.cbSize = 0;
|
format.cbSize = 0;
|
||||||
valid = true;
|
valid = true;
|
||||||
@@ -158,7 +158,7 @@ end:
|
|||||||
format.wBitsPerSample = sizeof(float) * 8;
|
format.wBitsPerSample = sizeof(float) * 8;
|
||||||
format.nChannels = vorbis_info.channels;
|
format.nChannels = vorbis_info.channels;
|
||||||
format.nSamplesPerSec = vorbis_info.sample_rate;
|
format.nSamplesPerSec = vorbis_info.sample_rate;
|
||||||
format.nBlockAlign = format.nChannels * format.wBitsPerSample;
|
format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
|
||||||
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
||||||
format.cbSize = 0;
|
format.cbSize = 0;
|
||||||
|
|
||||||
@@ -210,7 +210,7 @@ end:
|
|||||||
}
|
}
|
||||||
FAudioBuffer faudio_buffer = {
|
FAudioBuffer faudio_buffer = {
|
||||||
FAUDIO_END_OF_STREAM, /* Flags */
|
FAUDIO_END_OF_STREAM, /* Flags */
|
||||||
wav_length * 8, /* AudioBytes */
|
wav_length, /* AudioBytes */
|
||||||
wav_buffer, /* AudioData */
|
wav_buffer, /* AudioData */
|
||||||
0, /* playbegin */
|
0, /* playbegin */
|
||||||
0, /* playlength */
|
0, /* playlength */
|
||||||
@@ -262,7 +262,7 @@ end:
|
|||||||
format.nSamplesPerSec = audio_rate;
|
format.nSamplesPerSec = audio_rate;
|
||||||
format.wFormatTag = FAUDIO_FORMAT_PCM;
|
format.wFormatTag = FAUDIO_FORMAT_PCM;
|
||||||
format.wBitsPerSample = 16;
|
format.wBitsPerSample = 16;
|
||||||
format.nBlockAlign = format.nChannels * format.wBitsPerSample;
|
format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
|
||||||
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
||||||
format.cbSize = 0;
|
format.cbSize = 0;
|
||||||
voice_formats[i] = format;
|
voice_formats[i] = format;
|
||||||
@@ -392,7 +392,7 @@ public:
|
|||||||
format.wBitsPerSample = sizeof(float) * 8;
|
format.wBitsPerSample = sizeof(float) * 8;
|
||||||
format.nChannels = vorbis_info.channels;
|
format.nChannels = vorbis_info.channels;
|
||||||
format.nSamplesPerSec = vorbis_info.sample_rate;
|
format.nSamplesPerSec = vorbis_info.sample_rate;
|
||||||
format.nBlockAlign = format.nChannels * format.wBitsPerSample;
|
format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
|
||||||
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
|
||||||
format.cbSize = 0;
|
format.cbSize = 0;
|
||||||
|
|
||||||
@@ -731,7 +731,7 @@ musicclass::musicclass(void)
|
|||||||
|
|
||||||
void musicclass::init(void)
|
void musicclass::init(void)
|
||||||
{
|
{
|
||||||
if (FAudioCreate(&faudioctx, 0, FAUDIO_DEFAULT_PROCESSOR))
|
if (FAudioCreate(&faudioctx, FAUDIO_1024_QUANTUM, FAUDIO_DEFAULT_PROCESSOR))
|
||||||
{
|
{
|
||||||
vlog_error("Unable to initialize FAudio");
|
vlog_error("Unable to initialize FAudio");
|
||||||
return;
|
return;
|
||||||
|
|||||||
Vendored
+1
-1
Submodule third_party/FAudio updated: 38e9da7264...14f2875e27
Reference in New Issue
Block a user