flip and audio fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14623 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-10-02 03:34:54 +00:00
parent 5cd1b61a57
commit 9d8d7f9fde
3 changed files with 19 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2002-10-01 Adam Fedor <fedor@gnu.org>
* Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c
(PaHost_WatchDogProc): usleep can have a void return (Modified
patch from Charles Philip Chan).
* Source/NSBrowserCell.m (-drawInteriorWithFrame:inView:):
Use NSCompositeSourceOver.
Tue Oct 1 17:07:25 2002 Nicola Pero <n.pero@mi.flashnet.it> Tue Oct 1 17:07:25 2002 Nicola Pero <n.pero@mi.flashnet.it>
* Source/GSSimpleLayoutManager.h (_lineLayoutInformation): Renamed * Source/GSSimpleLayoutManager.h (_lineLayoutInformation): Renamed

View file

@ -269,7 +269,8 @@ static NSFont *_leafFont;
*/ */
if ([controlView isFlipped]) if ([controlView isFlipped])
image_rect.origin.y += image_rect.size.height; image_rect.origin.y += image_rect.size.height;
[image compositeToPoint: image_rect.origin operation: NSCompositeCopy]; [image compositeToPoint: image_rect.origin
operation: NSCompositeSourceOver];
title_rect.size.width -= image_rect.size.width + 8; title_rect.size.width -= image_rect.size.width + 8;
} }
@ -293,7 +294,7 @@ static NSFont *_leafFont;
if ([controlView isFlipped]) if ([controlView isFlipped])
position.y += size.height; position.y += size.height;
[_alternateImage compositeToPoint: position [_alternateImage compositeToPoint: position
operation: NSCompositeCopy]; operation: NSCompositeSourceOver];
} }
else else
{ {

View file

@ -548,10 +548,11 @@ static int PaHost_CanaryProc( PaHostSoundControl *pahsc )
GSRegisterCurrentThread(); /* SB20010904 */ GSRegisterCurrentThread(); /* SB20010904 */
#endif #endif
while( pahsc->pahsc_CanaryRun && ((result = usleep( WATCHDOG_INTERVAL_USEC )) == 0) ) while( pahsc->pahsc_CanaryRun)
{ {
usleep( WATCHDOG_INTERVAL_USEC );
gettimeofday( &pahsc->pahsc_CanaryTime, NULL ); gettimeofday( &pahsc->pahsc_CanaryTime, NULL );
} }
DBUG(("PaHost_CanaryProc: exiting.\n")); DBUG(("PaHost_CanaryProc: exiting.\n"));
@ -594,11 +595,12 @@ static PaError PaHost_WatchDogProc( PaHostSoundControl *pahsc )
/* Compare watchdog time with audio and canary thread times. */ /* Compare watchdog time with audio and canary thread times. */
/* Sleep for a while or until thread cancelled. */ /* Sleep for a while or until thread cancelled. */
while( pahsc->pahsc_WatchDogRun && ((result = usleep( WATCHDOG_INTERVAL_USEC )) == 0) ) while( pahsc->pahsc_WatchDogRun)
{ {
int delta; int delta;
struct timeval currentTime; struct timeval currentTime;
usleep( WATCHDOG_INTERVAL_USEC );
gettimeofday( &currentTime, NULL ); gettimeofday( &currentTime, NULL );
/* If audio thread is not advancing, then lower its priority. */ /* If audio thread is not advancing, then lower its priority. */