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

refactor: Address (Windows) compile warnings (#840)

Browse Source 
* Windows compile errors and (Qt 5.15 deprecation) warnings

* Usability - Enable/Disable Instance button

Co-authored-by: brindosch <edeltraud70@gmx.de>
This commit is contained in:
LordGrey
2020-06-28 23:05:32 +02:00
committed by GitHub
parent e365a2839d
commit bfb50b8d91
61 changed files with 530 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hyperion-v4l2/hyperion-v4l2.cpp
View File

@@ -84,18 +84,18 @@ int main(int argc, char** argv)
BooleanOption & argSkipReply = parser.add<BooleanOption>(0x0, "skip-reply", "Do not receive and check reply messages from Hyperion");
BooleanOption & argHelp = parser.add<BooleanOption>('h', "help", "Show this help message and exit");
argVideoStandard.addSwitch("pal", VIDEOSTANDARD_PAL);
argVideoStandard.addSwitch("ntsc", VIDEOSTANDARD_NTSC);
argVideoStandard.addSwitch("secam", VIDEOSTANDARD_SECAM);
argVideoStandard.addSwitch("no-change", VIDEOSTANDARD_NO_CHANGE);
argVideoStandard.addSwitch("pal", VideoStandard::PAL);
argVideoStandard.addSwitch("ntsc", VideoStandard::NTSC);
argVideoStandard.addSwitch("secam", VideoStandard::SECAM);
argVideoStandard.addSwitch("no-change", VideoStandard::NO_CHANGE);
argPixelFormat.addSwitch("yuyv", PIXELFORMAT_YUYV);
argPixelFormat.addSwitch("uyvy", PIXELFORMAT_UYVY);
argPixelFormat.addSwitch("rgb32", PIXELFORMAT_RGB32);
argPixelFormat.addSwitch("yuyv", PixelFormat::YUYV);
argPixelFormat.addSwitch("uyvy", PixelFormat::UYVY);
argPixelFormat.addSwitch("rgb32", PixelFormat::RGB32);
#ifdef HAVE_JPEG
argPixelFormat.addSwitch("mjpeg", PIXELFORMAT_MJPEG);
argPixelFormat.addSwitch("mjpeg", PixelFormat::MJPEG);
#endif
argPixelFormat.addSwitch("no-change", PIXELFORMAT_NO_CHANGE);
argPixelFormat.addSwitch("no-change", PixelFormat::NO_CHANGE);
// parse all options
parser.process(app);
@@ -173,11 +173,11 @@ int main(int argc, char** argv)
// set 3D mode if applicable
if (parser.isSet(arg3DSBS))
{
grabber.setVideoMode(VIDEO_3DSBS);
grabber.setVideoMode(VideoMode::VIDEO_3DSBS);
}
else if (parser.isSet(arg3DTAB))
{
grabber.setVideoMode(VIDEO_3DTAB);
grabber.setVideoMode(VideoMode::VIDEO_3DTAB);
}
// run the grabber
@@ -198,7 +198,7 @@ int main(int argc, char** argv)
if(argAddress.value(parser) == "127.0.0.1:19400")
{
SSDPDiscover discover;
address = discover.getFirstService(STY_FLATBUFSERVER);
address = discover.getFirstService(searchType::STY_FLATBUFSERVER);
if(address.isEmpty())
{
address = argAddress.value(parser);