From 6c466d452a1ed3041ea894e1509fe317c705d5f0 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 27 Jun 2016 13:17:15 +0200 Subject: [PATCH] Removed deprecated startpos option. --- src/output/output.cpp | 6 ------ src/output/output_hds.cpp | 14 -------------- src/output/output_hls.cpp | 5 ----- 3 files changed, 25 deletions(-) diff --git a/src/output/output.cpp b/src/output/output.cpp index 9995baa3..72332fa9 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -36,12 +36,6 @@ namespace Mist { capa["optional"]["debug"]["help"] = "The debug level at which messages need to be printed."; capa["optional"]["debug"]["option"] = "--debug"; capa["optional"]["debug"]["type"] = "debug"; - capa["optional"]["startpos"]["name"] = "Starting position in live buffer"; - capa["optional"]["startpos"]["help"] = "For live, where in the buffer the stream starts playback by default. 0 = beginning, 1000 = end"; - capa["optional"]["startpos"]["option"] = "--startPos"; - capa["optional"]["startpos"]["short"] = "P"; - capa["optional"]["startpos"]["default"] = (long long)500; - capa["optional"]["startpos"]["type"] = "uint"; } Output::Output(Socket::Connection & conn) : myConn(conn) { diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp index 0acfa613..9d3c18b3 100644 --- a/src/output/output_hds.cpp +++ b/src/output/output_hds.cpp @@ -57,19 +57,6 @@ namespace Mist { int j = 0; if (myMeta.tracks[tid].fragments.size()){ std::deque::iterator fragIt = myMeta.tracks[tid].fragments.begin(); - /*LTS-START*/ - if (myMeta.live){ - unsigned int skip = (( myMeta.tracks[tid].fragments.size()-1) * config->getInteger("startpos")) / 1000u; - for (unsigned int z = 0; z < skip; ++z){ - ++fragIt; - ++j; - } - if (skip && fragIt == myMeta.tracks[tid].fragments.end()){ - --fragIt; - --j; - } - } - /*LTS-END*/ unsigned int firstTime = myMeta.tracks[tid].getKey(fragIt->getNumber()).getTime(); while (fragIt != myMeta.tracks[tid].fragments.end()){ if (myMeta.vod || fragIt->getDuration() > 0){ @@ -174,7 +161,6 @@ namespace Mist { capa["methods"][0u]["type"] = "flash/11"; capa["methods"][0u]["priority"] = 6ll; capa["methods"][0u]["player_url"] = "/flashplayer.swf"; - cfg->getOption("startpos", true)[0u] = 0ll; } void OutHDS::sendNext(){ diff --git a/src/output/output_hls.cpp b/src/output/output_hls.cpp index 50a6a000..70ed70b6 100644 --- a/src/output/output_hls.cpp +++ b/src/output/output_hls.cpp @@ -156,11 +156,6 @@ namespace Mist { //only print the last segment when VoD lines.pop_back(); /*LTS-START*/ - unsigned int skip = (( myMeta.tracks[tid].fragments.size()-1) * config->getInteger("startpos")) / 1000u; - while (skippedLines < skip && lines.size() > 4){ - lines.pop_front(); - skippedLines++; - } if (config->getInteger("listlimit")) { unsigned long listlimit = config->getInteger("listlimit"); while (lines.size() > listlimit) {