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

Fixed the lsp generation, Fixed metadata loading

Browse source
This commit is contained in:
Erik Zandvliet 2015-04-03 14:01:40 +02:00
parent 3864ca264f
commit f350ab84fd
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -336,7 +336,7 @@ if (EXISTS "${SOURCE_DIR}/sourcery")
add_custom_target(sourcery add_custom_target(sourcery
COMMAND cp ${SOURCE_DIR}/sourcery ${BINARY_DIR}/sourcery COMMAND cp ${SOURCE_DIR}/sourcery ${BINARY_DIR}/sourcery
) )
elseif() else()
add_executable(sourcery add_executable(sourcery
src/sourcery.cpp src/sourcery.cpp
) )
@ -346,8 +346,8 @@ endif()
# Embed Code # # Embed Code #
######################################## ########################################
add_custom_target(embedcode add_custom_target(embedcode
./sourcery ${CMAKE_CURRENT_SOURCE_DIR}/src/embed.js embed_js ${CMAKE_CURRENT_BINARY_DIR}/embed.js.h ./sourcery ${SOURCE_DIR}/src/embed.js embed_js ${BINARY_DIR}/embed.js.h
DEPENDS sourcery ${CMAKE_CURRENT_SOURCE_DIR}/src/embed.js DEPENDS sourcery ${SOURCE_DIR}/src/embed.js
VERBATIM VERBATIM
) )
@ -369,13 +369,13 @@ endforeach()
file(READ ${SOURCE_DIR}/lsp/main.css lspCSS) file(READ ${SOURCE_DIR}/lsp/main.css lspCSS)
file(READ ${SOURCE_DIR}/lsp/header.html lspHeader) file(READ ${SOURCE_DIR}/lsp/header.html lspHeader)
file(READ ${SOURCE_DIR}/lsp/footer.html lspFooter) file(READ ${SOURCE_DIR}/lsp/footer.html lspFooter)
file(WRITE ${SOURCE_DIR}/server.html "${lspHeader}<script>${lspCode}</script><style>${lspCSS}</style>${lspFooter}") file(WRITE ${BINARY_DIR}/server.html "${lspHeader}<script>${lspCode}</script><style>${lspCSS}</style>${lspFooter}")
set (lspCSS "") set (lspCSS "")
set (lspHeader "") set (lspHeader "")
set (lspFooter "") set (lspFooter "")
add_custom_target(localSettingsPage add_custom_target(localSettingsPage
./sourcery ${BINARY_DIR}/server.html server_html ${CMAKE_CURRENT_BINARY_DIR}/server.html.h ./sourcery ${BINARY_DIR}/server.html server_html ${BINARY_DIR}/server.html.h
DEPENDS sourcery DEPENDS sourcery
VERBATIM VERBATIM
) )

4
src/controller/controller_streams.cpp
View file

@ -131,7 +131,9 @@ namespace Controller {
DEBUG_MSG(DLVL_INSANE, "Waiting for stream %s to open...", name.c_str()); DEBUG_MSG(DLVL_INSANE, "Waiting for stream %s to open...", name.c_str());
//wait for the stream //wait for the stream
{ {
IPC::sharedPage streamIndex(name, DEFAULT_META_PAGE_SIZE); char streamPageName[NAME_BUFFER_SIZE];
snprintf(streamPageName, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, name.c_str());
IPC::sharedPage streamIndex(streamPageName, DEFAULT_META_PAGE_SIZE, false, false);
if (!streamIndex.mapped){ if (!streamIndex.mapped){
DEBUG_MSG(DLVL_INSANE, "Stream %s opening failed! Cancelling and marking as corrupt.", name.c_str()); DEBUG_MSG(DLVL_INSANE, "Stream %s opening failed! Cancelling and marking as corrupt.", name.c_str());
data["meta"].null(); data["meta"].null();