mirror of
https://git.vladimir.cc/vladimir/ewsdr.git
synced 2026-08-25 20:37:33 +00:00
refactoring SettingsForm
This commit is contained in:
+42
-6
@@ -15,6 +15,7 @@ unit AudioInput;
|
||||
|
||||
{$IFDEF FPC}
|
||||
{$MODE Delphi}
|
||||
{$PACKRECORDS C}
|
||||
{$ENDIF}
|
||||
|
||||
interface
|
||||
@@ -156,9 +157,13 @@ const
|
||||
'libportaudio.so.0'
|
||||
);
|
||||
{$ELSE}
|
||||
PA_IN_LIBS: array[0..1] of AnsiString = (
|
||||
PA_IN_LIBS: array[0..5] of AnsiString = (
|
||||
'portaudio_x64.dll',
|
||||
'portaudio.dll'
|
||||
'portaudio_x86.dll',
|
||||
'portaudio.dll',
|
||||
'libportaudio-2.dll',
|
||||
'libportaudio.dll',
|
||||
'libportaudio64.dll'
|
||||
);
|
||||
{$ENDIF}
|
||||
PA_NO_ERROR = 0;
|
||||
@@ -265,7 +270,11 @@ begin
|
||||
|
||||
if FLibHandle = NilHandle then
|
||||
begin
|
||||
{$IFDEF WINDOWS}
|
||||
FLastError := 'PortAudio DLL not found. Put portaudio_x64.dll, portaudio.dll, or libportaudio-2.dll next to ewsdr.exe';
|
||||
{$ELSE}
|
||||
FLastError := 'libportaudio not found';
|
||||
{$ENDIF}
|
||||
Exit;
|
||||
end;
|
||||
|
||||
@@ -279,7 +288,15 @@ begin
|
||||
FPa_CloseStream := TPaMic_CloseStream (GetProcAddress(FLibHandle, 'Pa_CloseStream'));
|
||||
FPa_GetErrorText := TPaMic_GetErrorText(GetProcAddress(FLibHandle, 'Pa_GetErrorText'));
|
||||
|
||||
if not Assigned(FPa_Initialize) or not Assigned(FPa_OpenStream) then
|
||||
if not Assigned(FPa_Initialize) or
|
||||
not Assigned(FPa_Terminate) or
|
||||
not Assigned(FPa_GetDeviceCount) or
|
||||
not Assigned(FPa_GetDeviceInfo) or
|
||||
not Assigned(FPa_OpenStream) or
|
||||
not Assigned(FPa_StartStream) or
|
||||
not Assigned(FPa_StopStream) or
|
||||
not Assigned(FPa_CloseStream) or
|
||||
not Assigned(FPa_GetErrorText) then
|
||||
begin
|
||||
FLastError := 'libportaudio: symbols not found';
|
||||
FreeLibrary(FLibHandle);
|
||||
@@ -329,10 +346,27 @@ begin
|
||||
Count := 0;
|
||||
Result := False;
|
||||
if not Initialize then Exit;
|
||||
if not Assigned(FPa_GetDeviceCount) or not Assigned(FPa_GetDeviceInfo) then Exit;
|
||||
if not Assigned(FPa_GetDeviceCount) or not Assigned(FPa_GetDeviceInfo) then
|
||||
begin
|
||||
FLastError := 'PortAudio device enumeration is not available';
|
||||
Exit;
|
||||
end;
|
||||
|
||||
N := FPa_GetDeviceCount();
|
||||
if N <= 0 then Exit;
|
||||
if N < 0 then
|
||||
begin
|
||||
FLastError := 'Pa_GetDeviceCount: ';
|
||||
if Assigned(FPa_GetErrorText) then
|
||||
FLastError := FLastError + string(FPa_GetErrorText(N))
|
||||
else
|
||||
FLastError := FLastError + IntToStr(N);
|
||||
Exit;
|
||||
end;
|
||||
if N = 0 then
|
||||
begin
|
||||
FLastError := 'No PortAudio devices found';
|
||||
Exit;
|
||||
end;
|
||||
|
||||
for I := 0 to N - 1 do
|
||||
begin
|
||||
@@ -410,8 +444,10 @@ begin
|
||||
InParam.device := FDeviceIndex;
|
||||
InParam.sampleFormat := PA_FLOAT32;
|
||||
|
||||
// suggestedLatency = defaultLowInputLatency устройства (как в piHPSDR)
|
||||
Info := FPa_GetDeviceInfo(FDeviceIndex);
|
||||
{$IFDEF WINDOWS}
|
||||
// На Windows latency=0 часто ломает WASAPI/MME; берём значение от устройства.
|
||||
{$ENDIF}
|
||||
if Info <> nil then
|
||||
InParam.suggestedLatency := Info^.defaultLowInputLatency
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user