From d6d3bf51277ddd9d8dd8c3ede6cee1c045c97909 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 13 Nov 2017 19:42:12 +0100 Subject: [PATCH 1/2] fix audio description after play movie Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/54c5d19e1a045a17ae9a0738497f0166b9132702 Author: Jacek Jendrzej Date: 2017-11-13 (Mon, 13 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/daemonc/remotecontrol.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index cc38060e9..03f8591d2 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -542,6 +542,12 @@ void CRemoteControl::processAPIDnames() #endif if ( has_unresolved_ctags ) { + if ( current_EPGid == 0 ){ + const CSectionsdClient::CurrentNextInfo info_CN = g_InfoViewer->getCurrentNextInfo(); + if ((info_CN.current_uniqueKey >> 16) == (current_channel_id & 0xFFFFFFFFFFFFULL)){ + current_EPGid = info_CN.current_uniqueKey; + } + } if ( current_EPGid != 0 ) { CSectionsdClient::ComponentTagList tags; From 38400cc6b5869162c3a5aaa3376d9c77a06df229 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Thu, 9 Nov 2017 20:02:20 +0100 Subject: [PATCH 2/2] hd51: fix wakeup from standby Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c4a59375b3b96d7b2d221b40b270e2ec65782f79 Author: TangoCash Date: 2017-11-09 (Thu, 09 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5d4a80f5d..3a5271bb6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2153,6 +2153,18 @@ void wake_up(bool &wakeup) } printf("[timerd] wakeup from standby: %s\n", wakeup ? "yes" : "no"); #endif +#if HAVE_ARM_HARDWARE + FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "r"); + if (f) + { + unsigned int tmp; + if (fscanf(f, "%u", &tmp) != 1) + printf("[neutrino] read /proc/stb/fp/was_timer_wakeup failed: %m\n"); + else + wakeup = (tmp > 0); + fclose(f); + } +#endif // HAVE_ARM_HARDWARE /* not platform specific - this is created by the init process */ if (access("/tmp/.timer_wakeup", F_OK) == 0) { wakeup = 1; @@ -3886,6 +3898,21 @@ void CNeutrinoApp::ExitRun(int can_shutdown) #endif if (timer_minutes || leds) { +#if HAVE_ARM_HARDWARE + FILE *f = fopen("/proc/stb/fp/wakeup_time","w"); + if (f) + { + time_t t = timer_minutes * 60; + struct tm *tm = localtime(&t); + char date[30]; + strftime(date, sizeof(date), "%c", tm); + fprintf(stderr, "timer_wakeup: %s (%ld)\n", date, timer_minutes * 60); + fprintf(f, "%ld\n", timer_minutes * 60); + fclose(f); + } + else + perror("fopen /proc/stb/fp/wakeup_time"); +#else FILE *f = fopen("/tmp/.timer", "w"); if (f) { @@ -3897,6 +3924,7 @@ void CNeutrinoApp::ExitRun(int can_shutdown) } else perror("fopen /tmp/.timer"); +#endif } delete g_RCInput;