From d89deb37e8b3a94d1cf7a69555d0de8120afacd7 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <s.p.the.ghost@gmail.com>
Date: Wed, 1 Sep 2010 09:30:26 +0200
Subject: [PATCH] Het compileertgit status alleen nu nog daadwerkelijk draaien.
 zie connector_rtsp/compile_remarks.txt

---
 Connector_RTSP/Makefile            |  4 ++--
 Connector_RTSP/compile_remarks.txt | 19 +++++++++++++++++++
 Connector_RTSP/main.cpp            |  4 +++-
 Connector_RTSP/rtp.h               | 12 ++++++------
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 Connector_RTSP/compile_remarks.txt

diff --git a/Connector_RTSP/Makefile b/Connector_RTSP/Makefile
index 6bffb06b..7a4f346f 100644
--- a/Connector_RTSP/Makefile
+++ b/Connector_RTSP/Makefile
@@ -1,12 +1,12 @@
 SRC = main.cpp ../sockets/sw_base.cpp ../sockets/sw_inet.cpp ../sockets/sw_unix.cpp
 OBJ = $(SRC:.cpp=.o)
 OUT = Connector_RTSP
-INCLUDES = 
+INCLUDES =
 CCFLAGS = -Wall -Wextra -funsigned-char -g
 CC = $(CROSS)g++
 LD = $(CROSS)ld
 AR = $(CROSS)ar
-LIBS = 
+LIBS = -ljthread -lpthread -ljrtp
 .SUFFIXES: .cpp 
 .PHONY: clean default
 default: $(OUT)
diff --git a/Connector_RTSP/compile_remarks.txt b/Connector_RTSP/compile_remarks.txt
new file mode 100644
index 00000000..3985360b
--- /dev/null
+++ b/Connector_RTSP/compile_remarks.txt
@@ -0,0 +1,19 @@
+Makefile LIBS: -ljthread -lpthread -ljrtp (al ingesteld)
+
+alle includes: <jrtplib3/[blaat.h]> (al gedaan)
+
+in /usr/local/include/jrtplib3/rtpsession.h (lokaal, was via jrtplib's "make install")
+en /usr/local/include/jrtplib3/rtpudpv4transmitter.h (lokaal, was via jrtplib's "make install")
+verander #include <jmutex.h> naar #include <jthread/jmutex.h>
+
+
+anders geen compiles...
+
+
+Vervolgens: bij het runnen van ./Connector_RTSP: 
+./Connector_RTSP: error while loading shared libraries: libjrtp-3.7.1.so: cannot open shared object file: No such file or directory
+
+
+
+
+dus: ik kan op het moment genoeg coden, en zorgen dat het compiled, maar ook daadwerkelijk draaien wordt lastig... Enige ideeen?
\ No newline at end of file
diff --git a/Connector_RTSP/main.cpp b/Connector_RTSP/main.cpp
index fd427514..55e32bbd 100644
--- a/Connector_RTSP/main.cpp
+++ b/Connector_RTSP/main.cpp
@@ -68,7 +68,7 @@ int main(){
 
         sessionparams.SetOwnTimestampUnit(1.0/8000.0);//EDIT: hoeveel samples/second?
         transparams.SetPortbase(serverport);
-        rtpconnection.Create(sessionparams,&transparams);
+        rtp_connection.Create(sessionparams,&transparams);
 
         uint8_t clientip[]={127,0,0,1};
         //Waar haal ik deze vandaan, moeten we toch als daemon gaan draaien?
@@ -101,6 +101,8 @@ int main(){
         //ERIK: verstuur de packet hier!
         //FLV data incl. video tag header staat in FLVbuffer
         //lengte van deze data staat in FLV_len
+	
+	if( FLVbuffer[0] == 0x12 ) { std::cout << "blah"; exit (0); }
 
         //TODO: Parse flv_header (audio/video frame? 0x12 = metadata = gooi weg)
         //TODO: Setpayloadtype
diff --git a/Connector_RTSP/rtp.h b/Connector_RTSP/rtp.h
index 34f4da7d..68a0464e 100644
--- a/Connector_RTSP/rtp.h
+++ b/Connector_RTSP/rtp.h
@@ -1,7 +1,7 @@
-#include "rtpsession.h"
-#include "rtppacket.h"
-#include "rtpudpv4transmitter.h"
-#include "rtpipv4address.h"
-#include "rtpsessionparams.h"
-#include "rtperrors.h"
+#include <jrtplib3/rtpsession.h>
+#include <jrtplib3/rtppacket.h>
+#include <jrtplib3/rtpudpv4transmitter.h>
+#include <jrtplib3/rtpipv4address.h>
+#include <jrtplib3/rtpsessionparams.h>
+#include <jrtplib3/rtperrors.h>