hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Several minor fixes / tweaks.

Browse source
This commit is contained in:
Thulinma 2013-04-04 00:58:23 +02:00
parent 38bd17dd81
commit 58c17a6374
3 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -36,4 +36,3 @@ server.html*
.settings .settings
.cproject .cproject
.project .project

1
src/Makefile.am
View file

@ -17,7 +17,6 @@ bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP Mis
MistBuffer_SOURCES=buffer/buffer.cpp buffer/buffer_user.h buffer/buffer_user.cpp buffer/buffer_stream.h buffer/buffer_stream.cpp tinythread.cpp tinythread.h ../VERSION MistBuffer_SOURCES=buffer/buffer.cpp buffer/buffer_user.h buffer/buffer_user.cpp buffer/buffer_stream.h buffer/buffer_stream.cpp tinythread.cpp tinythread.h ../VERSION
MistBuffer_LDADD=$(MIST_LIBS) -lpthread MistBuffer_LDADD=$(MIST_LIBS) -lpthread
MistPlayer_SOURCES=buffer/player.cpp MistPlayer_SOURCES=buffer/player.cpp
MistPlayer_LDADD=$(MIST_LIBS)
#controller folder (MistController) #controller folder (MistController)
MistController_SOURCES=controller/controller.cpp controller/controller_connectors.h controller/controller_connectors.cpp controller/controller_storage.h controller/controller_storage.cpp controller/controller_streams.h controller/controller_streams.cpp controller/controller_capabilities.h controller/controller_capabilities.cpp ../VERSION controller/server.html.h MistController_SOURCES=controller/controller.cpp controller/controller_connectors.h controller/controller_connectors.cpp controller/controller_storage.h controller/controller_storage.cpp controller/controller_streams.h controller/controller_streams.cpp controller/controller_capabilities.h controller/controller_capabilities.cpp ../VERSION controller/server.html.h

2
src/connectors/conn_http_dynamic.cpp
View file

@ -38,7 +38,7 @@ namespace Connector_HTTP {
asrt.setVersion(1); asrt.setVersion(1);
//asrt.setQualityEntry(empty, 0); //asrt.setQualityEntry(empty, 0);
if (metadata.isMember("live")){ if (metadata.isMember("live")){
asrt.setSegmentRun(1, 4294967295, 0); asrt.setSegmentRun(1, 4294967295ul, 0);
}else{ }else{
asrt.setSegmentRun(1, metadata["keytime"].size(), 0); asrt.setSegmentRun(1, metadata["keytime"].size(), 0);
} }