From 52f148cee5910830be39b62c69e5c7f26a02db66 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 1 May 2014 15:57:53 +0200 Subject: [PATCH] Fixed RTMP pausing bug. --- src/output/output_rtmp.cpp | 5 ++--- src/output/output_rtmp.h | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp index e123f43e..5a9ff1ef 100644 --- a/src/output/output_rtmp.cpp +++ b/src/output/output_rtmp.cpp @@ -7,9 +7,6 @@ namespace Mist { OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn) { - playTransaction = -1; - playMessageType = -1; - playStreamId = -1; setBlocking(false); while (!conn.Received().available(1537) && conn.connected()) { conn.spool(); @@ -549,6 +546,8 @@ namespace Mist { return; } //seek if ((amfData.getContentP(0)->StrValue() == "pauseRaw") || (amfData.getContentP(0)->StrValue() == "pause")) { + int playMessageType = messageType; + int playStreamId = streamId; if (amfData.getContentP(3)->NumValue()) { parseData = false; //send a status reply diff --git a/src/output/output_rtmp.h b/src/output/output_rtmp.h index bd7590b1..1e4df593 100644 --- a/src/output/output_rtmp.h +++ b/src/output/output_rtmp.h @@ -21,7 +21,6 @@ namespace Mist { OutRTMP(Socket::Connection & conn); ~OutRTMP(); static void init(Util::Config * cfg); - void onRequest(); void sendNext(); void sendHeader(); @@ -33,9 +32,6 @@ namespace Mist { bool sending; int counter; bool streamReset; - int playTransaction;///