Commit 8d6358ec authored by jcacerec's avatar jcacerec
Browse files

Several documentation and small updates

parent 7aea2aa2
---
1.0.3 Alpha
- (fixed) Now supports 64bits machines
- (fixed) Improved exceptions handling
- (added) Meta-server
- (added) Basic Karplus-Strong model added
---
1.0.2 Alpha
- (added) Port offset mode, to use a different UDP port than the default one.
......
......@@ -61,8 +61,7 @@ JackAudioInterface::JackAudioInterface(JackTrip* jacktrip,
mNumInChans(NumInChans), mNumOutChans(NumOutChans),
mAudioBitResolution(AudioBitResolution*8), mBitResolutionMode(AudioBitResolution),
mClient(NULL),
mJackTrip(jacktrip),
mPorts(NULL)
mJackTrip(jacktrip)
{
setupClient();
setProcessCallback();
......@@ -82,8 +81,6 @@ JackAudioInterface::~JackAudioInterface()
for (int i = 0; i < mNumOutChans; i++) {
delete[] mOutProcessBuffer[i];
}
//std::free(mPorts);
}
......@@ -601,8 +598,9 @@ void JackAudioInterface::appendProcessPlugin(ProcessPlugin* plugin)
//*******************************************************************************
void JackAudioInterface::connectDefaultPorts()
{
const char** ports;
// Get physical output (capture) ports
if ( (mPorts =
if ( (ports =
jack_get_ports (mClient, NULL, NULL,
JackPortIsPhysical | JackPortIsOutput)) == NULL)
{
......@@ -613,15 +611,15 @@ void JackAudioInterface::connectDefaultPorts()
for (int i = 0; i < mNumInChans; i++)
{
// Check that we don't run out of capture ports
if ( mPorts[i] != NULL ) {
jack_connect(mClient, mPorts[i], jack_port_name(mInPorts[i]));
if ( ports[i] != NULL ) {
jack_connect(mClient, ports[i], jack_port_name(mInPorts[i]));
}
}
std::free(mPorts);
std::free(ports);
// Get physical input (playback) ports
if ( (mPorts =
if ( (ports =
jack_get_ports (mClient, NULL, NULL,
JackPortIsPhysical | JackPortIsInput)) == NULL)
{
......@@ -632,10 +630,10 @@ void JackAudioInterface::connectDefaultPorts()
for (int i = 0; i < mNumOutChans; i++)
{
// Check that we don't run out of capture ports
if ( mPorts[i] != NULL ) {
jack_connect(mClient, jack_port_name(mOutPorts[i]), mPorts[i]);
if ( ports[i] != NULL ) {
jack_connect(mClient, jack_port_name(mOutPorts[i]), ports[i]);
}
}
std::free(mPorts);
std::free(ports);
}
......@@ -283,12 +283,9 @@ private:
int8_t* mOutputPacket; ///< Packet containing all the channels to send to the RingBuffer
size_t mSizeInBytesPerChannel; ///< Size in bytes per audio channel
/// Vector of Smart Pointer to ProcesPlugin<EM>s</EM>
//QVector<std::tr1::shared_ptr<ProcessPlugin> > mProcessPlugins;
QVector<ProcessPlugin*> mProcessPlugins;
QVector<ProcessPlugin*> mProcessPlugins; ///< Vector of ProcesPlugin<EM>s</EM>
JackTrip* mJackTrip; ///< JackTrip mediator class
const char** mPorts;
static QMutex sJackMutex; ///< Mutex to make thread safe jack functions that are not
};
......
//*****************************************************************
/*
JackTrip: A System for High-Quality Audio Network Performance
over the Internet
Copyright (c) 2008 Juan-Pablo Caceres, Chris Chafe.
SoundWIRE group at CCRMA, Stanford University.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/
//*****************************************************************
/**
* \file JackTripWorker.cpp
* \author Juan-Pablo Caceres
......
//*****************************************************************
/*
JackTrip: A System for High-Quality Audio Network Performance
over the Internet
Copyright (c) 2008 Juan-Pablo Caceres, Chris Chafe.
SoundWIRE group at CCRMA, Stanford University.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/
//*****************************************************************
/**
* \file JackTripWorker.h
* \author Juan-Pablo Caceres
......
......@@ -209,6 +209,7 @@ void Settings::printUsage()
cout << "over the Internet" << endl;
cout << "Copyright (c) 2008 Juan-Pablo Caceres, Chris Chafe." << endl;
cout << "SoundWIRE group at CCRMA, Stanford University" << endl;
cout << "VERSION: " << gVersion << endl;
cout << "-----------------------------------------------------------------------------" << endl;
cout << "" << endl;
cout << "Usage: jacktrip [-s|-c host] [options]" << endl;
......
//*****************************************************************
/*
JackTrip: A System for High-Quality Audio Network Performance
over the Internet
Copyright (c) 2008 Juan-Pablo Caceres, Chris Chafe.
SoundWIRE group at CCRMA, Stanford University.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/
//*****************************************************************
/**
* \file UdpMasterListener.cpp
* \author Juan-Pablo Caceres and Chris Chafe
......
//*****************************************************************
/*
JackTrip: A System for High-Quality Audio Network Performance
over the Internet
Copyright (c) 2008 Juan-Pablo Caceres, Chris Chafe.
SoundWIRE group at CCRMA, Stanford University.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/
//*****************************************************************
/**
* \file UdpMasterListener.h
* \author Juan-Pablo Caceres and Chris Chafe
......
......@@ -41,6 +41,10 @@
#include "JackAudioInterface.h"
//namespace JackTrip/// \todo Add this namespace
const char* const gVersion = "1.0.3-alpha"; ///< JackTrip version
//*******************************************************************************
/// \name Default Values
//@{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment