Changeset e090e9969c in mythtv

Timestamp:

Oct 26, 2011, 8:07:17 AM (13 years ago)

Author:

Mark Kendall <mkendall@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, devel/gpu-commflag, fixes/0.25, fixes/0.26, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

98642603cb

Parents:

145b2097a5

Message:

Add libCEC support.

This adds initial support for CEC HDMI devices which allow bidirectional
communication and control between CEC capable devices.

There is a lot going on here, so I'll add a wiki page at some point.

• will turn the display device on and switch to MythTV's HDMI input when

MythTV is started (configurable).

• the HDMI input is identified as 'MythTV'.
• will turn the display off when exiting (configurable).
• 'advanced' selection of HDMI port (physical address), CEC logical

address and libCEC device (all default to 'auto').

• there is no settings UI. I will wait and see if we get new, libmythui

settings pages before 0.25 (otherwise I'll add some old style settings
pages).

• added 2 new actions for powering the display on and off.
• incoming keypresses from the display's remote control are mapped to

standard keypresses. Certain functions are unmpapped (no obvious meaning
in a MythTV context) and others have slightly unusual mappings to ensure
each button has a unique keypress (and hence maximise the potential for
customisation - but does limit 'out of the box' functionality). There is
still some limited overlap (e.g. M) but most map to conventional,
default MythTV bindings. Use the Key Editor to tweak.

• no CEC commands (e.g. display telling MythTV to power off) are

currently handled - either because there is no obvious way to handle
them (menu language, power off) or I haven't seen them.

There is a lot of potential for additional functionality, both within
MythTV and libCEC itself, so this will no doubt be a moving feast for a
while. The usefulness of CEC will largely depend on how much individual
manufacturers have 'tailored' their CEC implementations. For me, with a
Toshiba display (Regza-Link = CEC), Playstation3 and VESA mounted Ion
box, everything is pretty seemless and largely 'just works'.

N.B. The keymapping code may change depending on other changes in
libmythui (and I may yet tweak the default keybindings).

Location:

mythtv

Files:

• configure (modified) (8 diffs)
• libs/libmythui/cecadapter.cpp (added)
• libs/libmythui/cecadapter.h (added)
• libs/libmythui/libmythui.pro (modified) (1 diff)
• libs/libmythui/mythmainwindow.cpp (modified) (7 diffs)
• libs/libmythui/mythmainwindow.h (modified) (1 diff)
• libs/libmythui/mythscreentype.cpp (modified) (1 diff)
• libs/libmythui/mythuiactions.h (modified) (1 diff)

mythtv/configure

@@ -106 +106 @@
   --disable-lirc           disable lirc support (Infrared Remotes)
   --disable-joystick-menu  disable joystick menu
+  --disable-libcec         disable libCEC device support
+  --libcec-path=HDRLOC     location of directory containing
+                           cec.h [$libcec_path_default]
   --disable-firewire       disable support for FireWire cable boxes
   --disable-iptv           disable support for recording RTSP/UDP/RTP streams
@@ -1347 +1350 @@
     asi
     joystick_menu
+    libcec
     libfftw3
     libmpeg2external
@@ -1429 +1433 @@
     dvb_path
     incdir
+    libcec_path
     libdir
     mandir
@@ -1987 +1992 @@
 enable lamemp3
 enable libass
+enable libcec
 enable libxml2
 enable libudf
@@ -2007 +2013 @@
 dvb_path_default="${sysroot}/usr/include"
 x11_path_default="${sysroot}/usr/X11R6/include"
+libcec_path_default="${sysroot}/usr/include/libcec"
 libxml2_path_default="${sysroot}/usr/include/libxml2"
 
@@ -4106 +4113 @@
 enabled libass && check_lib2 ass/ass.h ass_flush_events -lass || disable libass
 
+enabled libcec && check_cxx -I"$libcec_path" <<EOF || { echolog "libCEC support needs libcec >= 7" && disable libcec; }
+#include <libcec/cec.h>
+#include <iostream>
+using namespace std;
+using namespace CEC;
+#include <libcec/cecloader.h>
+int main(void) {
+    if (CEC_LIB_VERSION < 7)
+        return 0;
+    return (long) LoadLibCec;
+}
+EOF
+
 if enabled libxml2 ; then
    if pkg-config --exists libxml-2.0 ; then
@@ -4438 +4458 @@
   echo "Joystick menu             ${joystick_menu-no}"
   echo "lirc support              ${lirc-no}"
+  echo "libCEC device support     ${libcec-no} [$libcec_path]"
   if test x"$target_os" = x"darwin" ; then
     echo "Apple Remote              ${appleremote-no}"
@@ -4831 +4852 @@
 fi
 
+if enabled libcec; then
+  append CONFIG_DEFINES "using_libcec"
+  append CONFIG_INCLUDEPATH "$libcec_path"
+fi
+
 if enabled libxml2; then
   if [ -d $libxml2_path ] ; then

mythtv/libs/libmythui/libmythui.pro

@@ -117 +117 @@
 }
 
+using_libcec {
+    DEFINES += USING_LIBCEC
+    HEADERS += cecadapter.h
+    SOURCES += cecadapter.cpp
+}
+
 using_xrandr {
     DEFINES += USING_XRANDR

mythtv/libs/libmythui/mythmainwindow.cpp

@@ -63 +63 @@
 #endif
 
+#ifdef USING_LIBCEC
+#include "cecadapter.h"
+#endif
+
 #include "mythscreentype.h"
 #include "mythpainter.h"
@@ -135 +139 @@
         appleRemote(NULL),
 #endif
+
+#ifdef USING_LIBCEC
+        cecAdapter(NULL),
+#endif
+
         exitingtomain(false),
         popwindows(false),
@@ -201 +210 @@
     AppleRemoteListener *appleRemoteListener;
     AppleRemote         *appleRemote;
+#endif
+
+#ifdef USING_LIBCEC
+    CECAdapter* cecAdapter;
 #endif
 
@@ -445 +458 @@
 #endif
 
+#ifdef USING_LIBCEC
+    d->cecAdapter = new CECAdapter();
+    if (!d->cecAdapter->IsValid())
+    {
+        delete d->cecAdapter;
+        d->cecAdapter = NULL;
+    }
+#endif
+
     d->m_udpListener = new MythUDPListener();
 
@@ -523 +545 @@
 
     delete d->appleRemoteListener;
+#endif
+
+#ifdef USING_LIBCEC
+    if (d->cecAdapter)
+        delete d->cecAdapter;
 #endif
 
@@ -1103 +1130 @@
     RegisterKey("Global", ACTION_9, QT_TRANSLATE_NOOP("MythControls","9"), "9");
 
+    RegisterKey("Global", ACTION_TVPOWERON,  QT_TRANSLATE_NOOP("MythControls",
+        "Turn the display on"),   "");
+    RegisterKey("Global", ACTION_TVPOWEROFF, QT_TRANSLATE_NOOP("MythControls",
+        "Turn the display off"),  "");
+
     RegisterKey("Global", "SYSEVENT01", QT_TRANSLATE_NOOP("MythControls",
         "Trigger System Key Event #1"), "");
@@ -1823 +1855 @@
 
     return false;
+}
+
+void MythMainWindow::HandleTVPower(bool poweron)
+{
+    if (poweron)
+    {
+#ifdef USING_LIBCEC
+        if (d->cecAdapter)
+            d->cecAdapter->Action(ACTION_TVPOWERON);
+#endif
+    }
+    else
+    {
+#ifdef USING_LIBCEC
+        if (d->cecAdapter)
+            d->cecAdapter->Action(ACTION_TVPOWEROFF);
+#endif
+    }
 }
 

mythtv/libs/libmythui/mythmainwindow.h

@@ -77 +77 @@
                      int season=0, int episode=0, const QString& inetref="",
                      int lenMins=120, const QString& year="1895");
+    void HandleTVPower(bool poweron);
 
     void JumpTo(const QString &destination, bool pop = true);

mythtv/libs/libmythui/mythscreentype.cpp

@@ -472 +472 @@
             gCoreContext->SendSystemEvent(QString("KEY_%1").arg(action.mid(8)));
         else if (action == ACTION_SCREENSHOT)
-        {
             GetMythMainWindow()->ScreenShot();
-        }
+        else if (action == ACTION_TVPOWERON)
+            GetMythMainWindow()->HandleTVPower(true);
+        else if (action == ACTION_TVPOWEROFF)
+            GetMythMainWindow()->HandleTVPower(false);
         else
             handled = false;

mythtv/libs/libmythui/mythuiactions.h

@@ -22 +22 @@
 #define ACTION_SCREENSHOT  "SCREENSHOT"
 
+#define ACTION_TVPOWEROFF  "TVPOWEROFF"
+#define ACTION_TVPOWERON   "TVPOWERON"
+
 #endif // MYTHUI_ACTIONS_H