mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-12-14 03:59:36 +00:00
Misc tweaks, partially bump version to 1.1
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include "FileManager.h"
|
||||
#include "GpIOStream.h"
|
||||
#include "House.h"
|
||||
#include "IGpLogDriver.h"
|
||||
#include "IGpSystemServices.h"
|
||||
#include "ObjectEdit.h"
|
||||
#include "ResourceManager.h"
|
||||
@@ -858,6 +859,11 @@ Boolean QuerySaveChanges (void)
|
||||
|
||||
void YellowAlert (short whichAlert, short identifier)
|
||||
{
|
||||
IGpLogDriver *logger = PLDrivers::GetLogDriver();
|
||||
|
||||
if (logger)
|
||||
logger->Printf(IGpLogDriver::Category_Warning, "Yellow alert %i identifier %i", static_cast<int>(whichAlert), static_cast<int>(identifier));
|
||||
|
||||
#define kYellowAlert 1006
|
||||
Str255 errStr, errNumStr;
|
||||
short whoCares;
|
||||
|
||||
@@ -599,7 +599,7 @@ int AppStartup()
|
||||
FlushResolutionChange();
|
||||
}
|
||||
|
||||
ShowInitialLaunchDisclaimer();
|
||||
//ShowInitialLaunchDisclaimer();
|
||||
}
|
||||
|
||||
if (thisMac.isResolutionDirty)
|
||||
|
||||
@@ -10,12 +10,15 @@
|
||||
#include "PLSound.h"
|
||||
#include "DialogManager.h"
|
||||
#include "Externs.h"
|
||||
#include "IGpLogDriver.h"
|
||||
#include "MemoryManager.h"
|
||||
#include "ResourceManager.h"
|
||||
#include "SoundSync.h"
|
||||
#include "VirtualDirectory.h"
|
||||
#include "WaveFormat.h"
|
||||
|
||||
#include "PLDrivers.h"
|
||||
|
||||
|
||||
#define kBaseBufferSoundID 1000
|
||||
#define kMaxSounds 64
|
||||
@@ -273,26 +276,47 @@ void DumpBufferSounds (void)
|
||||
|
||||
PLError_t OpenSoundChannels (void)
|
||||
{
|
||||
IGpLogDriver *logger = PLDrivers::GetLogDriver();
|
||||
|
||||
if (channelOpen)
|
||||
{
|
||||
if (logger)
|
||||
logger->Printf(IGpLogDriver::Category_Error, "Audio was already opened?");
|
||||
return PLErrors::kAudioError;
|
||||
}
|
||||
|
||||
channel0 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||
if (channel0)
|
||||
channelOpen = true;
|
||||
else
|
||||
{
|
||||
if (logger)
|
||||
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 0 failed to open");
|
||||
|
||||
return PLErrors::kAudioError;
|
||||
}
|
||||
|
||||
channel1 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||
if (channel1)
|
||||
channelOpen = true;
|
||||
else
|
||||
{
|
||||
if (logger)
|
||||
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 1 failed to open");
|
||||
|
||||
return PLErrors::kAudioError;
|
||||
}
|
||||
|
||||
channel2 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||
if (channel2)
|
||||
channelOpen = true;
|
||||
else
|
||||
{
|
||||
if (logger)
|
||||
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 2 failed to open");
|
||||
|
||||
return PLErrors::kAudioError;
|
||||
}
|
||||
|
||||
return PLErrors::kNone;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user