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

Correct JackTools::KillServer.

tags/1.9.9.5
Stephane Letz 13 years ago
parent
4e52876351
commit
77658bff14
15 changed files with 58 additions and 61 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -5
      common/JackTools.cpp
  2. +4
    -4
      windows/jackaudioadapter.rc
  3. +4
    -4
      windows/jackd.rc
  4. +4
    -4
      windows/jackdummydriver.rc
  5. +4
    -4
      windows/jackloopbackdriver.rc
  6. +4
    -4
      windows/jacknetadapter.rc
  7. +4
    -4
      windows/jacknetdriver.rc
  8. +4
    -4
      windows/jacknetmanager.rc
  9. +4
    -4
      windows/jacknetonedriver.rc
  10. +4
    -4
      windows/jackportaudio.rc
  11. +4
    -4
      windows/jackwinmme.rc
  12. +4
    -4
      windows/libjack.rc
  13. +4
    -4
      windows/libjacknet.rc
  14. +4
    -4
      windows/libjackserver.rc
  15. +4
    -4
      windows/resource.rc

+ 2
- 5
common/JackTools.cpp View File

@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <signal.h>

#ifdef WIN32
#include <process.h>
@@ -36,11 +37,7 @@ namespace Jack {

void JackTools::KillServer()
{
#ifdef WIN32
exit(1);
#else
kill(GetPID(), SIGINT);
#endif
raise(SIGINT);
}

void JackTools::ThrowJackNetException()


+ 4
- 4
windows/jackaudioadapter.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Audio Adapter for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "audioadapter\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "audioadapter.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "audioadapter\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jackd.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_APP
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jack server for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jackd\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jackd.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jackd\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jackdummydriver.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Dummy Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_dummy\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_dummy.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_dummy\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jackloopbackdriver.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Loopback Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_loopback\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_loopback.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_loopback\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jacknetadapter.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Adapter for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "netadapter\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netadapter.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "netadapter\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jacknetdriver.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_netdriver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netdriver.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_netdriver\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jacknetmanager.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp Net Manager for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "netmanager\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netmanager.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "netmanager\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jacknetonedriver.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_netonedriver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_netonedriver.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_netonedriver\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jackportaudio.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp PortAudio Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_portaudio\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_portaudio.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_portaudio\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/jackwinmme.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp WinMME Driver for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "jack_portaudio\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "jack_winmme.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "jack_winmme\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/libjack.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jack client library for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "libjack\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjack.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "libjack\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/libjacknet.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jack Net library for Windows\0"
VALUE "FileVersion", "1, 9, 9, 01\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "libjacknet\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjacknet.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "libjacknet\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/libjackserver.rc View File

@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
1 VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEOS VOS_UNKNOWN
FILETYPE VFT_DLL
BEGIN
@@ -23,14 +23,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jack server library for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "libjackserver\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjackserver.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "libjackserver\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


+ 4
- 4
windows/resource.rc View File

@@ -14,8 +14,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH

#ifndef _MAC
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,9,9,1
PRODUCTVERSION 1,9,9,1
FILEVERSION 1,9,9,2
PRODUCTVERSION 1,9,9,2
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -33,14 +33,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Grame\0"
VALUE "FileDescription", "Jackmp for Windows\0"
VALUE "FileVersion", "1, 9, 9, 1\0"
VALUE "FileVersion", "1, 9, 9, 2\0"
VALUE "InternalName", "libjackmp\0"
VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libjackmp.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "libjackmp\0"
VALUE "ProductVersion", "1, 9, 9, 1\0"
VALUE "ProductVersion", "1, 9, 9, 2\0"
VALUE "SpecialBuild", "\0"
END
END


Write Preview
Loading…
Cancel
Save