Updated to make use of new waitForMeta library call.

src/connectors/conn_http_dynamic.cpp

@@ -178,14 +178,7 @@ namespace Connector_HTTP {
                 continue;
               }
               ss.setBlocking(false);
-              //make sure metadata is received
+              Strm.waitForMeta(ss);
-              while ( !Strm.metadata && ss.connected()){
-                if (ss.spool()){
-                  while (Strm.parsePacket(ss.Received())){
-                    //do nothing
-                  }
-                }
-              }
             }
             if (HTTP_R.url.find(".abst") != std::string::npos){
               std::string streamID = HTTP_R.url.substr(HTTP_R.url.find(streamname) + streamname.size() + 1);

src/connectors/conn_http_live.cpp

@@ -149,14 +149,7 @@ namespace Connector_HTTP {
                 continue;
               }
               ss.setBlocking(false);
-              //make sure metadata is received
+              Strm.waitForMeta(ss);
-              while ( !Strm.metadata && ss.connected()){
-                if (ss.spool()){
-                  while (Strm.parsePacket(ss.Received())){
-                    //do nothing
-                  }
-                }
-              }
             }
             if (HTTP_R.url.find(".m3u") == std::string::npos){
               temp = HTTP_R.url.find("/", 5) + 1;

src/connectors/conn_http_progressive_flv.cpp

@@ -97,14 +97,7 @@ namespace Connector_HTTP {
             ready4data = false;
             continue;
           }
-          //wait until we have a header
+          Strm.waitForMeta(ss);
-          while ( !Strm.metadata && ss.connected()){
-            if (ss.spool()){
-              Strm.parsePacket(ss.Received()); //read the metadata
-            }else{
-              Util::sleep(5);
-            }
-          }
           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"){

src/connectors/conn_http_progressive_mp3.cpp

@@ -95,14 +95,7 @@ namespace Connector_HTTP {
             ready4data = false;
             continue;
           }
-          //wait until we have a header
+          Strm.waitForMeta(ss);
-          while ( !Strm.metadata && ss.connected()){
-            if (ss.spool()){
-              Strm.parsePacket(ss.Received()); //read the metadata
-            }else{
-              Util::sleep(5);
-            }
-          }
           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"){

src/connectors/conn_http_progressive_ogg.cpp

@@ -103,14 +103,7 @@ namespace Connector_HTTP {
             ready4data = false;
             continue;
           }
-          //wait until we have a header
+          Strm.waitForMeta(ss);
-          while ( !Strm.metadata && ss.connected()){
-            if (ss.spool()){
-              Strm.parsePacket(ss.Received()); //read the metadata
-            }else{
-              Util::sleep(5);
-            }
-          }
           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"){

src/connectors/conn_http_smooth.cpp

@@ -202,14 +202,7 @@ namespace Connector_HTTP {
                 continue;
               }
               ss.setBlocking(false);
-              //Do nothing until metadata has been received.
+              Strm.waitForMeta(ss);
-              while ( !Strm.metadata && ss.connected()){
-                if (ss.spool()){
-                  while (Strm.parsePacket(ss.Received())){
-                    //do nothing
-                  }
-                }
-              }
               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;

src/connectors/conn_rtmp.cpp

@@ -549,15 +549,7 @@ namespace Connector_RTMP {
             break;
           }
           ss.setBlocking(false);
-
+          Strm.waitForMeta(ss);
-          //assure metadata is received
-          while ( !Strm.metadata && ss.connected()){
-            if (ss.spool()){
-              Strm.parsePacket(ss.Received()); //read the metadata
-            }else{
-              Util::sleep(5);
-            }
-          }
           //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"){

src/connectors/conn_ts.cpp

@@ -65,15 +65,8 @@ namespace Connector_TS {
           int videoID = -1;
           int audioID = -1;
 
-          //make sure metadata is received
+          Strm.waitForMeta(ss);
-          while ( !Strm.metadata && ss.connected()){
+          
-            if (ss.spool()){
-              while (Strm.parsePacket(ss.Received())){
-                //do nothing
-              }
-            }
-          }
-
           if (Strm.metadata.isMember("tracks")){
 
             for (JSON::ObjIter trackIt = Strm.metadata["tracks"].ObjBegin(); trackIt != Strm.metadata["tracks"].ObjEnd(); trackIt++){