jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Improve JackPortAudioDriver::Stop.

tags/v1.9.10
Stephane Letz 12 years ago
parent
fe906854e4
commit
b6f5e66d09
15 changed files with 31 additions and 24 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      windows/jackaudioadapter.rc
  2. +1
    -1
      windows/jackd.rc
  3. +1
    -1
      windows/jackdummydriver.rc
  4. +1
    -1
      windows/jackloopbackdriver.rc
  5. +2
    -2
      windows/jacknetadapter.rc
  6. +2
    -2
      windows/jacknetdriver.rc
  7. +2
    -2
      windows/jacknetmanager.rc
  8. +1
    -1
      windows/jacknetonedriver.rc
  9. +1
    -1
      windows/jackportaudio.rc
  10. +1
    -1
      windows/jackwinmme.rc
  11. +1
    -1
      windows/libjack.rc
  12. +1
    -1
      windows/libjacknet.rc
  13. +2
    -2
      windows/libjackserver.rc
  14. +1
    -0
      windows/portaudio/JackPortAudioDevices.cpp
  15. +13
    -7
      windows/portaudio/JackPortAudioDriver.cpp

+ 1
- 1
windows/jackaudioadapter.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp Audio Adapter for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "audioadapter\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "audioadapter.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jackd.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jack server for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jackd\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jackd.exe\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jackdummydriver.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp Dummy Driver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_dummy\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_dummy.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jackloopbackdriver.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp Loopback Driver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_loopback\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_loopback.dll\0"
VALUE "PrivateBuild", "\0"


+ 2
- 2
windows/jacknetadapter.rc View File

@@ -22,10 +22,10 @@ BEGIN
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Adapter for Windows\0"
VALUE "FileDescription", "Jackmp NetAdapter for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "netadapter\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netadapter.dll\0"
VALUE "PrivateBuild", "\0"


+ 2
- 2
windows/jacknetdriver.rc View File

@@ -22,10 +22,10 @@ BEGIN
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Driver for Windows\0"
VALUE "FileDescription", "Jackmp NetDriver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_netdriver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netdriver.dll\0"
VALUE "PrivateBuild", "\0"


+ 2
- 2
windows/jacknetmanager.rc View File

@@ -22,10 +22,10 @@ BEGIN
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Manager for Windows\0"
VALUE "FileDescription", "Jackmp NetManager for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "netmanager\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netmanager.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jacknetonedriver.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_netonedriver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netonedriver.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jackportaudio.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp PortAudio Driver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_portaudio\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_portaudio.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/jackwinmme.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jackmp WinMME Driver for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "jack_portaudio\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_winmme.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/libjack.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jack client library for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "libjack\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjack.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 1
windows/libjacknet.rc View File

@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jack Net library for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "libjacknet\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjacknet.dll\0"
VALUE "PrivateBuild", "\0"


+ 2
- 2
windows/libjackserver.rc View File

@@ -1,4 +1,4 @@
// Generated by ResEdit 1.4.3
2006-2013// Generated by ResEdit 1.4.3
// Copyright (C) 2006-2008
// http://www.resedit.net
@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Jack server library for Windows\0"
VALUE "FileVersion", "1, 9, 10\0"
VALUE "InternalName", "libjackserver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2013\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjackserver.dll\0"
VALUE "PrivateBuild", "\0"


+ 1
- 0
windows/portaudio/JackPortAudioDevices.cpp View File

@@ -46,6 +46,7 @@ PortAudioDevices::PortAudioDevices()

PortAudioDevices::~PortAudioDevices()
{
jack_log("Terminate PortAudio...");
Pa_Terminate();

delete[] fDeviceInfo;


+ 13
- 7
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -229,7 +229,7 @@ int JackPortAudioDriver::Open(jack_nframes_t buffer_size,

err = OpenStream(buffer_size);
if (err != paNoError) {
jack_error("Pa_OpenStream error %d = %s", err, Pa_GetErrorText(err));
jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err));
goto error;
}

@@ -298,10 +298,12 @@ int JackPortAudioDriver::Attach()
int JackPortAudioDriver::Start()
{
jack_log("JackPortAudioDriver::Start");
if (JackAudioDriver::Start() >= 0) {
if (Pa_StartStream(fStream) == paNoError) {
if (JackAudioDriver::Start() == 0) {
PaError err;
if ((err = Pa_StartStream(fStream)) == paNoError) {
return 0;
}
jack_error("Pa_StartStream error = %s", Pa_GetErrorText(err))
JackAudioDriver::Stop();
}
return -1;
@@ -310,11 +312,15 @@ int JackPortAudioDriver::Start()
int JackPortAudioDriver::Stop()
{
jack_log("JackPortAudioDriver::Stop");
int res = (Pa_StopStream(fStream) == paNoError) ? 0 : -1;
PaError err;
if ((err = Pa_StopStream(fStream)) != paNoError) {
jack_error("Pa_StopStream error = %s", Pa_GetErrorText(err));
}
if (JackAudioDriver::Stop() < 0) {
res = -1;
return -1;
} else {
return (err == paNoError) ? 0 : -1;
}
return res;
}

int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
@@ -332,7 +338,7 @@ int JackPortAudioDriver::SetBufferSize(jack_nframes_t buffer_size)
err = OpenStream(buffer_size);
if (err != paNoError) {
jack_error("Pa_OpenStream error %d = %s", err, Pa_GetErrorText(err));
jack_error("Pa_OpenStream error = %s", Pa_GetErrorText(err));
goto error;
} else {
JackAudioDriver::SetBufferSize(buffer_size); // Generic change, never fails


Write Preview
Loading…
Cancel
Save