aboutsummaryrefslogtreecommitdiff
path: root/utils/adlmidi-2/midiplay.cc
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-06-19 22:57:06 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-06-19 22:57:06 +0300
commitad60170e94d599c76351198ca4052d0cd5c9602e (patch)
tree4ab583ebdc831a4ea40082dc921475d95819545b /utils/adlmidi-2/midiplay.cc
parentc0873278718da57ff19194377a35601027926c5f (diff)
parent105c5db749836ff25c03ae7abf3b2348ecb72c86 (diff)
downloadlibADLMIDI-ad60170e94d599c76351198ca4052d0cd5c9602e.tar.gz
libADLMIDI-ad60170e94d599c76351198ca4052d0cd5c9602e.tar.bz2
libADLMIDI-ad60170e94d599c76351198ca4052d0cd5c9602e.zip
Merge branch 'master' into stable
Diffstat (limited to 'utils/adlmidi-2/midiplay.cc')
-rw-r--r--utils/adlmidi-2/midiplay.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc
index 74806eb..8fe1c8a 100644
--- a/utils/adlmidi-2/midiplay.cc
+++ b/utils/adlmidi-2/midiplay.cc
@@ -1551,6 +1551,7 @@ static bool is_number(const std::string &s)
int main(int argc, char **argv)
{
+#ifndef HARDWARE_OPL3
// How long is SDL buffer, in seconds?
// The smaller the value, the more often AdlAudioCallBack()
// is called.
@@ -1560,8 +1561,9 @@ int main(int argc, char **argv)
const double OurHeadRoomLength = 0.1;
// The lag between visual content and audio content equals
// the sum of these two buffers.
+#endif
- #ifndef _WIN32
+#ifndef _WIN32
WritingToTTY = isatty(STDOUT_FILENO);
if(WritingToTTY)
{
@@ -1573,9 +1575,9 @@ int main(int argc, char **argv)
#endif
);
}
- #else
+#else
WritingToTTY = true;
- #endif
+#endif
if(WritingToTTY)
{
UI.Print(0, 3, true, "(C) -- http://iki.fi/bisqwit/source/adlmidi.html");
@@ -1584,9 +1586,9 @@ int main(int argc, char **argv)
std::fflush(stderr);
signal(SIGINT, TidyupAndExit);
- #ifdef __DJGPP__
+#ifdef __DJGPP__
signal(SIGQUIT, TidyupAndExit);
- #endif
+#endif
if(argc < 2 || std::string(argv[1]) == "--help" || std::string(argv[1]) == "-h")
{