mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-09-23 06:53:43 +00:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
98afd82d64 | ||
|
efae9cacd8 | ||
|
5184d1594f | ||
|
42e124a90c |
@@ -69,6 +69,7 @@
|
|||||||
<Import Project="GpApp.props" />
|
<Import Project="GpApp.props" />
|
||||||
<Import Project="..\Common.props" />
|
<Import Project="..\Common.props" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
@@ -134,7 +134,7 @@ void ToggleMusicWhilePlaying (void)
|
|||||||
|
|
||||||
void SetMusicalMode (short newMode)
|
void SetMusicalMode (short newMode)
|
||||||
{
|
{
|
||||||
if (dontLoadMusic)
|
if (dontLoadMusic || failedMusic)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
musicMutex->Lock();
|
musicMutex->Lock();
|
||||||
@@ -302,6 +302,12 @@ void InitMusic (void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
theErr = OpenMusicChannel();
|
theErr = OpenMusicChannel();
|
||||||
|
if (theErr != PLErrors::kNone)
|
||||||
|
{
|
||||||
|
YellowAlert(kYellowNoMusic, theErr);
|
||||||
|
failedMusic = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
musicScore[0] = 0;
|
musicScore[0] = 0;
|
||||||
musicScore[1] = 1;
|
musicScore[1] = 1;
|
||||||
|
@@ -63,6 +63,7 @@
|
|||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
|
@@ -1239,7 +1239,7 @@ void GpDisplayDriverD3D11::SetBackgroundColor(uint8_t r, uint8_t g, uint8_t b, u
|
|||||||
|
|
||||||
void GpDisplayDriverD3D11::RequestToggleFullScreen(uint32_t timestamp)
|
void GpDisplayDriverD3D11::RequestToggleFullScreen(uint32_t timestamp)
|
||||||
{
|
{
|
||||||
// Alt-Enter gets re-sent after a full-screen toggle, so we ignore toggle requests until half a second has seconds have elapsed
|
// Alt-Enter gets re-sent after a full-screen toggle, so we ignore toggle requests until half a second has elapsed
|
||||||
if (timestamp > m_lastFullScreenToggleTimeStamp + 30)
|
if (timestamp > m_lastFullScreenToggleTimeStamp + 30)
|
||||||
{
|
{
|
||||||
m_isFullScreenDesired = !m_isFullScreenDesired;
|
m_isFullScreenDesired = !m_isFullScreenDesired;
|
||||||
|
@@ -65,6 +65,7 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
<Import Project="..\Common.props" />
|
<Import Project="..\Common.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
@@ -75,6 +76,7 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
<Import Project="..\Common.props" />
|
<Import Project="..\Common.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
|
@@ -63,6 +63,7 @@
|
|||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
<Import Project="..\GpCommon.props" />
|
<Import Project="..\GpCommon.props" />
|
||||||
|
<Import Project="..\Release.props" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
rmdir /S /Q ReleasePkg
|
rmdir /S /Q ReleasePkg
|
||||||
|
|
||||||
|
mkdir ReleasePkg\PDBs
|
||||||
|
|
||||||
mkdir ReleasePkg\Aerofoil
|
mkdir ReleasePkg\Aerofoil
|
||||||
mkdir ReleasePkg\Aerofoil\Packaged
|
mkdir ReleasePkg\Aerofoil\Packaged
|
||||||
mkdir ReleasePkg\Aerofoil\Resources
|
mkdir ReleasePkg\Aerofoil\Resources
|
||||||
@@ -21,6 +23,9 @@ copy /Y x64\Release\FTagData.exe ReleasePkg\Aerofoil\Tools
|
|||||||
copy /Y x64\Release\gpr2gpa.exe ReleasePkg\Aerofoil\Tools
|
copy /Y x64\Release\gpr2gpa.exe ReleasePkg\Aerofoil\Tools
|
||||||
copy /Y x64\Release\unpacktool.exe ReleasePkg\Aerofoil\Tools
|
copy /Y x64\Release\unpacktool.exe ReleasePkg\Aerofoil\Tools
|
||||||
|
|
||||||
|
|
||||||
|
copy /Y x64\Release\*.pdb ReleasePkg\PDBs
|
||||||
|
|
||||||
xcopy /I /E /Y /K Packaged ReleasePkg\Aerofoil\Packaged
|
xcopy /I /E /Y /K Packaged ReleasePkg\Aerofoil\Packaged
|
||||||
xcopy /I /E /Y /K Resources ReleasePkg\Aerofoil\Resources
|
xcopy /I /E /Y /K Resources ReleasePkg\Aerofoil\Resources
|
||||||
xcopy /I /E /Y /K Documentation ReleasePkg\Aerofoil\Documentation
|
xcopy /I /E /Y /K Documentation ReleasePkg\Aerofoil\Documentation
|
||||||
|
@@ -353,12 +353,15 @@ namespace PortabilityLayer
|
|||||||
|
|
||||||
AudioChannel *SoundSystemImpl::CreateChannel()
|
AudioChannel *SoundSystemImpl::CreateChannel()
|
||||||
{
|
{
|
||||||
|
IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
|
||||||
|
if (!audioDriver)
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
PortabilityLayer::MemoryManager *mm = PortabilityLayer::MemoryManager::GetInstance();
|
PortabilityLayer::MemoryManager *mm = PortabilityLayer::MemoryManager::GetInstance();
|
||||||
void *storage = mm->Alloc(sizeof(PortabilityLayer::AudioChannelImpl));
|
void *storage = mm->Alloc(sizeof(PortabilityLayer::AudioChannelImpl));
|
||||||
if (!storage)
|
if (!storage)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
|
|
||||||
IGpAudioChannel *audioChannel = audioDriver->CreateChannel();
|
IGpAudioChannel *audioChannel = audioDriver->CreateChannel();
|
||||||
if (!audioChannel)
|
if (!audioChannel)
|
||||||
{
|
{
|
||||||
@@ -388,7 +391,12 @@ namespace PortabilityLayer
|
|||||||
|
|
||||||
void SoundSystemImpl::SetVolume(uint8_t vol)
|
void SoundSystemImpl::SetVolume(uint8_t vol)
|
||||||
{
|
{
|
||||||
PortabilityLayer::HostAudioDriver::GetInstance()->SetMasterVolume(vol, 255);
|
IGpAudioDriver *audioDriver = PortabilityLayer::HostAudioDriver::GetInstance();
|
||||||
|
|
||||||
|
if (!audioDriver)
|
||||||
|
return;
|
||||||
|
|
||||||
|
audioDriver->SetMasterVolume(vol, 255);
|
||||||
m_volume = vol;
|
m_volume = vol;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user