mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-29 16:25:42 +00:00
update openal-soft to 1.24.3
keeping the alt 87514151c4 (diff-73a8dc1ce58605f6c5ea53548454c3bae516ec5132a29c9d7ff7edf9730c75be)
This commit is contained in:
parent
12db0500e8
commit
ba32094b7b
276 changed files with 49304 additions and 8712 deletions
|
|
@ -24,7 +24,7 @@ void al_nssleep(unsigned long nsec);
|
|||
* still needs to use a normal cast and live with the warning (C++ is fine with
|
||||
* a regular reinterpret_cast).
|
||||
*/
|
||||
#if __STDC_VERSION__ >= 199901L
|
||||
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
||||
#define FUNCTION_CAST(T, ptr) (union{void *p; T f;}){ptr}.f
|
||||
#elif defined(__cplusplus)
|
||||
#define FUNCTION_CAST(T, ptr) reinterpret_cast<T>(ptr)
|
||||
|
|
@ -36,11 +36,11 @@ void al_nssleep(unsigned long nsec);
|
|||
} // extern "C"
|
||||
|
||||
#include <cstdio>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
#include "alspan.h"
|
||||
#include "fmt/core.h"
|
||||
|
||||
int InitAL(al::span<std::string_view> &args)
|
||||
{
|
||||
|
|
@ -51,14 +51,14 @@ int InitAL(al::span<std::string_view> &args)
|
|||
{
|
||||
device = alcOpenDevice(std::string{args[1]}.c_str());
|
||||
if(!device)
|
||||
std::cerr<< "Failed to open \""<<args[1]<<"\", trying default\n";
|
||||
fmt::println(stderr, "Failed to open \"{}\", trying default", args[1]);
|
||||
args = args.subspan(2);
|
||||
}
|
||||
if(!device)
|
||||
device = alcOpenDevice(nullptr);
|
||||
if(!device)
|
||||
{
|
||||
std::fprintf(stderr, "Could not open a device!\n");
|
||||
fmt::println(stderr, "Could not open a device!");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ int InitAL(al::span<std::string_view> &args)
|
|||
if(ctx)
|
||||
alcDestroyContext(ctx);
|
||||
alcCloseDevice(device);
|
||||
std::fprintf(stderr, "Could not set a context!\n");
|
||||
fmt::println(stderr, "Could not set a context!");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ int InitAL(al::span<std::string_view> &args)
|
|||
name = alcGetString(device, ALC_ALL_DEVICES_SPECIFIER);
|
||||
if(!name || alcGetError(device) != AL_NO_ERROR)
|
||||
name = alcGetString(device, ALC_DEVICE_SPECIFIER);
|
||||
std::printf("Opened \"%s\"\n", name);
|
||||
fmt::println("Opened \"{}\"", name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue