SilverMoonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Projects 1 Releases 6 Wiki Activity

Fixed FileMonitor, Window, Thread, and Audio on Windows.
All checks were successful
Build & Release / Windows-AMD64-Build (push) Successful in 1m25s
Details
Build & Release / Linux-AMD64-Build (push) Successful in 1m38s
Details
Build & Release / Linux-AARCH64-Build (push) Successful in 3m36s
Details

Browse Source
This commit is contained in:
Karutoh
2024-07-01 19:16:45 -07:00
parent 2a2296685e
commit e2e5a1b8db
5 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/io/audio/Audio.cpp
View File

@@ -405,15 +405,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return ((SInt_8*)data)[sampleIndex];
return ((SInt_8 *)data)[sampleIndex];
case DataType::SINT_16:
return (SInt_8)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
case DataType::FLOAT:
return (SInt_8)(((float*)data)[sampleIndex] * (float)EHS_SINT_8_MAX);
return (SInt_8)(((double *)data)[sampleIndex] * (double)EHS_SINT_8_MAX);
case DataType::SINT_32:
return (SInt_8)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
case DataType::SINT_64:
return (SInt_8)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
default:
return 0;
}
@@ -424,15 +424,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_16)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)((SInt_8*)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
case DataType::SINT_16:
return ((SInt_16*)data)[sampleIndex];
return ((SInt_16 *)data)[sampleIndex];
case DataType::FLOAT:
return (SInt_16)(((float*)data)[sampleIndex] * (float)EHS_SINT_16_MAX);
return (SInt_16)(((double *)data)[sampleIndex] * (double)EHS_SINT_16_MAX);
case DataType::SINT_32:
return (SInt_16)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
case DataType::SINT_64:
return (SInt_16)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
default:
return 0;
}
@@ -462,15 +462,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_32)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)((SInt_8 *)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
case DataType::SINT_16:
return (SInt_32)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
case DataType::FLOAT:
return (SInt_32)(((float*)data)[sampleIndex] * (float)EHS_SINT_32_MAX);
return (SInt_32)(((double *)data)[sampleIndex] * (double)EHS_SINT_32_MAX);
case DataType::SINT_32:
return ((SInt_32*)data)[sampleIndex];
return ((SInt_32 *)data)[sampleIndex];
case DataType::SINT_64:
return (SInt_32)((float)((SInt_64*)data)[sampleIndex] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)((SInt_64 *)data)[sampleIndex] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
default:
return 0;
}
@@ -481,15 +481,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_64)((float)((SInt_8*)data)[sampleIndex] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)((SInt_8 *)data)[sampleIndex] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
case DataType::SINT_16:
return (SInt_64)((float)((SInt_16*)data)[sampleIndex] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)((SInt_16 *)data)[sampleIndex] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
case DataType::FLOAT:
return (SInt_64)(((float*)data)[sampleIndex] * (float)EHS_SINT_64_MAX);
return (SInt_64)(((double *)data)[sampleIndex] * (double)EHS_SINT_64_MAX);
case DataType::SINT_32:
return (SInt_64)((float)((SInt_32*)data)[sampleIndex] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)((SInt_32 *)data)[sampleIndex] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
case DataType::SINT_64:
return ((SInt_64*)data)[sampleIndex];
return ((SInt_64 *)data)[sampleIndex];
default:
return 0;
}
@@ -502,13 +502,13 @@ namespace ehs
case DataType::SINT_8:
return *(SInt_8*)peak;
case DataType::SINT_16:
return (SInt_8)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
case DataType::FLOAT:
return (SInt_8)(*(float*)peak * (float)EHS_SINT_8_MAX);
return (SInt_8)(*(double *)peak * (double)EHS_SINT_8_MAX);
case DataType::SINT_32:
return (SInt_8)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
case DataType::SINT_64:
return (SInt_8)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX);
return (SInt_8)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
default:
return 0;
}
@@ -519,15 +519,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_16)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
case DataType::SINT_16:
return *(SInt_16*)peak;
case DataType::FLOAT:
return (SInt_16)(*(float*)peak * (float)EHS_SINT_16_MAX);
return (SInt_16)(*(double*)peak * (double)EHS_SINT_16_MAX);
case DataType::SINT_32:
return (SInt_16)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
case DataType::SINT_64:
return (SInt_16)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX);
return (SInt_16)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
default:
return 0;
}
@@ -557,15 +557,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_32)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
case DataType::SINT_16:
return (SInt_32)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
case DataType::FLOAT:
return (SInt_32)(*(float*)peak * (float)EHS_SINT_32_MAX);
return (SInt_32)(*(double *)peak * (double)EHS_SINT_32_MAX);
case DataType::SINT_32:
return *(SInt_32*)peak;
return *(SInt_32 *)peak;
case DataType::SINT_64:
return (SInt_32)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX);
return (SInt_32)((double)*(SInt_64 *)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
default:
return 0;
}
@@ -576,15 +576,15 @@ namespace ehs
switch (dataType)
{
case DataType::SINT_8:
return (SInt_64)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)*(SInt_8 *)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
case DataType::SINT_16:
return (SInt_64)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)*(SInt_16 *)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
case DataType::FLOAT:
return (SInt_64)(*(float*)peak * (float)EHS_SINT_64_MAX);
return (SInt_64)(*(double *)peak * (double)EHS_SINT_64_MAX);
case DataType::SINT_32:
return (SInt_64)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX);
return (SInt_64)((double)*(SInt_32 *)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
case DataType::SINT_64:
return *(SInt_64*)peak;
return *(SInt_64 *)peak;
default:
return 0;
}