From 19059348be37ed0dd6b6e62fe94a83b95ad32951 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Wed, 5 Jul 2017 08:57:04 +0200 Subject: [PATCH 1/5] no shutdown if streaming (thx dbo) prevent shutdown from timer if stb is started from deep standby > does a timer-record > and meanwhile streaming (eg. localTV or via web-if to PC) is active Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/57f46e1f2b01852e4f719e72e10f87258b9647eb Author: TangoCash Date: 2017-07-05 (Wed, 05 Jul 2017) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 24ed037d0..b25ed8e7b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3497,6 +3497,8 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) skipShutdownTimer = (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWNTIMER_ANNOUNCE, CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 5) == CMsgBox::mbrYes); } else if( msg == NeutrinoMessages::SHUTDOWN ) { + if(CStreamManager::getInstance()->StreamStatus()) + skipShutdownTimer = true; if(!skipShutdownTimer) { ExitRun(g_info.hw_caps->can_shutdown); } From d0b4e88c50caa2c5785a31b9ef13c8f27c8639bc Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Tue, 11 Jul 2017 18:21:27 +0200 Subject: [PATCH 2/5] increase HTTPD_MAX_CONNECTIONS to 50 This fixes crashes/problems caused by FHEM plugins. https://forum.fhem.de/index.php/topic,54481.msg460625.html#msg460625 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/873d056d2e6fcd990c712339cf5eafe16040f3d4 Author: gixxpunk Date: 2017-07-11 (Tue, 11 Jul 2017) Origin message was: ------------------ - increase HTTPD_MAX_CONNECTIONS to 50 This fixes crashes/problems caused by FHEM plugins. https://forum.fhem.de/index.php/topic,54481.msg460625.html#msg460625 ------------------ This commit was generated by Migit --- src/nhttpd/yconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nhttpd/yconfig.h b/src/nhttpd/yconfig.h index d3444671a..01eaecb32 100644 --- a/src/nhttpd/yconfig.h +++ b/src/nhttpd/yconfig.h @@ -90,7 +90,7 @@ #undef HTTPD_NAME #define HTTPD_NAME "nhttpd" #define HTTPD_STANDARD_PORT 80 -#define HTTPD_MAX_CONNECTIONS 10 +#define HTTPD_MAX_CONNECTIONS 50 #define HTTPD_REQUEST_LOG "/tmp/httpd_log" #define SSL_PEMFILE HTTPD_CONFIGDIR "/server.pem" #define SSL_CA_FILE HTTPD_CONFIGDIR "/cacert.pem" From bed3062e092a3224e1c438951b09906a8e07f49e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 26 Jul 2017 21:34:09 +0200 Subject: [PATCH 3/5] audioplayer: fix right offsets for item Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7cb82ccd74b7141539019f21ce350660632fc5fd Author: vanhofen Date: 2017-07-26 (Wed, 26 Jul 2017) Origin message was: ------------------ - audioplayer: fix right offsets for item ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 4d947b974..a8e91e4a1 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1650,8 +1650,8 @@ void CAudioPlayerGui::paintItem(int pos) else snprintf(dura, 8, "%ld:%02ld", m_playlist[currpos].MetaData.total_time / 60, m_playlist[currpos].MetaData.total_time % 60); - int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(dura) + OFFSET_INNER_SMALL; - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + OFFSET_INNER_MID, ypos + m_item_height, m_width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - w, tmp, color, m_item_height); + int w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(dura); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + OFFSET_INNER_MID, ypos + m_item_height, m_width - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - w, tmp, color, m_item_height); g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(m_x + m_width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - w, ypos + m_item_height, w, dura, color, m_item_height); if (currpos == m_selected) { From 5d44cd746dab9adce00630e83b63c9bcf0ad29d5 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 7 Nov 2016 19:52:28 +0100 Subject: [PATCH 4/5] fix epgtitle Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bc5a8f239f5d64a2ddff03f21f7c5b8258160a4d Author: TangoCash Date: 2016-11-07 (Mon, 07 Nov 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index adab7a202..000201233 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -840,7 +840,8 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist) rtimer.stopTime = (time_t) atoll(remotetimers[i]["stop"][0].get("digits","").asString().c_str()); rtimer.epgID = (event_id_t) atoi(remotetimers[i].get("epg_id","").asString()); sscanf(remotetimers[i].get("channel_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.channel_id); - strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),51); + strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle)); + rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0; if (remotetimers[i]["audio"].get("apids_conf","").asString() == "true") rtimer.apids = TIMERD_APIDS_CONF; //printf("[remotetimer] r-timer:%s - %s\n", remotetimers[i].get("channel_id","").asString().c_str(), remotetimers[i].get("title","").asString().c_str()); From 00f101803965c40a702f58ecd3990a44d750785b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 31 Jul 2017 17:14:10 +0200 Subject: [PATCH 5/5] lcd4l: add info1 and info2; ... in tv/radio/movieplayer-mode this files holds the epg-informations, in audioplayer-mode info1 contains album, info2 contains genre Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/40659d3d81ae0b3ca61e08d97d2fddad3d96b12f Author: vanhofen Date: 2017-07-31 (Mon, 31 Jul 2017) Origin message was: ------------------ - lcd4l: add info1 and info2; ... in tv/radio/movieplayer-mode this files holds the epg-informations, in audioplayer-mode info1 contains album, info2 contains genre ------------------ This commit was generated by Migit --- src/gui/lcd4l.cpp | 37 +++++++++++++++++++++++++++++++++++++ src/gui/lcd4l.h | 2 ++ 2 files changed, 39 insertions(+) diff --git a/src/gui/lcd4l.cpp b/src/gui/lcd4l.cpp index 652049f2e..5a45d31f5 100644 --- a/src/gui/lcd4l.cpp +++ b/src/gui/lcd4l.cpp @@ -93,6 +93,8 @@ extern cVideo *videoDecoder; #define LAYOUT LCD_DATADIR "layout" #define EVENT LCD_DATADIR "event" +#define INFO1 LCD_DATADIR "info1" +#define INFO2 LCD_DATADIR "info2" #define PROGRESS LCD_DATADIR "progress" #define DURATION LCD_DATADIR "duration" #define START LCD_DATADIR "start" @@ -220,6 +222,8 @@ void CLCD4l::Init() m_Layout = "n/a"; m_Event = "n/a"; + m_Info1 = "n/a"; + m_Info2 = "n/a"; m_Progress = -1; for (int i = 0; i < (int)sizeof(m_Duration); i++) m_Duration[i] = ' '; @@ -719,6 +723,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) /* ----------------------------------------------------------------- */ std::string Event = ""; + std::string Info1 = ""; + std::string Info2 = ""; int Progress = 0; char Duration[sizeof(m_Duration)] = {0}; char Start[6] = {0}; @@ -740,6 +746,13 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (!CurrentNext.current_name.empty()) Event = CurrentNext.current_name; + CShortEPGData shortEpgData; + if (CEitManager::getInstance()->getEPGidShort(CurrentNext.current_uniqueKey, &shortEpgData)) + { + Info1 = shortEpgData.info1; + Info2 = shortEpgData.info2; + } + if ((CurrentNext.current_zeit.dauer > 0) && (CurrentNext.current_zeit.dauer < 86400)) { Progress = 100 * (time(NULL) - CurrentNext.current_zeit.startzeit) / CurrentNext.current_zeit.dauer; @@ -787,6 +800,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if ( !meta.title.empty() ) Event += meta.title; + if (!meta.album.empty()) + Info1 = meta.album; + + if (!meta.genre.empty()) + Info2 = meta.genre; + time_t total = meta.total_time; time_t done = CAudioPlayer::getInstance()->getTimePlayed(); @@ -814,6 +833,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) { if (!CMoviePlayerGui::getInstance().p_movie_info->epgTitle.empty()) Event = CMoviePlayerGui::getInstance().p_movie_info->epgTitle; + + if (!CMoviePlayerGui::getInstance().p_movie_info->epgInfo1.empty()) + Info1 = CMoviePlayerGui::getInstance().p_movie_info->epgInfo1; + + if (!CMoviePlayerGui::getInstance().p_movie_info->epgInfo2.empty()) + Info2 = CMoviePlayerGui::getInstance().p_movie_info->epgInfo2; } else if (!CMoviePlayerGui::getInstance().GetFile().empty()) Event = CMoviePlayerGui::getInstance().GetFile(); @@ -857,6 +882,18 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) m_Event = Event; } + if (m_Info1.compare(Info1)) + { + WriteFile(INFO1, Info1, g_settings.lcd4l_convert); + m_Info1 = Info1; + } + + if (m_Info2.compare(Info2)) + { + WriteFile(INFO2, Info2, g_settings.lcd4l_convert); + m_Info2 = Info2; + } + if (m_Start.compare(Start)) { WriteFile(START, (std::string)Start); diff --git a/src/gui/lcd4l.h b/src/gui/lcd4l.h index 9708cbf14..60f73118a 100644 --- a/src/gui/lcd4l.h +++ b/src/gui/lcd4l.h @@ -114,6 +114,8 @@ class CLCD4l std::string m_Layout; std::string m_Event; + std::string m_Info1; + std::string m_Info2; int m_Progress; char m_Duration[15]; std::string m_Start;