fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-10-29 20:45 UTC-0500 Paul Tucker <ptucker@sympatico.ca>

Browse Source
This commit is contained in:
Paul Tucker
2002-10-30 01:56:53 +00:00
parent 3c23fa8d69
commit 51666716be
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-10-29 20:45 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
* 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 <ptucker@sympatico.ca>
* makefile.vc
* slight re-ordering and added missed codepage.lib directive.

28
harbour/source/rtl/gtwin/gtwin.c
View File

@@ -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()