From 51666716be9d9b2cdf97a9c8c1798eb717bb2a16 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Wed, 30 Oct 2002 01:56:53 +0000 Subject: [PATCH] 2002-10-29 20:45 UTC-0500 Paul Tucker --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/gtwin/gtwin.c | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2a18791dd0..635f856a41 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2002-10-29 20:45 UTC-0500 Paul Tucker + * source/rtl/gtwin/gtwin.c + * Win9x Tone() support currently only for Borland and MSVC compilers. + * The only issue for the moment, is if the calculation of TICKS is + * incorrect for other compilers. SEE dTicks in hb_gt_Tone(). + * Someone may wish to adapt the code above hb_gt_tone() in gtwin.c + * for other compilers. + 2002-10-29 16:20 UTC-0500 Paul Tucker * makefile.vc * slight re-ordering and added missed codepage.lib directive. diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index 372ac89964..c7714fadea 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -1499,6 +1499,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask ) /* *********************************************************************** */ +#if defined(__BORLANDC__) || defined(_MSC_VER) static int hb_Inp9x( USHORT usPort ) { USHORT usVal; @@ -1536,7 +1537,6 @@ static int hb_Outp9x( USHORT usPort, USHORT usVal ) return usVal; } - /* *********************************************************************** */ static void hb_gt_w9xTone( double dFreq, double dDurat, double dTick ) @@ -1620,6 +1620,7 @@ static void hb_gt_w9xTone( double dFreq, double dDurat, double dTick ) hb_idleReset(); } +#endif /* *********************************************************************** */ @@ -1665,12 +1666,11 @@ void hb_gt_Tone( double dFrequency, double dDuration ) if( dDuration > 0 ) { - - #if defined( _MSC_VER ) - double dTick = (double) ( 1000.0 / CLOCKS_PER_SEC ); - #else - double dTick = (double) ( CLOCKS_PER_SEC / 18.2 ); - #endif + #if defined( _MSC_VER ) + double dTick = (double) ( 1000.0 / CLOCKS_PER_SEC ); + #else + double dTick = (double) ( CLOCKS_PER_SEC / 18.2 ); + #endif dMillisecs = dDuration * dTick; /* milliseconds */ @@ -1681,13 +1681,13 @@ void hb_gt_Tone( double dFrequency, double dDuration ) /* If Windows 95 or 98, use w9xTone for BCC32, MSVC */ if (osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { - #if defined(__BORLANDC__) || defined( _MSC_VER ) - hb_gt_w9xTone( HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ), - dMillisecs, dTick ); - #else - hb_gt_wNtTone( HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ), - dMillisecs, dTick ); - #endif + #if defined(__BORLANDC__) || defined( _MSC_VER ) + hb_gt_w9xTone( HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ), + dMillisecs, dTick ); + #else + hb_gt_wNtTone( HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ), + dMillisecs, dTick ); + #endif } /* If Windows NT or NT2k, use wNtTone, which provides TONE()