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

18
include/grabber/VideoStandard.h
View File

@@ -3,11 +3,11 @@
/**
* Enumeration of the possible video standards the grabber can be set to
*/
enum VideoStandard {
VIDEOSTANDARD_PAL,
VIDEOSTANDARD_NTSC,
VIDEOSTANDARD_SECAM,
VIDEOSTANDARD_NO_CHANGE
enum class VideoStandard {
PAL,
NTSC,
SECAM,
NO_CHANGE
};
inline VideoStandard parseVideoStandard(QString videoStandard)
@@ -17,17 +17,17 @@ inline VideoStandard parseVideoStandard(QString videoStandard)
if (videoStandard == "pal")
{
return VIDEOSTANDARD_PAL;
return VideoStandard::PAL;
}
else if (videoStandard == "ntsc")
{
return VIDEOSTANDARD_NTSC;
return VideoStandard::NTSC;
}
else if (videoStandard == "secam")
{
return VIDEOSTANDARD_SECAM;
return VideoStandard::SECAM;
}
// return the default NO_CHANGE
return VIDEOSTANDARD_NO_CHANGE;
return VideoStandard::NO_CHANGE;
}