Various and sundry fixes.

This commit is contained in:
Thulinma 2014-06-20 19:07:13 +02:00
parent d66b407955
commit 7f1c2f28aa
10 changed files with 11 additions and 7 deletions

View file

@ -47,9 +47,11 @@ void Controller::SharedMemStats(void * config){
/// This function is called by parseStatistics. /// This function is called by parseStatistics.
/// It updates the internally saved statistics data. /// It updates the internally saved statistics data.
void Controller::statStorage::update(IPC::statExchange & data) { void Controller::statStorage::update(IPC::statExchange & data) {
if (streamName == ""){ if (!streamName.size()){
host = data.host(); host = data.host();
streamName = data.streamName(); streamName = data.streamName();
}
if (!connector.size()){
connector = data.connector(); connector = data.connector();
} }
statLog tmp; statLog tmp;

View file

@ -343,7 +343,6 @@ namespace Mist {
#endif #endif
sought = false; sought = false;
capa.null();
} }
/// Clears the buffer, sets parseData to false, and generally makes not very much happen at all. /// Clears the buffer, sets parseData to false, and generally makes not very much happen at all.

View file

@ -138,6 +138,7 @@ namespace Mist {
void OutHDS::init(Util::Config * cfg){ void OutHDS::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "HDS";
capa["desc"] = "Enables HTTP protocol Adobe-specific dynamic streaming (also known as HDS)."; capa["desc"] = "Enables HTTP protocol Adobe-specific dynamic streaming (also known as HDS).";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/dynamic/$/manifest.f4m"; capa["url_rel"] = "/dynamic/$/manifest.f4m";

View file

@ -90,7 +90,7 @@ namespace Mist {
void OutHLS::init(Util::Config * cfg){ void OutHLS::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "HTTP_Live"; capa["name"] = "HLS";
capa["desc"] = "Enables HTTP protocol Apple-specific streaming (also known as HLS)."; capa["desc"] = "Enables HTTP protocol Apple-specific streaming (also known as HLS).";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/hls/$/index.m3u8"; capa["url_rel"] = "/hls/$/index.m3u8";

View file

@ -53,7 +53,7 @@ namespace Mist {
void OutHSS::init(Util::Config * cfg) { void OutHSS::init(Util::Config * cfg) {
Output::init(cfg); Output::init(cfg);
capa["name"] = "HTTP_Smooth"; capa["name"] = "HSS";
capa["desc"] = "Enables HTTP protocol Microsoft-specific smooth streaming through silverlight (also known as HSS)."; capa["desc"] = "Enables HTTP protocol Microsoft-specific smooth streaming through silverlight (also known as HSS).";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/smooth/$.ism/Manifest"; capa["url_rel"] = "/smooth/$.ism/Manifest";

View file

@ -14,6 +14,7 @@ namespace Mist {
void OutJSON::init(Util::Config * cfg){ void OutJSON::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "JSON";
capa["desc"] = "Enables HTTP protocol JSON streaming."; capa["desc"] = "Enables HTTP protocol JSON streaming.";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/$.json"; capa["url_rel"] = "/$.json";

View file

@ -12,7 +12,7 @@ namespace Mist {
void OutProgressiveFLV::init(Util::Config * cfg){ void OutProgressiveFLV::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "HTTP_Progressive_FLV"; capa["name"] = "FLV";
capa["desc"] = "Enables HTTP protocol progressive streaming."; capa["desc"] = "Enables HTTP protocol progressive streaming.";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/$.flv"; capa["url_rel"] = "/$.flv";

View file

@ -12,7 +12,7 @@ namespace Mist {
void OutProgressiveMP3::init(Util::Config * cfg){ void OutProgressiveMP3::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "HTTP_Progressive_MP3"; capa["name"] = "MP3";
capa["desc"] = "Enables HTTP protocol progressive streaming."; capa["desc"] = "Enables HTTP protocol progressive streaming.";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/$.mp3"; capa["url_rel"] = "/$.mp3";

View file

@ -13,7 +13,7 @@ namespace Mist {
void OutProgressiveMP4::init(Util::Config * cfg){ void OutProgressiveMP4::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "HTTP_Progressive_MP4"; capa["name"] = "MP4";
capa["desc"] = "Enables HTTP protocol progressive streaming."; capa["desc"] = "Enables HTTP protocol progressive streaming.";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/$.mp4"; capa["url_rel"] = "/$.mp4";

View file

@ -22,6 +22,7 @@ namespace Mist {
void OutProgressiveSRT::init(Util::Config * cfg){ void OutProgressiveSRT::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "SRT";
capa["desc"] = "Enables HTTP protocol subtitle streaming."; capa["desc"] = "Enables HTTP protocol subtitle streaming.";
capa["deps"] = "HTTP"; capa["deps"] = "HTTP";
capa["url_rel"] = "/$.srt"; capa["url_rel"] = "/$.srt";