Browse Source

audio: NX support.

legacy
Sam Hocevar 5 years ago
parent
commit
df4471bef8
6 changed files with 121 additions and 111 deletions
  1. +102
    -102
      lol.sln
  2. +12
    -7
      src/audio/audio.cpp
  3. +3
    -0
      src/lol-core.vcxproj
  4. +1
    -0
      src/lol-core.vcxproj.filters
  5. +2
    -1
      src/lol/audio/audio.h
  6. +1
    -1
      src/private/nx

+ 102
- 102
lol.sln View File

@@ -69,11 +69,11 @@ Global
Debug|NX64 = Debug|NX64
Debug|ORBIS = Debug|ORBIS
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Debug|Win64 = Debug|Win64
Release|NX64 = Release|NX64
Release|ORBIS = Release|ORBIS
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Release|Win64 = Release|Win64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|NX64.ActiveCfg = Debug|NX64
@@ -81,359 +81,359 @@ Global
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win64.ActiveCfg = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win64.Build.0 = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|NX64.ActiveCfg = Release|NX64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|NX64.Build.0 = Release|NX64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|ORBIS.ActiveCfg = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win64.ActiveCfg = Release|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win64.Build.0 = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|NX64.ActiveCfg = Debug|NX64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|NX64.Build.0 = Debug|NX64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|ORBIS.ActiveCfg = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.ActiveCfg = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.Build.0 = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.ActiveCfg = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.Build.0 = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win64.ActiveCfg = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win64.Build.0 = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|NX64.ActiveCfg = Release|NX64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|NX64.Build.0 = Release|NX64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|ORBIS.ActiveCfg = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.ActiveCfg = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.Build.0 = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.ActiveCfg = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.Build.0 = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win64.ActiveCfg = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win64.Build.0 = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|NX64.ActiveCfg = Debug|NX64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|NX64.Build.0 = Debug|NX64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win64.ActiveCfg = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win64.Build.0 = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|NX64.ActiveCfg = Release|NX64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|NX64.Build.0 = Release|NX64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|ORBIS.ActiveCfg = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win64.ActiveCfg = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win64.Build.0 = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|NX64.ActiveCfg = Debug|NX64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|NX64.Build.0 = Debug|NX64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win64.ActiveCfg = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win64.Build.0 = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|NX64.ActiveCfg = Release|NX64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|NX64.Build.0 = Release|NX64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win64.ActiveCfg = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win64.Build.0 = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|NX64.ActiveCfg = Debug|NX64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|NX64.Build.0 = Debug|NX64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win64.ActiveCfg = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win64.Build.0 = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|NX64.ActiveCfg = Release|NX64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|NX64.Build.0 = Release|NX64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win64.ActiveCfg = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win64.Build.0 = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|NX64.ActiveCfg = Debug|NX64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|NX64.Build.0 = Debug|NX64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win64.ActiveCfg = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win64.Build.0 = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|NX64.ActiveCfg = Release|NX64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|NX64.Build.0 = Release|NX64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win64.ActiveCfg = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win64.Build.0 = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|NX64.ActiveCfg = Debug|NX64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|NX64.Build.0 = Debug|NX64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win64.ActiveCfg = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win64.Build.0 = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|NX64.ActiveCfg = Release|NX64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|NX64.Build.0 = Release|NX64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win64.ActiveCfg = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win64.Build.0 = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|NX64.ActiveCfg = Debug|NX64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|NX64.Build.0 = Debug|NX64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win64.ActiveCfg = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win64.Build.0 = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|NX64.ActiveCfg = Release|NX64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|NX64.Build.0 = Release|NX64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win64.ActiveCfg = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win64.Build.0 = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|NX64.ActiveCfg = Debug|NX64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|NX64.Build.0 = Debug|NX64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.Build.0 = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win64.ActiveCfg = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win64.Build.0 = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|NX64.ActiveCfg = Release|NX64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|NX64.Build.0 = Release|NX64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win64.ActiveCfg = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win64.Build.0 = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|NX64.ActiveCfg = Debug|NX64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|NX64.Build.0 = Debug|NX64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.Build.0 = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win64.ActiveCfg = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win64.Build.0 = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|NX64.ActiveCfg = Release|NX64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|NX64.Build.0 = Release|NX64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win64.ActiveCfg = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win64.Build.0 = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|NX64.ActiveCfg = Debug|NX64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|NX64.Build.0 = Debug|NX64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.Build.0 = Debug|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win64.ActiveCfg = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win64.Build.0 = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|NX64.ActiveCfg = Release|NX64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|NX64.Build.0 = Release|NX64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win64.ActiveCfg = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win64.Build.0 = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|NX64.ActiveCfg = Debug|NX64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|NX64.Build.0 = Debug|NX64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.Build.0 = Debug|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win64.ActiveCfg = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win64.Build.0 = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|NX64.ActiveCfg = Release|NX64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|NX64.Build.0 = Release|NX64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win64.ActiveCfg = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|NX64.ActiveCfg = Debug|NX64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|NX64.Build.0 = Debug|NX64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|NX64.ActiveCfg = Release|NX64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|NX64.Build.0 = Release|NX64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|NX64.ActiveCfg = Debug|NX64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|NX64.Build.0 = Debug|NX64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.Build.0 = Debug|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|NX64.ActiveCfg = Release|NX64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|NX64.Build.0 = Release|NX64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win64.Build.0 = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|NX64.ActiveCfg = Debug|NX64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|NX64.Build.0 = Debug|NX64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.Build.0 = Debug|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win64.ActiveCfg = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win64.Build.0 = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|NX64.ActiveCfg = Release|NX64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|NX64.Build.0 = Release|NX64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win64.ActiveCfg = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win64.Build.0 = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|NX64.ActiveCfg = Debug|NX64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|NX64.Build.0 = Debug|NX64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.Build.0 = Debug|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win64.ActiveCfg = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win64.Build.0 = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|NX64.ActiveCfg = Release|NX64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|NX64.Build.0 = Release|NX64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win64.ActiveCfg = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win64.Build.0 = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|NX64.ActiveCfg = Debug|NX64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|NX64.Build.0 = Debug|NX64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.Build.0 = Debug|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win64.ActiveCfg = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win64.Build.0 = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|NX64.ActiveCfg = Release|NX64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|NX64.Build.0 = Release|NX64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win64.ActiveCfg = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|NX64.ActiveCfg = Debug|NX64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|NX64.Build.0 = Debug|NX64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.Build.0 = Debug|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|NX64.ActiveCfg = Release|NX64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|NX64.Build.0 = Release|NX64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win64.Build.0 = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|NX64.ActiveCfg = Debug|NX64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|NX64.Build.0 = Debug|NX64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.Build.0 = Debug|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win64.ActiveCfg = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win64.Build.0 = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|NX64.ActiveCfg = Release|NX64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|NX64.Build.0 = Release|NX64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win64.ActiveCfg = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win64.Build.0 = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|NX64.ActiveCfg = Debug|NX64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|NX64.Build.0 = Debug|NX64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.Build.0 = Debug|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win64.ActiveCfg = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win64.Build.0 = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|NX64.ActiveCfg = Release|NX64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|NX64.Build.0 = Release|NX64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win64.ActiveCfg = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win64.Build.0 = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|NX64.ActiveCfg = Debug|NX64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|NX64.Build.0 = Debug|NX64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win64.ActiveCfg = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win64.Build.0 = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|NX64.ActiveCfg = Release|NX64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|NX64.Build.0 = Release|NX64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win64.ActiveCfg = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win64.Build.0 = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|NX64.ActiveCfg = Debug|NX64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|NX64.Build.0 = Debug|NX64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.Build.0 = Debug|ORBIS
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.ActiveCfg = Debug|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.Build.0 = Debug|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.ActiveCfg = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.Build.0 = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win64.ActiveCfg = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win64.Build.0 = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|NX64.ActiveCfg = Release|NX64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|NX64.Build.0 = Release|NX64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.ActiveCfg = Release|ORBIS
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.Build.0 = Release|ORBIS
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.ActiveCfg = Release|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.Build.0 = Release|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.ActiveCfg = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.Build.0 = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win64.ActiveCfg = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win64.Build.0 = Release|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|NX64.ActiveCfg = Debug|NX64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|NX64.Build.0 = Debug|NX64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|ORBIS.Build.0 = Debug|ORBIS
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win32.ActiveCfg = Debug|Win32
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win32.Build.0 = Debug|Win32
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|x64.ActiveCfg = Debug|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|x64.Build.0 = Debug|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win64.ActiveCfg = Debug|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Debug|Win64.Build.0 = Debug|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|NX64.ActiveCfg = Release|NX64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|NX64.Build.0 = Release|NX64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|ORBIS.ActiveCfg = Release|ORBIS
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|ORBIS.Build.0 = Release|ORBIS
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win32.ActiveCfg = Release|Win32
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win32.Build.0 = Release|Win32
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.ActiveCfg = Release|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|x64.Build.0 = Release|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win64.ActiveCfg = Release|x64
{31B96262-1C41-43B9-BA38-27AA385B05DB}.Release|Win64.Build.0 = Release|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|NX64.ActiveCfg = Debug|NX64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|NX64.Build.0 = Debug|NX64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|ORBIS.Build.0 = Debug|ORBIS
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.ActiveCfg = Debug|Win32
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win32.Build.0 = Debug|Win32
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.ActiveCfg = Debug|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|x64.Build.0 = Debug|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win64.ActiveCfg = Debug|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Debug|Win64.Build.0 = Debug|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|NX64.ActiveCfg = Release|NX64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|NX64.Build.0 = Release|NX64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.ActiveCfg = Release|ORBIS
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|ORBIS.Build.0 = Release|ORBIS
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.ActiveCfg = Release|Win32
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win32.Build.0 = Release|Win32
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.ActiveCfg = Release|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|x64.Build.0 = Release|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win64.ActiveCfg = Release|x64
{5F5714D0-1C3D-4522-A409-214C5A2951AA}.Release|Win64.Build.0 = Release|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|NX64.ActiveCfg = Debug|NX64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|NX64.Build.0 = Debug|NX64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|ORBIS.Build.0 = Debug|ORBIS
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win32.ActiveCfg = Debug|Win32
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win32.Build.0 = Debug|Win32
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|x64.ActiveCfg = Debug|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|x64.Build.0 = Debug|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win64.ActiveCfg = Debug|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Debug|Win64.Build.0 = Debug|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|NX64.ActiveCfg = Release|NX64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|NX64.Build.0 = Release|NX64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|ORBIS.ActiveCfg = Release|ORBIS
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|ORBIS.Build.0 = Release|ORBIS
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win32.ActiveCfg = Release|Win32
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win32.Build.0 = Release|Win32
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|x64.ActiveCfg = Release|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|x64.Build.0 = Release|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win64.ActiveCfg = Release|x64
{51626A22-DD68-4450-9696-13B03BF7A2C5}.Release|Win64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE


+ 12
- 7
src/audio/audio.cpp View File

@@ -40,6 +40,7 @@
namespace lol
{

#if defined LOL_USE_SDL_MIXER
struct audio_streamer
{
int m_track = -1;
@@ -51,19 +52,17 @@ struct audio_streamer
int m_extra_bytes = 0;
// Buffer used to write the converted audio data for mixing.
std::vector<uint8_t> m_output_buffer;
#if defined LOL_USE_SDL_MIXER
SDL_AudioCVT m_convert;
Mix_Chunk *m_chunk = nullptr;
#endif
};

std::unordered_set<std::shared_ptr<audio_streamer>> audio::m_streamers;
static std::unordered_set<std::shared_ptr<audio_streamer>> g_streamers;

// The global audio format
static int g_frequency, g_channels;
static audio::format g_format;

#if defined LOL_USE_SDL_MIXER
static audio::format sdl2lol_format(Uint16 sdl_format)
{
switch (sdl_format)
@@ -134,6 +133,10 @@ void audio::init()
g_frequency, u, t, b, e, g_channels);
}

void audio::shutdown()
{
}

void audio::set_tracks(int tracks)
{
Mix_AllocateChannels(tracks);
@@ -188,7 +191,7 @@ int audio::start_streaming(std::function<void(void *, int)> const &f,
};

auto s = std::make_shared<audio_streamer>();
m_streamers.insert(s);
g_streamers.insert(s);

// Build an audio converter that converts from a given streaming format
// to the format SDL was currently initialised with, if necessary.
@@ -215,19 +218,21 @@ int audio::start_streaming(std::function<void(void *, int)> const &f,

void audio::stop_streaming(int track)
{
for (auto streamer : m_streamers)
for (auto streamer : g_streamers)
{
if (streamer->m_track == track)
{
Mix_HaltChannel(track);
m_streamers.erase(streamer);
g_streamers.erase(streamer);
break;
}
}
}

#elif __NX__
#else
void audio::init() {}
void audio::shutdown() {}
void audio::set_tracks(int) {}
void audio::set_volume(int, int) {}
void audio::mute_all() {}


+ 3
- 0
src/lol-core.vcxproj View File

@@ -187,6 +187,9 @@
<ClCompile Include="private\nx\nx-app.cpp">
<ExcludedFromBuild Condition="'$(Platform)'!='NX64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="private\nx\nx-audio.cpp">
<ExcludedFromBuild Condition="'$(Platform)'!='NX64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="private\nx\nx-log.cpp">
<ExcludedFromBuild Condition="'$(Platform)'!='NX64'">true</ExcludedFromBuild>
</ClCompile>


+ 1
- 0
src/lol-core.vcxproj.filters View File

@@ -262,6 +262,7 @@
<ClCompile Include="audio\audio.cpp" />
<ClCompile Include="audio\sample.cpp" />
<ClCompile Include="private\nx\nx-app.cpp" />
<ClCompile Include="private\nx\nx-audio.cpp" />
<ClCompile Include="private\nx\nx-log.cpp" />
</ItemGroup>
<ItemGroup>


+ 2
- 1
src/lol/audio/audio.h View File

@@ -33,11 +33,13 @@ public:
uint8, sint8,
uint16le, uint16be,
sint16le, sint16be,
sint24le,
sint32le, sint32be,
float32le, float32be,
};

static void init();
static void shutdown();

// Set the number of audio tracks that can be mixed together
static void set_tracks(int tracks);
@@ -55,7 +57,6 @@ public:

private:
audio() {}
static std::unordered_set<std::shared_ptr<struct audio_streamer>> m_streamers;
};

} /* namespace lol */


+ 1
- 1
src/private/nx

@@ -1 +1 @@
Subproject commit 78a3bceb27c188c6b07b41ac2923c1330c78ea43
Subproject commit f74c400f7f12c87e9a357d630de744b4c64cc4c1

Loading…
Cancel
Save