frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add_x11

Browse Source 
Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be
This commit is contained in:
johan
2014-04-30 22:34:36 +02:00
parent 5f457fd9e3 d102ffd043
commit b20f932ded
78 changed files with 5057 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hyperion-x11/ProtoWrapper.cpp
View File

@@ -3,7 +3,7 @@
#include "ProtoWrapper.h"
ProtoWrapper::ProtoWrapper(const std::string & protoAddress, const bool skipReply) :
_priority(200),
_priority(10),
_duration_ms(2000),
_connection(protoAddress)
{

4
src/hyperion-x11/hyperion-x11.cpp
View File

@@ -31,7 +31,7 @@ int main(int argc, char ** argv)
IntParameter & argCropWidth = parameters.add<IntParameter> (0x0, "crop-width", "Number of pixels to crop from the left and right sides in the picture before decimation [default=0]");
IntParameter & argCropHeight = parameters.add<IntParameter> (0x0, "crop-height", "Number of pixels to crop from the top and the bottom in the picture before decimation [default=0]");
IntParameter & argSizeDecimation = parameters.add<IntParameter> ('s', "size-decimator", "Decimation factor for the output size [default=1]");
IntParameter & argSizeDecimation = parameters.add<IntParameter> ('s', "size-decimator", "Decimation factor for the output size [default=16]");
SwitchParameter<> & argScreenshot = parameters.add<SwitchParameter<>> (0x0, "screenshot", "Take a single screenshot, save it to file and quit");
StringParameter & argAddress = parameters.add<StringParameter> ('a', "address", "Set the address of the hyperion server [default: 127.0.0.1:19445]");
IntParameter & argPriority = parameters.add<IntParameter> ('p', "priority", "Use the provided priority channel (the lower the number, the higher the priority) [default: 800]");
@@ -41,7 +41,7 @@ int main(int argc, char ** argv)
// set defaults
argCropWidth.setDefault(0);
argCropHeight.setDefault(0);
argSizeDecimation.setDefault(1);
argSizeDecimation.setDefault(16);
argAddress.setDefault("127.0.0.1:19445");
argPriority.setDefault(800);