From c56b72dbcab55025415ab0a9f0c0493454e0c42c Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 8 May 2017 10:59:46 +0200 Subject: [PATCH] Added a couple of IO convenience functions --- src/io.cpp | 12 ++++++++++++ src/io.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/src/io.cpp b/src/io.cpp index 195060c2..684a757b 100644 --- a/src/io.cpp +++ b/src/io.cpp @@ -520,10 +520,22 @@ namespace Mist { nProxy.continueNegotiate(tid, myMeta, quickNegotiate); } + void InOutBase::continueNegotiate() { + nProxy.continueNegotiate(myMeta); + } + negotiationProxy::negotiationProxy(){ negTimer = 0; } + void negotiationProxy::continueNegotiate(DTSC::Meta & myMeta) { + for (std::map::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ + if (!trackState.count(it->first) || (trackState[it->first] != FILL_ACC && trackState[it->first] != FILL_DEC)){ + continueNegotiate(it->first, myMeta); + } + } + } + void negotiationProxy::continueNegotiate(unsigned long tid, DTSC::Meta & myMeta, bool quickNegotiate) { if (!tid) { return; diff --git a/src/io.h b/src/io.h index 0ab55171..3e85b902 100644 --- a/src/io.h +++ b/src/io.h @@ -56,6 +56,8 @@ namespace Mist { std::string streamName;///< Name of the stream to connect to void continueNegotiate(unsigned long tid, DTSC::Meta & myMeta, bool quickNegotiate = false); + void continueNegotiate(DTSC::Meta & myMeta); + uint32_t negTimer; ///< How long we've been negotiating, in packets. }; @@ -70,6 +72,7 @@ namespace Mist { virtual void bufferLivePacket(DTSC::Packet & packet); protected: void continueNegotiate(unsigned long tid, bool quickNegotiate = false); + void continueNegotiate();