From 9ee8a43f4f1d3b39f15e5a75b6ed038ea3d3cb96 Mon Sep 17 00:00:00 2001 From: martii Date: Sat, 30 Mar 2013 14:31:10 +0100 Subject: [PATCH] libspark: drop irmp Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/f6f9f0315296dca2949671e320811090671f64d4 Author: martii Date: 2013-03-30 (Sat, 30 Mar 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/Makefile.am | 2 -- libspark/init.cpp | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libspark/Makefile.am b/libspark/Makefile.am index 2abe828..e4875f7 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -8,9 +8,7 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = -lpthread -lasound libspark_la_SOURCES = \ - irmp.c \ hardware_caps.c \ - lirmp_input.cpp \ dmx.cpp \ video.cpp \ audio.cpp \ diff --git a/libspark/init.cpp b/libspark/init.cpp index a5fbf2f..a07876f 100644 --- a/libspark/init.cpp +++ b/libspark/init.cpp @@ -11,7 +11,9 @@ #include +#ifndef MARTII #include "lirmp_input.h" +#endif #include "pwrmngr.h" #include "lt_debug.h" @@ -278,15 +280,16 @@ void init_td_api() { cCpuFreqManager f; f.SetCpuFreq(0); /* CPUFREQ == 0 is the trigger for leaving standby */ +#ifdef MARTII + count_input_devices(); + create_input_devices(); + start_inmux_thread(); +#else /* hack: if lircd pidfile is present, don't start input thread */ if (access("/var/run/lirc/lircd.pid", R_OK)) start_input_thread(); else lt_info("%s: lircd pidfile present, not starting input thread\n", __func__); -#ifdef MARTII - count_input_devices(); - create_input_devices(); - start_inmux_thread(); #endif /* this is a strange hack: the drivers seem to only work correctly after @@ -320,7 +323,6 @@ void shutdown_td_api() lt_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); #ifdef MARTII if (initialized) { - stop_input_thread(); stop_inmux_thread(); close_input_devices(); }