Commit 498a8277 authored by jcacerec's avatar jcacerec
Browse files

fixed extra file that was causing bug in test app

parent d942b89a
......@@ -47,7 +47,9 @@
#include "UdpMasterListener.h"
#include "NetKS.h"
#include "LoopBack.h"
#ifdef __JAMTEST__
#include "JamTest.h"
#endif
using std::cout; using std::endl;
......@@ -116,7 +118,14 @@ void JackTripWorker::run()
// Create and setup JackTrip Object
//JackTrip jacktrip(JackTrip::SERVER, JackTrip::UDP, mNumChans, 2);
#ifndef __JAMTEST__
JackTrip jacktrip(JackTrip::SERVER, JackTrip::UDP, mNumChans, 2);
#endif
#ifdef __JAMTEST__
//JackTrip jacktrip(JackTrip::SERVER, JackTrip::UDP, mNumChans, 2);
JamTest jacktrip(JackTrip::SERVER); // ########### JamTest #################
#endif
ClientAddress.setAddress(mClientAddress);
// If I don't type this line, I get a bus error in the next line.
// I still haven't figure out why
......@@ -141,7 +150,7 @@ void JackTripWorker::run()
// Start Threads and event loop
jacktrip.startProcess();
jacktrip.start(); // ########### JamTest Only #################
//jacktrip.start(); // ########### JamTest Only #################
{ // Thread is already spawning, so release the lock
QMutexLocker locker(&mMutex);
......
#ifndef __JAMTEST_H__
#define __JAMTEST_H__
/// \brief PlaceHolder Class
class JamTest : public JackTrip
{
public:
JamTest(JackTrip::jacktripModeT JacktripMode = JackTrip::CLIENT) :
JackTrip(JacktripMode)
{}
virtual ~JamTest() {}
};
#endif // __JAMTEST_H__
......@@ -86,8 +86,8 @@ HEADERS += DataProtocol.h \
UdpDataProtocol.h \
UdpMasterListener.h \
AudioInterface.h \
RtAudioInterface.h \
JamTest.h
RtAudioInterface.h
#JamTest.h
!nojack {
SOURCES += JackAudioInterface.h
}
......
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