summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/portaudio-streams.adb36
-rw-r--r--src/portaudio-streams.ads58
2 files changed, 46 insertions, 48 deletions
diff --git a/src/portaudio-streams.adb b/src/portaudio-streams.adb
index 6b05008..18a091e 100644
--- a/src/portaudio-streams.adb
+++ b/src/portaudio-streams.adb
@@ -485,9 +485,9 @@ package body Portaudio.Streams is
end Put;
function Wrap
- (Store : in Float_32_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Float_32_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
@@ -498,9 +498,9 @@ package body Portaudio.Streams is
end Wrap;
function Wrap
- (Store : in Int_32_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_32_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
@@ -511,9 +511,9 @@ package body Portaudio.Streams is
end Wrap;
function Wrap
- (Store : in Int_24_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_24_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
@@ -524,9 +524,9 @@ package body Portaudio.Streams is
end Wrap;
function Wrap
- (Store : in Int_16_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_16_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
@@ -537,9 +537,9 @@ package body Portaudio.Streams is
end Wrap;
function Wrap
- (Store : in Int_8_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_8_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
@@ -550,9 +550,9 @@ package body Portaudio.Streams is
end Wrap;
function Wrap
- (Store : in UInt_8_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in UInt_8_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer is
begin
return
diff --git a/src/portaudio-streams.ads b/src/portaudio-streams.ads
index 1f14733..c8d3e92 100644
--- a/src/portaudio-streams.ads
+++ b/src/portaudio-streams.ads
@@ -37,12 +37,16 @@ package Portaudio.Streams is
type Integer_24 is range -2 ** 23 .. 2 ** 23 - 1;
for Integer_24'Size use 24;
- type Float_32_Array is array (Positive range <>) of aliased Interfaces.IEEE_Float_32;
- type Int_32_Array is array (Positive range <>) of aliased Interfaces.Integer_32;
- type Int_24_Array is array (Positive range <>) of aliased Integer_24;
- type Int_16_Array is array (Positive range <>) of aliased Interfaces.Integer_16;
- type Int_8_Array is array (Positive range <>) of aliased Interfaces.Integer_8;
- type UInt_8_Array is array (Positive range <>) of aliased Interfaces.Unsigned_8;
+ -- When declaring these arrays, ensure that the bounds are specified by the
+ -- initial value and not the subtype. Otherwise you will get subtype mismatch
+ -- errors due to the aliasing required by the Wrap functions further down.
+ -- No, I'm not a fan of this quirk of Ada either.
+ type Float_32_Array is array (Positive range <>) of Interfaces.IEEE_Float_32;
+ type Int_32_Array is array (Positive range <>) of Interfaces.Integer_32;
+ type Int_24_Array is array (Positive range <>) of Integer_24;
+ type Int_16_Array is array (Positive range <>) of Interfaces.Integer_16;
+ type Int_8_Array is array (Positive range <>) of Interfaces.Integer_8;
+ type UInt_8_Array is array (Positive range <>) of Interfaces.Unsigned_8;
type Frame_Amount is new Interfaces.Unsigned_32;
@@ -152,51 +156,45 @@ package Portaudio.Streams is
Value : in Interfaces.Unsigned_8)
with Pre => Store.Kind = UInt_8_Format;
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in Float_32_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Float_32_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in Int_32_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_32_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in Int_24_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_24_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in Int_16_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_16_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in Int_8_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in Int_8_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);
- -- !!! ENSURE STORE IS ALIASED !!! --
function Wrap
- (Store : in UInt_8_Array;
- Frames : in Frame_Amount;
- Channels : in Natural)
+ (Store : aliased in UInt_8_Array;
+ Frames : in Frame_Amount;
+ Channels : in Natural)
return Buffer
with Pre => Store'Length > 0 and Store'Length = Frames * Frame_Amount (Channels);