Commit 2de24d36 authored by jcacerec's avatar jcacerec
Browse files

some improvements

parent f8ed92eb
......@@ -38,7 +38,7 @@ PROJECT_NUMBER =
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = ./WWW/
OUTPUT_DIRECTORY = ~/WWW/
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
......
......@@ -47,9 +47,9 @@
class JackTrip; // Forward Declaration
class JackAudioInterface; // Forward Declaration
/// \brief Abstract Header Struct, Header Stucts should subclass it
struct HeaderStruct{};
//----------STRUCT-----------------------------------------
/// \brief Default Header Struct
struct DefaultHeaderStruct : public HeaderStruct
{
......@@ -63,6 +63,7 @@ public:
uint8_t NumOutChannels; ///< Number of Output Channels
// uint8_t BitResolution; ///< \todo implement this part
};
//---------------------------------------------------------
//JamLink UDP Header:
/************************************************************************/
......@@ -91,8 +92,6 @@ const unsigned short ETX_8KHZ = (7<<9);
// able to express up to 512 SPP
//inline unsigned short ETX_SPP(const unsigned short a) { (a&0x01FF); }
//---------JAMLINK HEADER DRAFT----------------------------
/// \brief JamLink Header Struct
struct JamLinkHeaderStuct : public HeaderStruct
{
......@@ -101,7 +100,6 @@ struct JamLinkHeaderStuct : public HeaderStruct
uint16_t SeqNumber; ///< Sequence Number
uint32_t TimeStamp; ///< Time Stamp
};
//---------------------------------------------------------
//#######################################################################
......
......@@ -162,7 +162,7 @@ void UdpDataProtocol::run()
// Setup Full Packet buffer
int full_packet_size = mJackTrip->getPacketSizeInBytes();
cout << "full_packet_size: " << full_packet_size << endl;
//cout << "full_packet_size: " << full_packet_size << endl;
mFullPacket = new int8_t[full_packet_size];
std::memset(mFullPacket, 0, full_packet_size); // set buffer to 0
......@@ -190,7 +190,7 @@ void UdpDataProtocol::run()
/// the local ones. Extract this information from the header
std::cout << "Waiting for Peer..." << std::endl;
// This blocks waiting for the first packet
receivePacket( reinterpret_cast<char*>(mFullPacket), full_packet_size);
receivePacket( reinterpret_cast<char*>(mFullPacket), full_packet_size);
mJackTrip->parseAudioPacket(mFullPacket, mAudioPacket);
std::cout << "Received Connection for Peer!" << std::endl;
......
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