diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-10 00:24:02 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-10 00:24:02 +0300 |
commit | 51d6e05b7e7bc6fad529e9e023ceca9af34ed910 (patch) | |
tree | 2074bd760ff007b4b9db28c7f1f7151d395030fe /utils/midiplay | |
parent | b5be0ef0b188ab5afeef825d80a0b00bfff30023 (diff) | |
parent | 4ab6c7b2d81960b124974ddca5733a07c8dd5fc8 (diff) | |
download | libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.tar.gz libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.tar.bz2 libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.zip |
Merge branch 'master' into get-rid-of-backup-buffer
# Conflicts:
# src/adlmidi.cpp
Diffstat (limited to 'utils/midiplay')
-rw-r--r-- | utils/midiplay/adlmidiplay.cpp | 2 | ||||
-rwxr-xr-x | utils/midiplay/wave_writer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index 2548636..69b3698 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -238,8 +238,8 @@ int main(int argc, char **argv) return 0; } - #ifndef HARDWARE_OPL3 long sampleRate = 44100; + #ifndef HARDWARE_OPL3 //const unsigned MaxSamplesAtTime = 512; // 512=dbopl limitation // How long is SDL buffer, in seconds? // The smaller the value, the more often SDL_AudioCallBack() diff --git a/utils/midiplay/wave_writer.c b/utils/midiplay/wave_writer.c index 0bfaf68..e8ee10c 100755 --- a/utils/midiplay/wave_writer.c +++ b/utils/midiplay/wave_writer.c @@ -53,7 +53,7 @@ int wave_open( long sample_rate, const char* filename ) return -1; } -#ifndef _WIN32 +#if !defined(_WIN32) || defined(__WATCOMC__) file = fopen( filename, "wb" ); #else wchar_t widePath[MAX_PATH]; |