Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TPF
jack2
Commits
fcf8c5ae
Commit
fcf8c5ae
authored
Feb 28, 2013
by
Stephane Letz
Browse files
Typos.
parent
b6f5e66d
Changes
3
Hide whitespace changes
Inline
Side-by-side
windows/libjackserver.rc
View file @
fcf8c5ae
2006-2013
// Generated by ResEdit 1.4.3
// Generated by ResEdit 1.4.3
// Copyright (C) 2006-2008
// http://www.resedit.net
...
...
windows/portaudio/JackPortAudioDriver.cpp
View file @
fcf8c5ae
...
...
@@ -166,14 +166,14 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
int
in_max
=
0
;
int
out_max
=
0
;
PaError
err
=
paNoError
;
if
(
!
fPaDevices
)
{
fPaDevices
=
new
PortAudioDevices
();
}
fCaptureLatency
=
capture_latency
;
fPlaybackLatency
=
playback_latency
;
jack_log
(
"JackPortAudioDriver::Open nframes = %ld in = %ld out = %ld capture name = %s playback name = %s samplerate = %ld"
,
buffer_size
,
inchannels
,
outchannels
,
capture_driver_uid
,
playback_driver_uid
,
samplerate
);
...
...
@@ -188,13 +188,13 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,
goto
error
;
}
}
// If ASIO, request for preferred size (assuming fInputDevice and fOutputDevice are the same)
if
(
buffer_size
==
0
)
{
if
(
buffer_size
==
0
)
{
buffer_size
=
fPaDevices
->
GetPreferredBufferSize
(
fInputDevice
);
jack_log
(
"JackPortAudioDriver::Open preferred buffer_size = %d"
,
buffer_size
);
}
// Generic JackAudioDriver Open
if
(
JackAudioDriver
::
Open
(
buffer_size
,
samplerate
,
capturing
,
playing
,
inchannels
,
outchannels
,
monitor
,
capture_driver_uid
,
playback_driver_uid
,
capture_latency
,
playback_latency
)
!=
0
)
{
...
...
@@ -303,7 +303,7 @@ int JackPortAudioDriver::Start()
if
((
err
=
Pa_StartStream
(
fStream
))
==
paNoError
)
{
return
0
;
}
jack_error
(
"Pa_StartStream error = %s"
,
Pa_GetErrorText
(
err
))
jack_error
(
"Pa_StartStream error = %s"
,
Pa_GetErrorText
(
err
))
;
JackAudioDriver
::
Stop
();
}
return
-
1
;
...
...
@@ -331,11 +331,11 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
jack_error
(
"Pa_CloseStream error = %s"
,
Pa_GetErrorText
(
err
));
goto
error
;
}
// It seems that some ASIO drivers (like ASIO4All) needs this to restart correctly;
delete
fPaDevices
;
fPaDevices
=
new
PortAudioDevices
();
err
=
OpenStream
(
buffer_size
);
if
(
err
!=
paNoError
)
{
jack_error
(
"Pa_OpenStream error = %s"
,
Pa_GetErrorText
(
err
));
...
...
@@ -344,7 +344,7 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
JackAudioDriver
::
SetBufferSize
(
buffer_size
);
// Generic change, never fails
return
0
;
}
error:
fStream
=
NULL
;
return
-
1
;
...
...
windows/portaudio/JackPortAudioDriver.h
View file @
fcf8c5ae
...
...
@@ -36,12 +36,12 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver
private:
PortAudioDevices
*
fPaDevices
;
PaStream
*
fStream
;
jack_default_audio_sample_t
**
fInputBuffer
;
jack_default_audio_sample_t
**
fOutputBuffer
;
PaDeviceIndex
fInputDevice
;
PaDeviceIndex
fOutputDevice
;
PortAudioDevices
*
fPaDevices
;
static
int
Render
(
const
void
*
inputBuffer
,
void
*
outputBuffer
,
unsigned
long
framesPerBuffer
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment