From 75d6c7d4749494e4666eae95fe1bc5cc996b4b0e Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 23 Aug 2013 10:39:33 +0200 Subject: [PATCH] Updated to make use of new waitForMeta library call. --- src/connectors/conn_http_dynamic.cpp | 9 +-------- src/connectors/conn_http_live.cpp | 9 +-------- src/connectors/conn_http_progressive_flv.cpp | 9 +-------- src/connectors/conn_http_progressive_mp3.cpp | 9 +-------- src/connectors/conn_http_progressive_ogg.cpp | 9 +-------- src/connectors/conn_http_smooth.cpp | 9 +-------- src/connectors/conn_rtmp.cpp | 10 +--------- src/connectors/conn_ts.cpp | 11 ++--------- 8 files changed, 9 insertions(+), 66 deletions(-) diff --git a/src/connectors/conn_http_dynamic.cpp b/src/connectors/conn_http_dynamic.cpp index 9c930172..74ed3d52 100644 --- a/src/connectors/conn_http_dynamic.cpp +++ b/src/connectors/conn_http_dynamic.cpp @@ -178,14 +178,7 @@ namespace Connector_HTTP { continue; } ss.setBlocking(false); - //make sure metadata is received - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - while (Strm.parsePacket(ss.Received())){ - //do nothing - } - } - } + Strm.waitForMeta(ss); } if (HTTP_R.url.find(".abst") != std::string::npos){ std::string streamID = HTTP_R.url.substr(HTTP_R.url.find(streamname) + streamname.size() + 1); diff --git a/src/connectors/conn_http_live.cpp b/src/connectors/conn_http_live.cpp index 4263e699..dfdd7f39 100644 --- a/src/connectors/conn_http_live.cpp +++ b/src/connectors/conn_http_live.cpp @@ -149,14 +149,7 @@ namespace Connector_HTTP { continue; } ss.setBlocking(false); - //make sure metadata is received - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - while (Strm.parsePacket(ss.Received())){ - //do nothing - } - } - } + Strm.waitForMeta(ss); } if (HTTP_R.url.find(".m3u") == std::string::npos){ temp = HTTP_R.url.find("/", 5) + 1; diff --git a/src/connectors/conn_http_progressive_flv.cpp b/src/connectors/conn_http_progressive_flv.cpp index 2efdc7a0..86a9099e 100644 --- a/src/connectors/conn_http_progressive_flv.cpp +++ b/src/connectors/conn_http_progressive_flv.cpp @@ -97,14 +97,7 @@ namespace Connector_HTTP { ready4data = false; continue; } - //wait until we have a header - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - Strm.parsePacket(ss.Received()); //read the metadata - }else{ - Util::sleep(5); - } - } + Strm.waitForMeta(ss); int byterate = 0; for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){ if (videoID == -1 && objIt->second["type"].asString() == "video"){ diff --git a/src/connectors/conn_http_progressive_mp3.cpp b/src/connectors/conn_http_progressive_mp3.cpp index 1cd1fd10..575857d8 100644 --- a/src/connectors/conn_http_progressive_mp3.cpp +++ b/src/connectors/conn_http_progressive_mp3.cpp @@ -95,14 +95,7 @@ namespace Connector_HTTP { ready4data = false; continue; } - //wait until we have a header - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - Strm.parsePacket(ss.Received()); //read the metadata - }else{ - Util::sleep(5); - } - } + Strm.waitForMeta(ss); int byterate = 0; for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){ if (videoID == -1 && objIt->second["type"].asString() == "video"){ diff --git a/src/connectors/conn_http_progressive_ogg.cpp b/src/connectors/conn_http_progressive_ogg.cpp index 93e06d7d..1a7a7408 100644 --- a/src/connectors/conn_http_progressive_ogg.cpp +++ b/src/connectors/conn_http_progressive_ogg.cpp @@ -103,14 +103,7 @@ namespace Connector_HTTP { ready4data = false; continue; } - //wait until we have a header - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - Strm.parsePacket(ss.Received()); //read the metadata - }else{ - Util::sleep(5); - } - } + Strm.waitForMeta(ss); int byterate = 0; for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){ if (videoID == -1 && objIt->second["type"].asString() == "video"){ diff --git a/src/connectors/conn_http_smooth.cpp b/src/connectors/conn_http_smooth.cpp index c2584fe2..f66c7edc 100644 --- a/src/connectors/conn_http_smooth.cpp +++ b/src/connectors/conn_http_smooth.cpp @@ -202,14 +202,7 @@ namespace Connector_HTTP { continue; } ss.setBlocking(false); - //Do nothing until metadata has been received. - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - while (Strm.parsePacket(ss.Received())){ - //do nothing - } - } - } + Strm.waitForMeta(ss); for (JSON::ObjIter oIt = Strm.metadata["tracks"].ObjBegin(); oIt != Strm.metadata["tracks"].ObjEnd(); oIt++){ if (oIt->second["type"].asString() == "audio"){ allAudio[oIt->first] = oIt->second; diff --git a/src/connectors/conn_rtmp.cpp b/src/connectors/conn_rtmp.cpp index 3fd40296..511c6bb0 100644 --- a/src/connectors/conn_rtmp.cpp +++ b/src/connectors/conn_rtmp.cpp @@ -549,15 +549,7 @@ namespace Connector_RTMP { break; } ss.setBlocking(false); - - //assure metadata is received - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - Strm.parsePacket(ss.Received()); //read the metadata - }else{ - Util::sleep(5); - } - } + Strm.waitForMeta(ss); //find first audio and video tracks for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){ if (videoID == -1 && objIt->second["type"].asStringRef() == "video"){ diff --git a/src/connectors/conn_ts.cpp b/src/connectors/conn_ts.cpp index 0eb5c4c5..a711e0fc 100644 --- a/src/connectors/conn_ts.cpp +++ b/src/connectors/conn_ts.cpp @@ -65,15 +65,8 @@ namespace Connector_TS { int videoID = -1; int audioID = -1; - //make sure metadata is received - while ( !Strm.metadata && ss.connected()){ - if (ss.spool()){ - while (Strm.parsePacket(ss.Received())){ - //do nothing - } - } - } - + Strm.waitForMeta(ss); + if (Strm.metadata.isMember("tracks")){ for (JSON::ObjIter trackIt = Strm.metadata["tracks"].ObjBegin(); trackIt != Strm.metadata["tracks"].ObjEnd(); trackIt++){