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

Fixed folder support

Browse source
This commit is contained in:
Erik Zandvliet 2015-04-07 14:39:39 +02:00
parent 514f0a9b2b
commit d296ac60bb
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -253,8 +253,13 @@ install(
# MistServer - Inputs # # MistServer - Inputs #
######################################## ########################################
macro(makeInput inputName format) macro(makeInput inputName format)
if (";${ARGN};" MATCHES ";folder;")
set(mainScript src/input/mist_in_folder.cpp)
else()
set(mainScript src/input/mist_in.cpp)
endif()
add_executable(MistIn${inputName} add_executable(MistIn${inputName}
src/input/mist_in.cpp ${mainScript}
src/input/input.cpp src/input/input.cpp
src/input/input_${format}.cpp src/input/input_${format}.cpp
src/io.cpp src/io.cpp
@ -279,7 +284,7 @@ makeInput(Buffer buffer)
makeInput(ISMV ismv)#LTS makeInput(ISMV ismv)#LTS
makeInput(MP4 mp4)#LTS makeInput(MP4 mp4)#LTS
makeInput(TS ts)#LTS makeInput(TS ts)#LTS
makeInput(Folder folder)#LTS makeInput(Folder folder folder)#LTS
######################################## ########################################
# MistServer - Outputs # # MistServer - Outputs #

4
src/output/output_http_internal.cpp
View file

@ -271,7 +271,9 @@ namespace Mist {
configLock.post(); configLock.post();
//Stream metadata not found - attempt to start it //Stream metadata not found - attempt to start it
if (Util::startInput(streamName)){ if (Util::startInput(streamName)){
streamIndex.init(streamName, DEFAULT_META_PAGE_SIZE); char streamPageName[NAME_BUFFER_SIZE];
snprintf(streamPageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, streamName.c_str());
streamIndex.init(streamPageName, DEFAULT_META_PAGE_SIZE);
if (streamIndex.mapped){ if (streamIndex.mapped){
metaLock = true; metaLock = true;
metaLocker.wait(); metaLocker.wait();