From 5ac51ed9c9895bbb8da797519f074c749e6b4ae4 Mon Sep 17 00:00:00 2001
From: Karl Dietz <dekarl@users.sourceforge.net>
Date: Wed, 25 Jul 2012 00:02:16 +0200
Subject: [PATCH 10/10] do not offer null renderers for video display in mythfrontend setup
nullvaapi and nullvdpau are building blocks for hardware accelerated video
decoding in mythtranscode & co so hide them from the renderer selection in
mythfrontend.
Fixes #10937
---
mythtv/libs/libmythtv/videodisplayprofile.cpp | 2 +-
mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
index d730ca7..3149f26 100644
a
|
b
|
QString VideoDisplayProfile::GetVideoRendererHelp(const QString &renderer) |
1209 | 1209 | if (renderer.isEmpty()) |
1210 | 1210 | return msg; |
1211 | 1211 | |
1212 | | if (renderer == "null") |
| 1212 | if ((renderer == "null") || (renderer == "nullvaapi") || (renderer == "nullvdpau")) |
1213 | 1213 | msg = QObject::tr( |
1214 | 1214 | "Render video offscreen. Used internally."); |
1215 | 1215 | |
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 2544966..3024682 100644
a
|
b
|
void PlaybackProfileItemConfig::decoderChanged(const QString &dec) |
726 | 726 | vidrend->clearSelections(); |
727 | 727 | for (it = renderers.begin(); it != renderers.end(); ++it) |
728 | 728 | { |
729 | | if (*it != "null") |
| 729 | if ((*it != "null") && (*it != "nullvaapi") && (*it != "nullvdpau")) |
730 | 730 | vidrend->addSelection(*it, *it, (*it == prenderer)); |
731 | 731 | } |
732 | 732 | |