3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-18 19:46:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix parsing of bool values

Browse source
This commit is contained in:
badaix 2019-10-09 22:32:27 +02:00
parent 7cb595db28
commit 9fbec6055a
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/popl.hpp
View file

@ -712,6 +712,15 @@ inline void Value<std::string>::parse(OptionName what_name, const char* value)
} }
template <>
inline void Value<bool>::parse(OptionName what_name, const char* value)
{
bool val =
((value != nullptr) && (strcmp(value, "1") == 0) || (strcmp(value, "true") == 0) || (strcmp(value, "True") == 0) || (strcmp(value, "TRUE") == 0));
add_value(val);
}
template <class T> template <class T>
inline void Value<T>::parse(OptionName what_name, const char* value) inline void Value<T>::parse(OptionName what_name, const char* value)
{ {

2
server/snapserver.conf
View file

@ -38,7 +38,7 @@ doc_root = /home/johannes/Develop/snapcast/control
# #
[tcp] [tcp]
# enable TCP Json RPC # enable TCP Json RPC
enabled = true #enabled = true
# address to listen on # address to listen on
# TODO: not implemented yet # TODO: not implemented yet

9
server/snapserver.cpp
View file

@ -74,7 +74,7 @@ int main(int argc, char* argv[])
// debug settings // debug settings
OptionParser conf(""); OptionParser conf("");
conf.add<Switch>("", "logging.debug", "enable debug logging", &settings.logging.debug); conf.add<Value<bool>>("", "logging.debug", "enable debug logging", settings.logging.debug, &settings.logging.debug);
conf.add<Value<string>>("", "logging.debug_logfile", "log file name for the debug logs (debug must be enabled)", settings.logging.debug_logfile, conf.add<Value<string>>("", "logging.debug_logfile", "log file name for the debug logs (debug must be enabled)", settings.logging.debug_logfile,
&settings.logging.debug_logfile); &settings.logging.debug_logfile);
@ -89,15 +89,16 @@ int main(int argc, char* argv[])
settings.stream.codec, &settings.stream.codec); settings.stream.codec, &settings.stream.codec);
conf.add<Value<size_t>>("", "stream.stream_buffer", "Default stream read buffer [ms]", settings.stream.streamReadMs, &settings.stream.streamReadMs); conf.add<Value<size_t>>("", "stream.stream_buffer", "Default stream read buffer [ms]", settings.stream.streamReadMs, &settings.stream.streamReadMs);
conf.add<Value<int>>("b", "stream.buffer", "Buffer [ms]", settings.stream.bufferMs, &settings.stream.bufferMs); conf.add<Value<int>>("b", "stream.buffer", "Buffer [ms]", settings.stream.bufferMs, &settings.stream.bufferMs);
conf.add<Switch>("", "stream.send_to_muted", "Send audio to muted clients", &settings.stream.sendAudioToMutedClients); conf.add<Value<bool>>("", "stream.send_to_muted", "Send audio to muted clients", settings.stream.sendAudioToMutedClients,
&settings.stream.sendAudioToMutedClients);
// HTTP RPC settings // HTTP RPC settings
conf.add<Switch>("", "http.enabled", "enable HTTP Json RPC (HTTP POST and websockets)", &settings.http.enabled); conf.add<Value<bool>>("", "http.enabled", "enable HTTP Json RPC (HTTP POST and websockets)", settings.http.enabled, &settings.http.enabled);
conf.add<Value<size_t>>("", "http.port", "which port the server should listen to", settings.http.port, &settings.http.port); conf.add<Value<size_t>>("", "http.port", "which port the server should listen to", settings.http.port, &settings.http.port);
conf.add<Value<string>>("", "http.doc_root", "serve a website from the doc_root location", settings.http.doc_root, &settings.http.doc_root); conf.add<Value<string>>("", "http.doc_root", "serve a website from the doc_root location", settings.http.doc_root, &settings.http.doc_root);
// TCP RPC settings // TCP RPC settings
conf.add<Switch>("", "tcp.enabled", "enable TCP Json RPC)", &settings.tcp.enabled); conf.add<Value<bool>>("", "tcp.enabled", "enable TCP Json RPC)", settings.tcp.enabled, &settings.tcp.enabled);
conf.add<Value<size_t>>("", "tcp.port", "which port the server should listen to", settings.tcp.port, &settings.tcp.port); conf.add<Value<size_t>>("", "tcp.port", "which port the server should listen to", settings.tcp.port, &settings.tcp.port);
// TODO: Should be possible to override settings on command line // TODO: Should be possible to override settings on command line