Manually cleanup files that somehow survived the mass find/replace

This commit is contained in:
Michelle Bergeron
2016-02-13 13:47:52 -06:00
parent 35835898c3
commit 5ba0f82b35
12 changed files with 46 additions and 36 deletions
+4 -4
View File
@@ -58,7 +58,7 @@ typedef struct _QUEUED_AUDIO_PACKET {
} q; } q;
} QUEUED_AUDIO_PACKET, *PQUEUED_AUDIO_PACKET; } QUEUED_AUDIO_PACKET, *PQUEUED_AUDIO_PACKET;
/* Initialize the audio stream */ // Initialize the audio stream
void initializeAudioStream(void) { void initializeAudioStream(void) {
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) { if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {
LbqInitializeLinkedBlockingQueue(&packetQueue, 30); LbqInitializeLinkedBlockingQueue(&packetQueue, 30);
@@ -80,7 +80,7 @@ static void freePacketList(PLINKED_BLOCKING_QUEUE_ENTRY entry) {
} }
} }
/* Tear down the audio stream once we're done with it */ // Tear down the audio stream once we're done with it
void destroyAudioStream(void) { void destroyAudioStream(void) {
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) { if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {
freePacketList(LbqDestroyLinkedBlockingQueue(&packetQueue)); freePacketList(LbqDestroyLinkedBlockingQueue(&packetQueue));
@@ -89,7 +89,7 @@ void destroyAudioStream(void) {
} }
static void UdpPingThreadProc(void* context) { static void UdpPingThreadProc(void* context) {
/* Ping in ASCII */ // Ping in ASCII
char pingData[] = { 0x50, 0x49, 0x4E, 0x47 }; char pingData[] = { 0x50, 0x49, 0x4E, 0x47 };
struct sockaddr_in6 saddr; struct sockaddr_in6 saddr;
SOCK_RET err; SOCK_RET err;
@@ -97,7 +97,7 @@ static void UdpPingThreadProc(void* context) {
memcpy(&saddr, &RemoteAddr, sizeof(saddr)); memcpy(&saddr, &RemoteAddr, sizeof(saddr));
saddr.sin6_port = htons(RTP_PORT); saddr.sin6_port = htons(RTP_PORT);
/* Send PING every 500 milliseconds */ // Send PING every 500 milliseconds
while (!PltIsThreadInterrupted(&udpPingThread)) { while (!PltIsThreadInterrupted(&udpPingThread)) {
err = sendto(rtpSocket, pingData, sizeof(pingData), 0, (struct sockaddr*)&saddr, RemoteAddrLen); err = sendto(rtpSocket, pingData, sizeof(pingData), 0, (struct sockaddr*)&saddr, RemoteAddrLen);
if (err != sizeof(pingData)) { if (err != sizeof(pingData)) {
+11 -11
View File
@@ -8,7 +8,7 @@ void BbInitializeWrappedBuffer(PBYTE_BUFFER buff, char* data, int offset, int le
buff->byteOrder = byteOrder; buff->byteOrder = byteOrder;
} }
/* Get the long long in the correct byte order */ // Get the long long in the correct byte order
static long long byteSwapLongLong(PBYTE_BUFFER buff, long long l) { static long long byteSwapLongLong(PBYTE_BUFFER buff, long long l) {
if (buff->byteOrder == BYTE_ORDER_BIG) { if (buff->byteOrder == BYTE_ORDER_BIG) {
return HTONLL(l); return HTONLL(l);
@@ -18,7 +18,7 @@ static long long byteSwapLongLong(PBYTE_BUFFER buff, long long l) {
} }
} }
/* Get the int in the correct byte order */ // Get the int in the correct byte order
static int byteSwapInt(PBYTE_BUFFER buff, int i) { static int byteSwapInt(PBYTE_BUFFER buff, int i) {
if (buff->byteOrder == BYTE_ORDER_BIG) { if (buff->byteOrder == BYTE_ORDER_BIG) {
return htonl(i); return htonl(i);
@@ -28,7 +28,7 @@ static int byteSwapInt(PBYTE_BUFFER buff, int i) {
} }
} }
/* Get the short in the correct byte order */ // Get the short in the correct byte order
static int byteSwapShort(PBYTE_BUFFER buff, short s) { static int byteSwapShort(PBYTE_BUFFER buff, short s) {
if (buff->byteOrder == BYTE_ORDER_BIG) { if (buff->byteOrder == BYTE_ORDER_BIG) {
return htons(s); return htons(s);
@@ -38,7 +38,7 @@ static int byteSwapShort(PBYTE_BUFFER buff, short s) {
} }
} }
/* Get a byte from the byte buffer */ // Get a byte from the byte buffer
int BbGet(PBYTE_BUFFER buff, char* c) { int BbGet(PBYTE_BUFFER buff, char* c) {
if (buff->position + sizeof(*c) > buff->length) { if (buff->position + sizeof(*c) > buff->length) {
return 0; return 0;
@@ -50,7 +50,7 @@ int BbGet(PBYTE_BUFFER buff, char* c) {
return 1; return 1;
} }
/* Get a short from the byte buffer */ // Get a short from the byte buffer
int BbGetShort(PBYTE_BUFFER buff, short* s) { int BbGetShort(PBYTE_BUFFER buff, short* s) {
if (buff->position + sizeof(*s) >= buff->length) { if (buff->position + sizeof(*s) >= buff->length) {
return 0; return 0;
@@ -64,7 +64,7 @@ int BbGetShort(PBYTE_BUFFER buff, short* s) {
return 1; return 1;
} }
/* Get an int from the byte buffer */ // Get an int from the byte buffer
int BbGetInt(PBYTE_BUFFER buff, int* i) { int BbGetInt(PBYTE_BUFFER buff, int* i) {
if (buff->position + sizeof(*i) > buff->length) { if (buff->position + sizeof(*i) > buff->length) {
return 0; return 0;
@@ -78,7 +78,7 @@ int BbGetInt(PBYTE_BUFFER buff, int* i) {
return 1; return 1;
} }
/* Get a long from the byte buffer */ // Get a long from the byte buffer
int BbGetLong(PBYTE_BUFFER buff, long long* l) { int BbGetLong(PBYTE_BUFFER buff, long long* l) {
if (buff->position + sizeof(*l) > buff->length) { if (buff->position + sizeof(*l) > buff->length) {
return 0; return 0;
@@ -92,7 +92,7 @@ int BbGetLong(PBYTE_BUFFER buff, long long* l) {
return 1; return 1;
} }
/* Put an int into the byte buffer */ // Put an int into the byte buffer
int BbPutInt(PBYTE_BUFFER buff, int i) { int BbPutInt(PBYTE_BUFFER buff, int i) {
if (buff->position + sizeof(i) > buff->length) { if (buff->position + sizeof(i) > buff->length) {
return 0; return 0;
@@ -106,7 +106,7 @@ int BbPutInt(PBYTE_BUFFER buff, int i) {
return 1; return 1;
} }
/* Put a long into the byte buffer */ // Put a long into the byte buffer
int BbPutLong(PBYTE_BUFFER buff, long long l) { int BbPutLong(PBYTE_BUFFER buff, long long l) {
if (buff->position + sizeof(l) > buff->length) { if (buff->position + sizeof(l) > buff->length) {
return 0; return 0;
@@ -120,7 +120,7 @@ int BbPutLong(PBYTE_BUFFER buff, long long l) {
return 1; return 1;
} }
/* Put a short into the byte buffer */ // Put a short into the byte buffer
int BbPutShort(PBYTE_BUFFER buff, short s) { int BbPutShort(PBYTE_BUFFER buff, short s) {
if (buff->position + sizeof(s) > buff->length) { if (buff->position + sizeof(s) > buff->length) {
return 0; return 0;
@@ -134,7 +134,7 @@ int BbPutShort(PBYTE_BUFFER buff, short s) {
return 1; return 1;
} }
/* Put a byte into the buffer */ // Put a byte into the buffer
int BbPut(PBYTE_BUFFER buff, char c) { int BbPut(PBYTE_BUFFER buff, char c) {
if (buff->position + sizeof(c) > buff->length) { if (buff->position + sizeof(c) > buff->length) {
return 0; return 0;
+12 -2
View File
@@ -57,8 +57,18 @@ static int getMessageLength(PRTSP_MESSAGE msg) {
// Given an RTSP message string rtspMessage, parse it into an RTSP_MESSAGE struct msg // Given an RTSP message string rtspMessage, parse it into an RTSP_MESSAGE struct msg
int parseRtspMessage(PRTSP_MESSAGE msg, char* rtspMessage, int length) { int parseRtspMessage(PRTSP_MESSAGE msg, char* rtspMessage, int length) {
char* token, *protocol, *endCheck, *target, *statusStr, *command, *sequence, flag; char* token;
char messageEnded = 0, *payload = NULL, *opt = NULL; char* protocol;
char* endCheck;
char* target;
char* statusStr;
char* command;
char* sequence;
char flag;
char messageEnded = 0;
char* payload = NULL;
char* opt = NULL;
int statusCode = 0; int statusCode = 0;
int sequenceNum; int sequenceNum;
int exitCode; int exitCode;