+++ /dev/null
-Description: convert IPv4-mapped addresses to IPv4 addresses
- 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).
-Author: Aaron Wyatt <dev@psi-borg.org>
-Forwarded: no
-Last-Update: 2019-09-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/src/JackTrip.cpp
-+++ jacktrip/src/JackTrip.cpp
-@@ -450,7 +450,16 @@
- 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;
+++ /dev/null
-Description: Fix typos
- fixes some spelling errors in the printout
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/jcacerec/jacktrip/pull/17
-Last-Update: 2015-06-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/src/Settings.cpp
-+++ jacktrip/src/Settings.cpp
-@@ -182,7 +182,7 @@
- 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 @@
- 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 @@
- 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 @@
- //----------------------------------------------------------------------------
- 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 @@
- 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;
---- jacktrip.orig/src/JackTrip.cpp
-+++ jacktrip/src/JackTrip.cpp
-@@ -548,7 +548,7 @@
- // --------------------
- tcpClient.close(); // Close the socket
- //cout << "TCP Socket Closed!" << endl;
-- cout << "Connection Succesfull!" << endl;
-+ cout << "Connection Successful!" << endl;
-
- // Set with the received UDP port
- // ------------------------------
+++ /dev/null
-Description: Remove $datetime from html_footer.html to make package reproducible
-Author: Maria Valentina Marin <marivalenm@gmail.com>
-Reviewed-by: IOhannes m zmölnig
-Last-Update: 2015-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/documentation/html_footer.html
-+++ jacktrip/documentation/html_footer.html
-@@ -4,7 +4,7 @@
- <footer>
- <p> </p>
- <font size="1">
--<p>Documentation generated by Doxygen $doxygenversion on $datetime</p>
-+<p>Documentation generated by Doxygen $doxygenversion</p>
- <p>
- © 2008 by Juan-Pablo Caceres (jcaceres <em>at</em> ccrma <em>dot</em> stanford <em>dot</em> edu) and
- Chris Chafe<br />
+++ /dev/null
-Description: remove sourceforge-logo from docs
- 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
-Author: IOhannes m zmölnig
-Last-Update: 2014-02-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/documentation/html_footer.html
-+++ jacktrip/documentation/html_footer.html
-@@ -13,7 +13,7 @@
- <a href="http://www.stanford.edu/" title="Stanford home">Stanford University</a>
- </font>
- <p>
--<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=236811&type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-+<a href="http://sourceforge.net">SourceForge</a>
- </p>
- </center>
- </footer>
+++ /dev/null
-Description: made it compile with RtAudio-4.1.1
- RtAudio has changed the exception class from RtError to RtAudioError
-Author: Juan-Pablo Caceres
-Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337
-Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d
-Reviewed-by: IOhannes m zmölnig
-Last-Update: 2015-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/src/RtAudioInterface.cpp
-+++ jacktrip/src/RtAudioInterface.cpp
-@@ -123,7 +123,7 @@
- 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::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::stopProcess() const
- {
- try { mRtAudio->closeStream(); }
-- catch ( RtError& e ) {
-+ catch ( RtAudioError& e ) {
- std::cout << '\n' << e.getMessage() << '\n' << std::endl;
- return(-1);
- }
+++ /dev/null
-convert_IPv4.patch
-system-rtaudio.patch
-rtaudio411.patch
-remove_sflogo.patch
-remove_datetime.patch
-fix_typos.patch
+++ /dev/null
-Description: Build against system installation of RtAudio
- rather than using the included copy (which has been stripped
- away for the Debian package anyhow)
-Author: Juan-Pablo Caceres
-Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337
-Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d
-Reviewed-by: IOhannes m zmölnig
-Last-Update: 2015-06-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- jacktrip.orig/src/jacktrip.pro
-+++ jacktrip/src/jacktrip.pro
-@@ -36,20 +36,24 @@
- 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 @@
- 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 @@
- }
-
- # 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 \
projects / jacktrip.git / commitdiff