Android fixups

GpApp/GliderStructs.h

@@ -422,7 +422,7 @@ namespace touchScreenControlGraphics
 
 typedef touchScreenControlGraphics::touchScreenControlGraphic touchScreenControlGraphic_t;
 
-typedef struct
+struct touchScreenControlState
 {
 	static const int kMaxFingers = 4;
 
@@ -430,4 +430,6 @@ typedef struct
 	touchScreenFingerState fingers[kMaxFingers];
 
 	DrawSurface *graphics[touchScreenControlGraphics::Count];
-} touchScreenControlState, *touchScreenControlStatePtr;
+};
+
+typedef touchScreenControlState *touchScreenControlStatePtr;

GpApp/Music.cpp

@@ -60,17 +60,17 @@ PLError_t StartMusic (void)
 {
 	PLError_t		theErr;
 	short		soundVolume;
-	
+
 	theErr = PLErrors::kNone;
-	
+
 	if (dontLoadMusic)
 		return(theErr);
 
 	if (musicMutex == nullptr)
 		return(theErr);
-	
+
 	UnivGetSoundVolume(&soundVolume, thisMac.hasSM3);
-	
+
 	if ((soundVolume != 0) && (!failedMusic))
 	{
 		musicChannel->AddBuffer(theMusicData[musicState.musicSoundID], true);
@@ -83,10 +83,10 @@ PLError_t StartMusic (void)
 
 		musicChannel->AddBuffer(theMusicData[musicState.musicSoundID], true);
 		musicChannel->AddCallback(MusicCallBack, true);
-		
+
 		isMusicOn = true;
 	}
-	
+
 	return (theErr);
 }
 
@@ -95,16 +95,16 @@ PLError_t StartMusic (void)
 void StopTheMusic (void)
 {
 	PLError_t		theErr;
-	
+
 	if (dontLoadMusic)
 		return;
-	
+
 	theErr = PLErrors::kNone;
 	if ((isMusicOn) && (!failedMusic))
 	{
 		musicChannel->ClearAllCommands();
 		musicChannel->Stop();
-		
+
 		isMusicOn = false;
 	}
 }
@@ -114,10 +114,10 @@ void StopTheMusic (void)
 void ToggleMusicWhilePlaying (void)
 {
 	PLError_t		theErr;
-	
+
 	if (dontLoadMusic)
 		return;
-	
+
 	if (isPlayMusicGame)
 	{
 		if (!isMusicOn)
@@ -133,7 +133,7 @@ void ToggleMusicWhilePlaying (void)
 //--------------------------------------------------------------  SetMusicalPiece
 
 void SetMusicalMode (short newMode)
-{	
+{
 	if (dontLoadMusic || failedMusic)
 		return;
 
@@ -143,11 +143,11 @@ void SetMusicalMode (short newMode)
 		case kKickGameScoreMode:
 		musicState.musicCursor = 2;
 		break;
-		
+
 		case kProdGameScoreMode:
 		musicState.musicCursor = -1;
 		break;
-		
+
 		default:
 		musicState.musicMode = newMode;
 		musicState.musicCursor = 0;
@@ -176,14 +176,14 @@ void MusicCallBack (PortabilityLayer::AudioChannel *theChannel)
 			musicState.musicSoundID = gameScore[musicState.musicCursor];
 		}
 		break;
-		
+
 		case kPlayWholeScoreMode:
 		musicState.musicCursor++;
 		if (musicState.musicCursor >= kLastMusicPiece - 1)
 			musicState.musicCursor = 0;
 		musicState.musicSoundID = musicScore[musicState.musicCursor];
 		break;
-		
+
 		default:
 		musicState.musicSoundID = musicState.musicMode;
 		break;
@@ -204,18 +204,18 @@ PLError_t LoadMusicSounds (void)
 	long		soundDataSize;
 	PLError_t		theErr;
 	short		i;
-	
+
 	theErr = PLErrors::kNone;
-	
+
 	for (i = 0; i < kMaxMusic; i++)
 		theMusicData[i] = nil;
-	
+
 	for (i = 0; i < kMaxMusic; i++)
 	{
 		theSound = ParseAndConvertSound(PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('snd ', i + kBaseBufferMusicID));
 		if (theSound == nil)
 			return PLErrors::kOutOfMemory;
-		
+
 		soundDataSize = GetHandleSize(theSound);
 
 		theMusicData[i] = PortabilityLayer::MemoryManager::GetInstance()->Alloc(soundDataSize);
@@ -234,16 +234,16 @@ PLError_t DumpMusicSounds (void)
 {
 	PLError_t		theErr;
 	short		i;
-	
+
 	theErr = PLErrors::kNone;
-	
+
 	for (i = 0; i < kMaxMusic; i++)
 	{
 		if (theMusicData[i] != nil)
 			PortabilityLayer::MemoryManager::GetInstance()->Release(theMusicData[i]);
 		theMusicData[i] = nil;
 	}
-	
+
 	return (theErr);
 }
 
@@ -252,12 +252,12 @@ PLError_t DumpMusicSounds (void)
 PLError_t OpenMusicChannel (void)
 {
 	PLError_t		theErr;
-	
+
 	theErr = PLErrors::kNone;
-	
+
 	if (musicChannel != nil)
 		return (theErr);
-	
+
 	musicChannel = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
 
 	if (musicChannel == nil)
@@ -271,13 +271,13 @@ PLError_t OpenMusicChannel (void)
 PLError_t CloseMusicChannel (void)
 {
 	PLError_t		theErr;
-	
+
 	theErr = PLErrors::kNone;
-	
+
 	if (musicChannel != nil)
 		musicChannel->Destroy(false);
 	musicChannel = nil;
-	
+
 	return (theErr);
 }
 
@@ -286,12 +286,12 @@ PLError_t CloseMusicChannel (void)
 void InitMusic (void)
 {
 	PLError_t		theErr;
-	
+
 	if (dontLoadMusic)
 		return;
-	
+
 	musicChannel = nil;
-	
+
 	failedMusic = false;
 	isMusicOn = false;
 	theErr = LoadMusicSounds();
@@ -308,7 +308,7 @@ void InitMusic (void)
 		failedMusic = true;
 		return;
 	}
-	
+
 	musicScore[0] = 0;
 	musicScore[1] = 1;
 	musicScore[2] = 2;
@@ -325,14 +325,14 @@ void InitMusic (void)
 	musicScore[13] = kPlayRefrainSparse2;
 	musicScore[14] = kPlayChorus;
 	musicScore[15] = kPlayChorus;
-	
+
 	gameScore[0] = kPlayRefrainSparse2;
 	gameScore[1] = kPlayRefrainSparse1;
 	gameScore[2] = -1;
 	gameScore[3] = kPlayRefrainSparse2;
 	gameScore[4] = kPlayChorus;
 	gameScore[5] = kPlayChorus;
-	
+
 	musicState.musicCursor = 0;
 	musicState.musicSoundID = musicScore[musicState.musicCursor];
 	musicState.musicMode = kPlayWholeScoreMode;
@@ -340,7 +340,7 @@ void InitMusic (void)
 	musicMutex = PortabilityLayer::HostSystemServices::GetInstance()->CreateMutex();
 
 	PL_NotYetImplemented_TODO("MusicSync");
-	
+
 	if (isPlayMusicIdle)
 	{
 		theErr = StartMusic();
@@ -357,13 +357,15 @@ void InitMusic (void)
 void KillMusic (void)
 {
 	PLError_t		theErr;
-	
+
 	if (dontLoadMusic)
 		return;
 
 	theErr = CloseMusicChannel();
 	theErr = DumpMusicSounds();
-	musicMutex->Destroy();
+
+	if (musicMutex)
+		musicMutex->Destroy();
 }
 
 //--------------------------------------------------------------  MusicBytesNeeded
@@ -372,7 +374,7 @@ long MusicBytesNeeded (void)
 {
 	size_t		totalBytes;
 	short		i;
-	
+
 	totalBytes = 0L;
 	for (i = 0; i < kMaxMusic; i++)
 	{
@@ -391,7 +393,7 @@ void TellHerNoMusic (void)
 {
 	#define		kNoMemForMusicAlert	1038
 	short		hitWhat;
-	
+
 //	CenterAlert(kNoMemForMusicAlert);
 	hitWhat = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kNoMemForMusicAlert, nullptr);
 }

GpApp/Prefs.cpp

@@ -66,7 +66,7 @@ Boolean WritePrefs (const prefsInfo *thePrefs, short versionNow, THandle<moduleP
 	PortabilityLayer::FileManager *fm = PortabilityLayer::FileManager::GetInstance();
 
 	PasStringCopy(kPrefFileName, fileName);
-	
+
 	VFileSpec theSpecs = MakeVFileSpec(PortabilityLayer::VirtualDirectories::kPrefs, fileName);
 	if (!fm->FileExists(PortabilityLayer::VirtualDirectories::kPrefs, fileName))
 	{
@@ -148,7 +148,7 @@ Boolean WritePrefs (const prefsInfo *thePrefs, short versionNow, THandle<moduleP
 	}
 
 	fileStream->Close();
-	
+
 	return(true);
 }
 
@@ -158,7 +158,7 @@ Boolean SavePrefs (prefsInfo *thePrefs, THandle<void> *modulePrefs, short versio
 {
 	if (!WritePrefs(thePrefs, versionNow, modulePrefs->StaticCast<modulePrefsListEntry>()))
 		return(false);
-	
+
 	return(true);
 }
 
@@ -197,14 +197,14 @@ PLError_t ReadPrefs (prefsInfo *thePrefs, short versionNeed, Boolean *isOldVersi
 	*isOldVersion = false;
 
 	PortabilityLayer::FileManager *fm = PortabilityLayer::FileManager::GetInstance();
-	
+
 	PasStringCopy(kPrefFileName, fileName);
-	
+
 	theSpecs = MakeVFileSpec(PortabilityLayer::VirtualDirectory_t::kPrefs, fileName);
 
 	if (!PortabilityLayer::FileManager::GetInstance()->FileExists(theSpecs.m_dir, theSpecs.m_name))
 		return PLErrors::kFileNotFound;
-	
+
 	theErr = fm->OpenFileData(theSpecs.m_dir, theSpecs.m_name, PortabilityLayer::EFilePermission_Read, fileStream);
 	if (theErr != PLErrors::kNone)
 	{
@@ -226,7 +226,7 @@ PLError_t ReadPrefs (prefsInfo *thePrefs, short versionNeed, Boolean *isOldVersi
 		fileStream->Close();
 		return(PLErrors::kNone);
 	}
-	
+
 	byteCount = sizeof(*thePrefs);
 
 	if (fileStream->Read(thePrefs, byteCount) != byteCount)
@@ -309,7 +309,7 @@ PLError_t ReadPrefs (prefsInfo *thePrefs, short versionNeed, Boolean *isOldVersi
 			}
 		}
 	}
-	
+
 	fileStream->Close();
 
 	return(theErr);
@@ -324,7 +324,7 @@ Boolean DeletePrefs ()
 	PLError_t		theErr;
 
 	PasStringCopy(kPrefFileName, fileName);
-	
+
 	theSpecs = MakeVFileSpec(PortabilityLayer::VirtualDirectories::kPrefs, fileName);
 
 	return PortabilityLayer::FileManager::GetInstance()->DeleteFile(theSpecs.m_dir, theSpecs.m_name);
@@ -337,9 +337,13 @@ bool RunFunctionOnAllPrefsHandlers (void *context, bool (*func) (void *context,
 	if (ddHandler && !func(context, ddHandler))
 		return false;
 
-	IGpPrefsHandler *adHandler = PortabilityLayer::HostAudioDriver::GetInstance()->GetPrefsHandler();
-	if (adHandler && !func(context, adHandler))
-		return false;
+
+	if (IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance())
+	{
+		IGpPrefsHandler *adHandler = audioDriver->GetPrefsHandler();
+		if (adHandler && !func(context, adHandler))
+			return false;
+	}
 
 	size_t numInputDrivers = PortabilityLayer::HostInputDriver::NumInstances();
 
@@ -364,7 +368,7 @@ Boolean LoadPrefs (prefsInfo *thePrefs, THandle<void> *modulePrefs, short versio
 	Boolean		isOldVersion = 0;
 
 	THandle<modulePrefsListEntry> mPrefs;
-	
+
 	theErr = ReadPrefs(thePrefs, versionNeed, &isOldVersion, &mPrefs);
 
 	if (theErr == PLErrors::kFileNotFound)
@@ -383,7 +387,7 @@ Boolean LoadPrefs (prefsInfo *thePrefs, THandle<void> *modulePrefs, short versio
 		noProblems = DeletePrefs();
 		return(false);
 	}
-	
+
 	*modulePrefs = mPrefs.StaticCast<void>();
 
 	return (true);
@@ -537,7 +541,7 @@ Boolean ApplyModulePrefs (THandle<void> *modulePrefs)
 void BringUpDeletePrefsAlert (void)
 {
 	short		whoCares;
-	
+
 	InitCursor();
 //	CenterAlert(kNewPrefsAlertID);
 	whoCares = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kNewPrefsAlertID, nullptr);