diff --git a/src/Decorations.cpp b/src/Decorations.cpp index 553feae..63f085a 100644 --- a/src/Decorations.cpp +++ b/src/Decorations.cpp @@ -21,14 +21,9 @@ #include #include -#include "Decorations.h" - #include "Visitor.h" -#include "BoundingBoxVisitor.h" -#include "ImageShader.h" #include "GlmToolkit.h" -#include "Resource.h" -#include "Log.h" +#include "Decorations.h" #include "imgui.h" #include diff --git a/src/NetworkSource.cpp b/src/NetworkSource.cpp index 12c1516..da3de08 100644 --- a/src/NetworkSource.cpp +++ b/src/NetworkSource.cpp @@ -30,7 +30,6 @@ #include "osc/OscOutboundPacketStream.h" #include "SystemToolkit.h" -#include "defines.h" #include "Stream.h" #include "Decorations.h" #include "Visitor.h" diff --git a/src/NetworkToolkit.h b/src/NetworkToolkit.h index c63a860..a766ea6 100644 --- a/src/NetworkToolkit.h +++ b/src/NetworkToolkit.h @@ -49,18 +49,6 @@ struct StreamConfig { width = 0; height = 0; } - - inline StreamConfig& operator = (const StreamConfig& o) { - if (this != &o) { - this->client_name = o.client_name; - this->client_address = o.client_address; - this->port = o.port; - this->protocol = o.protocol; - this->width = o.width; - this->height = o.height; - } - return *this; - } }; //typedef enum { diff --git a/src/Streamer.cpp b/src/Streamer.cpp index 700a802..47b24ec 100644 --- a/src/Streamer.cpp +++ b/src/Streamer.cpp @@ -21,6 +21,7 @@ #include #include #include +#include // Desktop OpenGL function loader #include @@ -37,7 +38,6 @@ #include "Settings.h" #include "GstToolkit.h" #include "SystemToolkit.h" -#include "Session.h" #include "Log.h" #include "Connection.h" #include "NetworkToolkit.h" @@ -48,6 +48,15 @@ #define STREAMER_DEBUG #endif +/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "vimixclient" +/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)RAW,sampling=(string)RGB,width=(string)$5,height=(string)$6" ! rtpvrawdepay ! queue max-size-buffers=10 ! videoconvert ! autovideosink' + +/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "h264" +/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)H264" ! rtph264depay ! queue ! decodebin ! videoconvert ! autovideosink' + +/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "jpeg" +/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)JPEG" ! rtpjpegdepay ! queue ! decodebin ! videoconvert ! autovideosink' + void Streaming::RequestListener::ProcessMessage( const osc::ReceivedMessage& m, const IpEndpointName& remoteEndpoint ) {