Skip to content

Default buffer size and buffer size setting #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oskarvonephesos wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Default buffer size and buffer size setting #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b8ecf9
minimum buffer size prevents buffer underflow
oskarvonephesos Jun 20, 2023
3acb637
Update pa.h
oskarvonephesos Jun 20, 2023
1134c14
add setFramesperBuffer utility
oskarvonephesos Jun 20, 2023
d900371
remove type inconsistencies
oskarvonephesos Jun 20, 2023
131aa71
type inconsistencies 2
oskarvonephesos Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pa::Pa(mainCallBack func, void* data){
intialize();
}
// full callback, inchannels, outchannels, sampling rate, frames per buffer, userdata
Pa::Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, void *data){
Pa::Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, void *data){
PaCallBack = func;
userDataType = data;
samplerate = samp;
Expand All @@ -28,7 +28,7 @@ Pa::Pa(miniCallBack func, void* data){
intialize();
}
//mini callback, inchannels, outchannels, sampling rate, frames per buffer, userdata
Pa::Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, void *data){
Pa::Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, void *data){
miniCb = func;
userDataType = data;
samplerate = samp;
Expand All @@ -47,7 +47,7 @@ Pa::Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int sa
intialize();
}
// main callback, params
Pa::Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, std::shared_ptr<void> data){
Pa::Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, std::shared_ptr<void> data){
PaCallBack = func;
s_ptr = data;
userDataType = s_ptr.get();
Expand All @@ -65,7 +65,7 @@ Pa::Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int sa
intialize();
}
// mini callback, params
Pa::Pa(miniCallBack func,unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, std::shared_ptr<void> data){
Pa::Pa(miniCallBack func,unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, std::shared_ptr<void> data){
miniCb = func;
s_ptr = data;
userDataType = s_ptr.get();
Expand Down Expand Up @@ -321,7 +321,7 @@ PaError Pa::paCb(const void *inputBuffer, void *outputBuffer,
PaStreamCallbackFlags statusFlags,
void* udata){

miniCb((const float*)inputBuffer, (float*)outputBuffer, (long)framesPerBuffer, udata);
miniCb((const float*)inputBuffer, (float*)outputBuffer, framesPerBuffer, udata);

return paContinue;
}
Expand Down Expand Up @@ -479,6 +479,7 @@ const char* Pa::apiName(unsigned int index){
return info->name;

}
void setFramesperBuffer(unsigned long f){framesperbuffer = f;}



Expand Down
13 changes: 7 additions & 6 deletions pa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RunMode mode = RunMode::dontTerminate;
typedef int(*mainCallBack)(const void*, void*, unsigned long, const PaStreamCallbackTimeInfo*, PaStreamCallbackFlags, void*);
mainCallBack PaCallBack = nullptr;

typedef void (*miniCallBack)(const float*, float*, long, void*);
typedef void (*miniCallBack)(const float*, float*, unsigned long, void*);
static miniCallBack miniCb;

void (*streamFinished)(void*) = nullptr;
Expand All @@ -35,7 +35,7 @@ PaSampleFormat sampleFormat = paFloat32;
unsigned long sleepTime = 10000;
unsigned int inchannels = 0;
unsigned int outchannels = 1;
unsigned int framesperbuffer = 0;
unsigned long framesperbuffer = 64;
unsigned int samplerate = 44100;
int inputdevice = -1;
int outputdevice = -1;
Expand Down Expand Up @@ -63,20 +63,20 @@ static PaError paCb(const void *inputBuffer, void *outputBuffer,
// full callback, void* data
Pa(mainCallBack func, void* data);
// full callback, inchannels, outchannels, sampling rate, frames per buffer, void* data
Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, void *data);
Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, void *data);
// mini callback, void* data
Pa(miniCallBack func, void* data);
// mini callback, inchannels, outchannels, sampling rate, frames per buffer, void* data
Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, void *data);
Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, void *data);
#ifdef CPP11
// full callback, shared_ptr data
Pa(mainCallBack func, std::shared_ptr<void> data);
// full callback, params, shared_ptr data
Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, std::shared_ptr<void> data);
Pa(mainCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, std::shared_ptr<void> data);
// mini callback, shared_ptr data
Pa(miniCallBack func, std::shared_ptr<void> data);
// mini callback, params, shared_ptr data
Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned int frames, std::shared_ptr<void> data);
Pa(miniCallBack func, unsigned int inch, unsigned int outch, unsigned int samp, unsigned long frames, std::shared_ptr<void> data);
#endif
~Pa();

Expand All @@ -94,6 +94,7 @@ void listDevices();
void getDeviceInfo(unsigned int index);
void setInputDevice(unsigned int index);
void setOutputDevice(unsigned int index);
void setFramesperBuffer(unsigned long);

};

Expand Down