From 29daaa76a3e03f655e7a1aaf1437b51d35ce750b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Aug 2019 09:19:01 +0200 Subject: Build against system installation of RtAudio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337 Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 rather than using the included copy (which has been stripped away for the Debian package anyhow) Last-Update: 2015-06-28 Gbp-Pq: Name system-rtaudio.patch --- src/jacktrip.pro | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/jacktrip.pro b/src/jacktrip.pro index bd95a2b..0a786d8 100644 --- a/src/jacktrip.pro +++ b/src/jacktrip.pro @@ -36,20 +36,24 @@ macx { LIBS += -framework CoreAudio -framework CoreFoundation DEFINES += __MAC_OSX__ } -linux-g++ { - message(Linux) - LIBS += -lasound + +linux-g++ | linux-g++-64 { + LIBS += -lrtaudio QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags QMAKE_CXXFLAGS += -g -O2 DEFINES += __LINUX__ } + +linux-g++ { + message(Linux) + QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags + } + linux-g++-64 { message(Linux 64bit) - LIBS += -lasound QMAKE_CXXFLAGS += -fPIC -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags - QMAKE_CXXFLAGS += -g -O2 - DEFINES += __LINUX__ } + win32 { message(win32) CONFIG += x86 console @@ -68,14 +72,6 @@ QMAKE_CLEAN += -r ./jacktrip ./jacktrip_debug ./release ./debug target.path = /usr/bin INSTALLS += target -#INCLUDEPATH += ../externals/includes/rtaudio-4.0.7 -#DEPENDPATH += ../externals/includes/rtaudio-4.0.7 -win32 { - INCLUDEPATH += ../externals/includes/rtaudio-4.0.7/include - INCLUDEPATH += ../externals/includes - DEPENDPATH += ../externals/includes/rtaudio-4.0.7/include - DEPENDPATH += ../externals/includes -} # Input HEADERS += DataProtocol.h \ @@ -124,9 +120,17 @@ SOURCES += JackAudioInterface.cpp } # RtAduio Input -HEADERS += ../externals/includes/rtaudio-4.0.7/RtAudio.h \ - ../externals/includes/rtaudio-4.0.7/RtError.h -SOURCES += ../externals/includes/rtaudio-4.0.7/RtAudio.cpp +win32 { + INCLUDEPATH += ../externals/rtaudio-4.1.1/include + DEPENDPATH += ../externals/rtaudio-4.1.1/include +} +macx | win32 { +INCLUDEPATH += ../externals/rtaudio-4.1.1/ +DEPENDPATH += ../externals/rtaudio-4.1.1/ +HEADERS += ../externals/rtaudio-4.1.1/RtAudio.h +SOURCES += ../externals/rtaudio-4.1.1/RtAudio.cpp +} + win32 { HEADERS += asio.h \ asiodrivers.h \ -- cgit v1.2.3 From 7ac40201775b50d7b8f1bb7b2ca845c921d8ef94 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Aug 2019 09:19:01 +0200 Subject: made it compile with RtAudio-4.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337 Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 RtAudio has changed the exception class from RtError to RtAudioError Last-Update: 2015-06-28 Gbp-Pq: Name rtaudio411.patch --- src/RtAudioInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RtAudioInterface.cpp b/src/RtAudioInterface.cpp index 3add762..a08c8a7 100644 --- a/src/RtAudioInterface.cpp +++ b/src/RtAudioInterface.cpp @@ -123,7 +123,7 @@ void RtAudioInterface::setup() sampleRate, &bufferFrames, &RtAudioInterface::wrapperRtAudioCallback, this, &options); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; exit( 0 ); } @@ -213,7 +213,7 @@ int RtAudioInterface::wrapperRtAudioCallback(void *outputBuffer, void *inputBuff int RtAudioInterface::startProcess() const { try { mRtAudio->startStream(); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; return(-1); } @@ -225,7 +225,7 @@ int RtAudioInterface::startProcess() const int RtAudioInterface::stopProcess() const { try { mRtAudio->closeStream(); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; return(-1); } -- cgit v1.2.3 From 062008f9fbd697fd6cd65be4a383422832ef4eca Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Aug 2019 09:19:01 +0200 Subject: remove sourceforge-logo from docs Last-Update: 2014-02-05 the footer of each doxygen-generate documentation file included an image hosted at sourceforge. thus accessing the documentation would potentially breach the privacy of the user Last-Update: 2014-02-05 Gbp-Pq: Name remove_sflogo.patch --- documentation/html_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/html_footer.html b/documentation/html_footer.html index 979f8b8..584df61 100644 --- a/documentation/html_footer.html +++ b/documentation/html_footer.html @@ -13,7 +13,7 @@ Chris Chafe
Stanford University

-SourceForge.net Logo +SourceForge

-- cgit v1.2.3 From cbf1fcdc109b7977b9757719413b2c1ab62bfad0 Mon Sep 17 00:00:00 2001 From: Maria Valentina Marin Date: Wed, 28 Aug 2019 09:19:01 +0200 Subject: Remove $datetime from html_footer.html to make package reproducible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 Last-Update: 2015-06-28 Gbp-Pq: Name remove_datetime.patch --- documentation/html_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/html_footer.html b/documentation/html_footer.html index 584df61..d23d80d 100644 --- a/documentation/html_footer.html +++ b/documentation/html_footer.html @@ -4,7 +4,7 @@

 

-

Documentation generated by Doxygen $doxygenversion on $datetime

+

Documentation generated by Doxygen $doxygenversion

© 2008 by Juan-Pablo Caceres (jcaceres at ccrma dot stanford dot edu) and Chris Chafe
-- cgit v1.2.3 From 709c6c4f7b5eec7833adf3d11a52e2806ca14c31 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Aug 2019 09:19:01 +0200 Subject: Fix typos Forwarded: https://github.com/jcacerec/jacktrip/pull/17 Last-Update: 2015-06-29 fixes some spelling errors in the printout Last-Update: 2015-06-29 Gbp-Pq: Name fix_typos.patch --- src/JackTrip.cpp | 2 +- src/Settings.cpp | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/JackTrip.cpp b/src/JackTrip.cpp index 0ae9f39..d00701d 100644 --- a/src/JackTrip.cpp +++ b/src/JackTrip.cpp @@ -539,7 +539,7 @@ int JackTrip::clientPingToServerStart() throw(std::invalid_argument) // -------------------- tcpClient.close(); // Close the socket //cout << "TCP Socket Closed!" << endl; - cout << "Connection Succesfull!" << endl; + cout << "Connection Successful!" << endl; // Set with the received UDP port // ------------------------------ diff --git a/src/Settings.cpp b/src/Settings.cpp index 21d9601..cc57b64 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -182,7 +182,7 @@ void Settings::parseInput(int argc, char** argv) else if ( atoi(optarg) == 32 ) { mAudioBitResolution = AudioInterface::BIT32; } else { - std::cerr << "--bitres ERROR: Wrong bit resolutions: " + std::cerr << "--bitres ERROR: Wrong bit resolution: " << atoi(optarg) << " is not supported." << endl; printUsage(); std::exit(1); } @@ -190,7 +190,7 @@ void Settings::parseInput(int argc, char** argv) case 'q': //------------------------------------------------------- if ( atoi(optarg) <= 0 ) { - std::cerr << "--queue ERROR: The queue has to be equal or greater that 2" << endl; + std::cerr << "--queue ERROR: The queue has to be equal or greater than 2" << endl; printUsage(); std::exit(1); } else { @@ -244,7 +244,7 @@ void Settings::parseInput(int argc, char** argv) case 'v': //------------------------------------------------------- cout << "JackTrip VERSION: " << gVersion << endl; - cout << "Copyright (c) 2008-2009 Juan-Pablo Caceres, Chris Chafe." << endl; + cout << "Copyright (c) 2008-2015 Juan-Pablo Caceres, Chris Chafe." << endl; cout << "SoundWIRE group at CCRMA, Stanford University" << endl; cout << "" << endl; std::exit(0); @@ -265,11 +265,11 @@ void Settings::parseInput(int argc, char** argv) //---------------------------------------------------------------------------- if (optind < argc) { cout << gPrintSeparator << endl; - cout << "WARINING: The following entered options have no effect" << endl; + cout << "WARINING: The following entered options have no effect." << endl; cout << " They will be ignored!" << endl; - cout << " Type jacktrip to see options." << endl; + cout << " Type 'jacktrip' to see options." << endl; for( ; optind < argc; optind++) { - printf("argument: %s\n", argv[optind]); + cout << "argument: " << argv[optind] << endl; } cout << gPrintSeparator << endl; } @@ -297,27 +297,27 @@ void Settings::printUsage() cout << endl; cout << "OPTIONAL ARGUMENTS: " << endl; cout << "===================" << endl; - cout << " -n, --numchannels # Number of Input and Output Channels (default " + cout << " -n, --numchannels # Number of Input and Output Channels (default: " << 2 << ")" << endl; - cout << " -q, --queue # (2 or more) Queue Buffer Length, in Packet Size (default " + cout << " -q, --queue # (2 or more) Queue Buffer Length, in Packet Size (default: " << gDefaultQueueLength << ")" << endl; - cout << " -r, --redundancy # (1 or more) Packet Redundancy to avoid glitches with packet losses (defaul 1)" + cout << " -r, --redundancy # (1 or more) Packet Redundancy to avoid glitches with packet losses (default: 1)" << endl; cout << " -o, --portoffset # Receiving port offset from base port " << gDefaultPort << endl; - cout << " --bindport # Set only the bind port number (default to 4464)" << endl; - cout << " --peerport # Set only the Peer port number (default to 4464)" << endl; - cout << " -b, --bitres # (8, 16, 24, 32) Audio Bit Rate Resolutions (default 16)" << endl; - cout << " -z, --zerounderrun Set buffer to zeros when underrun occurs (defaults to wavetable)" << endl; + cout << " --bindport # Set only the bind port number (default: 4464)" << endl; + cout << " --peerport # Set only the Peer port number (default: 4464)" << endl; + cout << " -b, --bitres # (8, 16, 24, 32) Audio Bit Rate Resolutions (default: 16)" << endl; + cout << " -z, --zerounderrun Set buffer to zeros when underrun occurs (default: wavetable)" << endl; cout << " -l, --loopback Run in Loop-Back Mode" << endl; cout << " -j, --jamlink Run in JamLink Mode (Connect to a JamLink Box)" << endl; - cout << " --clientname Change default client name (default is JackTrip)" << endl; - cout << " --localaddress Change default local host IP address (127.0.0.1)" << endl; + cout << " --clientname Change default client name (default: JackTrip)" << endl; + cout << " --localaddress Change default local host IP address (default: 127.0.0.1)" << endl; cout << endl; - cout << "ARGUMENTS TO USE IT WITHOUT JACK:" << endl; - cout << "=================================" << endl; - cout << " --rtaudio Use defaul sound system instead of Jack" << endl; - cout << " --srate # Set the sampling rate, works on --rtaudio mode only (defaults 48000)" << endl; - cout << " --bufsize # Set the buffer size, works on --rtaudio mode only (defaults 128)" << endl; + cout << "ARGUMENTS TO USE JACKTRIP WITHOUT JACK:" << endl; + cout << "=======================================" << endl; + cout << " --rtaudio Use system's default sound system instead of Jack" << endl; + cout << " --srate # Set the sampling rate, works on --rtaudio mode only (default: 48000)" << endl; + cout << " --bufsize # Set the buffer size, works on --rtaudio mode only (default: 128)" << endl; cout << endl; cout << "HELP ARGUMENTS: " << endl; cout << "===============" << endl; -- cgit v1.2.3 From 7dfe11d134a84dc075e45045f6ce5b23b809b00c Mon Sep 17 00:00:00 2001 From: Aaron Wyatt Date: Mon, 2 Sep 2019 13:35:55 +0200 Subject: convert IPv4-mapped addresses to IPv4 addresses Forwarded: no Last-Update: 2019-09-02 Other clients hang at "Waiting for Peer..." when attempting to connect to jacktrip running as a server. This is because of a change to the way that QHostAddress works in Qt5, resulting in the return of an IPv4-mapped address instead of an IPv4 address. The attached a patch fixes this (restoring the behaviour shown by Qt4). Last-Update: 2019-09-02 Gbp-Pq: Name convert_IPv4.patch --- src/JackTrip.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/JackTrip.cpp b/src/JackTrip.cpp index 0ae9f39..8f149e7 100644 --- a/src/JackTrip.cpp +++ b/src/JackTrip.cpp @@ -450,7 +450,16 @@ int JackTrip::serverStart(bool timeout, int udpTimeout) UdpSockTemp.readDatagram(buf, 1, &peerHostAddress, &peer_port); UdpSockTemp.close(); // close the socket - mPeerAddress = peerHostAddress.toString(); + // Convert any IPv4-mapped address to an actual IPv4 address + // (Due to a change in the way that QHostAddress works in Qt5) + bool couldConvert; + QHostAddress ipv4Address(peerHostAddress.toIPv4Address(&couldConvert)); + if (couldConvert) { + mPeerAddress = ipv4Address.toString(); + } else { + mPeerAddress = peerHostAddress.toString(); + } + cout << "Client Connection Received from IP : " << qPrintable(mPeerAddress) << endl; cout << gPrintSeparator << endl; -- cgit v1.2.3 From 611efa065f011cd716827220ab13ab7b42c005d0 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 2 Sep 2019 13:35:55 +0200 Subject: Build against system installation of RtAudio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337 Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 rather than using the included copy (which has been stripped away for the Debian package anyhow) Last-Update: 2015-06-28 Gbp-Pq: Name system-rtaudio.patch --- src/jacktrip.pro | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/jacktrip.pro b/src/jacktrip.pro index bd95a2b..0a786d8 100644 --- a/src/jacktrip.pro +++ b/src/jacktrip.pro @@ -36,20 +36,24 @@ macx { LIBS += -framework CoreAudio -framework CoreFoundation DEFINES += __MAC_OSX__ } -linux-g++ { - message(Linux) - LIBS += -lasound + +linux-g++ | linux-g++-64 { + LIBS += -lrtaudio QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags QMAKE_CXXFLAGS += -g -O2 DEFINES += __LINUX__ } + +linux-g++ { + message(Linux) + QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags + } + linux-g++-64 { message(Linux 64bit) - LIBS += -lasound QMAKE_CXXFLAGS += -fPIC -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags - QMAKE_CXXFLAGS += -g -O2 - DEFINES += __LINUX__ } + win32 { message(win32) CONFIG += x86 console @@ -68,14 +72,6 @@ QMAKE_CLEAN += -r ./jacktrip ./jacktrip_debug ./release ./debug target.path = /usr/bin INSTALLS += target -#INCLUDEPATH += ../externals/includes/rtaudio-4.0.7 -#DEPENDPATH += ../externals/includes/rtaudio-4.0.7 -win32 { - INCLUDEPATH += ../externals/includes/rtaudio-4.0.7/include - INCLUDEPATH += ../externals/includes - DEPENDPATH += ../externals/includes/rtaudio-4.0.7/include - DEPENDPATH += ../externals/includes -} # Input HEADERS += DataProtocol.h \ @@ -124,9 +120,17 @@ SOURCES += JackAudioInterface.cpp } # RtAduio Input -HEADERS += ../externals/includes/rtaudio-4.0.7/RtAudio.h \ - ../externals/includes/rtaudio-4.0.7/RtError.h -SOURCES += ../externals/includes/rtaudio-4.0.7/RtAudio.cpp +win32 { + INCLUDEPATH += ../externals/rtaudio-4.1.1/include + DEPENDPATH += ../externals/rtaudio-4.1.1/include +} +macx | win32 { +INCLUDEPATH += ../externals/rtaudio-4.1.1/ +DEPENDPATH += ../externals/rtaudio-4.1.1/ +HEADERS += ../externals/rtaudio-4.1.1/RtAudio.h +SOURCES += ../externals/rtaudio-4.1.1/RtAudio.cpp +} + win32 { HEADERS += asio.h \ asiodrivers.h \ -- cgit v1.2.3 From 26ca99b10b6072fa25f7d518fdea2f87bda190de Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 2 Sep 2019 13:35:55 +0200 Subject: made it compile with RtAudio-4.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337 Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 RtAudio has changed the exception class from RtError to RtAudioError Last-Update: 2015-06-28 Gbp-Pq: Name rtaudio411.patch --- src/RtAudioInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RtAudioInterface.cpp b/src/RtAudioInterface.cpp index 3add762..a08c8a7 100644 --- a/src/RtAudioInterface.cpp +++ b/src/RtAudioInterface.cpp @@ -123,7 +123,7 @@ void RtAudioInterface::setup() sampleRate, &bufferFrames, &RtAudioInterface::wrapperRtAudioCallback, this, &options); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; exit( 0 ); } @@ -213,7 +213,7 @@ int RtAudioInterface::wrapperRtAudioCallback(void *outputBuffer, void *inputBuff int RtAudioInterface::startProcess() const { try { mRtAudio->startStream(); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; return(-1); } @@ -225,7 +225,7 @@ int RtAudioInterface::startProcess() const int RtAudioInterface::stopProcess() const { try { mRtAudio->closeStream(); } - catch ( RtError& e ) { + catch ( RtAudioError& e ) { std::cout << '\n' << e.getMessage() << '\n' << std::endl; return(-1); } -- cgit v1.2.3 From 8bd95f63a9e73eb0d57cdc5ab331cd0022638639 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 2 Sep 2019 13:35:55 +0200 Subject: remove sourceforge-logo from docs Last-Update: 2014-02-05 the footer of each doxygen-generate documentation file included an image hosted at sourceforge. thus accessing the documentation would potentially breach the privacy of the user Last-Update: 2014-02-05 Gbp-Pq: Name remove_sflogo.patch --- documentation/html_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/html_footer.html b/documentation/html_footer.html index 979f8b8..584df61 100644 --- a/documentation/html_footer.html +++ b/documentation/html_footer.html @@ -13,7 +13,7 @@ Chris Chafe
Stanford University

-SourceForge.net Logo +SourceForge

-- cgit v1.2.3 From e1dbd3170cce75c48fa5a86116c971fe5fd0a8a3 Mon Sep 17 00:00:00 2001 From: Maria Valentina Marin Date: Mon, 2 Sep 2019 13:35:55 +0200 Subject: Remove $datetime from html_footer.html to make package reproducible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2015-06-28 Last-Update: 2015-06-28 Gbp-Pq: Name remove_datetime.patch --- documentation/html_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/html_footer.html b/documentation/html_footer.html index 584df61..d23d80d 100644 --- a/documentation/html_footer.html +++ b/documentation/html_footer.html @@ -4,7 +4,7 @@