From 1b500ba2d46f7d3c31e540234544a4c440dd3fd5 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Sat, 14 Apr 2012 13:57:08 +1000 Subject: [PATCH] Fix compilation warning Make VDPAU and OpenGL profile creation conditional on relevant compilation flag --- mythtv/libs/libmythtv/videodisplayprofile.cpp | 4 ++++ mythtv/libs/libmythtv/videodisplayprofile.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp index f2995d3ff42..188c1a89b72 100644 --- a/mythtv/libs/libmythtv/videodisplayprofile.cpp +++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp @@ -1070,6 +1070,7 @@ void VideoDisplayProfile::CreateNewProfiles(const QString &hostname) "linearblend", "linearblend", ""); } +#if defined(USING_VDPAU) void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname) { (void) QObject::tr("VDPAU High Quality", "Sample: VDPAU high quality"); @@ -1100,6 +1101,7 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname) "vdpaubobdeint", "vdpauonefield", "vdpauskipchroma,vdpaucolorspace=auto"); } +#endif #if defined(Q_OS_MACX) void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname) @@ -1142,6 +1144,7 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname) } #endif +#if defined(USING_OPENGL_VIDEO) void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname) { (void) QObject::tr("OpenGL High Quality", "Sample: OpenGL high quality"); @@ -1168,6 +1171,7 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname) "opengldoubleratelinearblend", "opengllinearblend", ""); } +#endif void VideoDisplayProfile::CreateProfiles(const QString &hostname) { diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h index 3df92bfe520..248c013106c 100644 --- a/mythtv/libs/libmythtv/videodisplayprofile.h +++ b/mythtv/libs/libmythtv/videodisplayprofile.h @@ -149,11 +149,15 @@ class MTV_PUBLIC VideoDisplayProfile static void DeleteProfiles(const QString &hostname); static void CreateProfiles(const QString &hostname); static void CreateNewProfiles(const QString &hostname); +#if defined(USING_VDPAU) static void CreateVDPAUProfiles(const QString &hostname); +#endif #if defined(Q_OS_MACX) static void CreateVDAProfiles(const QString &hostname); #endif +#if defined(USING_OPENGL_VIDEO) static void CreateOpenGLProfiles(const QString &hostname); +#endif static QStringList GetVideoRenderers(const QString &decoder); static QString GetVideoRendererHelp(const QString &renderer);