From ae07afa352223a6b4bdb8d9d9c2d5d111e377f39 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 26 Feb 2017 00:06:32 +0100 Subject: [PATCH 1/3] timerlist: fix timer comparison in modifyTimer() Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/cf9a1a705cf819e1112c20c20d09e823c4bb675f Author: vanhofen Date: 2017-02-26 (Sun, 26 Feb 2017) Origin message was: ------------------ - timerlist: fix timer comparison in modifyTimer() --- src/gui/timerlist.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index f54d04c30..145360ee8 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1616,6 +1616,7 @@ int CTimerList::modifyTimer() if (!strlen(timer->recordingDir)) strncpy(timer->recordingDir,g_settings.network_nfs_recordingdir.c_str(),sizeof(timer->recordingDir)-1); timer_recordingDir = timer->recordingDir; + strncpy(t_old.recordingDir, timer->recordingDir, sizeof(t_old.recordingDir)-1); bool recDirEnabled = (g_settings.recording_type == RECORDING_FILE); // obsolete? CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, recDirEnabled, timer_recordingDir, this, "rec_dir1", CRCInput::RC_green); From 4a8ef2e82802db92bfc678f4a0de05a35bb839a9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 26 Feb 2017 01:01:15 +0100 Subject: [PATCH 2/3] channelist: use OFFSET-defines for channels w/o EPG too Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1aa5e929db9197bd5c2480471b4e57712995b734 Author: vanhofen Date: 2017-02-26 (Sun, 26 Feb 2017) Origin message was: ------------------ - channelist: use OFFSET-defines for channels w/o EPG too --- src/gui/channellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index d4a139537..9f8fc22be 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2087,7 +2087,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) pb.paint(); } //name - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 5+ numwidth+ 10+prg_offset, ypos+ fheight, width- numwidth- 40- 15-prg_offset, nameAndDescription, color); + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_SMALL + numwidth + OFFSET_INNER_MID + prg_offset, ypos + fheight, width - numwidth - 4*OFFSET_INNER_MID - 15 - prg_offset, nameAndDescription, color); } if (!firstpaint && curr == selected) updateVfd(); From e8635fe8f7a82d3b204388b4d6e4b963d90dce41 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 26 Feb 2017 15:05:21 +0100 Subject: [PATCH 3/3] src/gui/movieplayer.cpp try fix stop play file on file end Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/df25b5094427705816f3264252e2c506ff50b9e2 Author: Jacek Jendrzej Date: 2017-02-26 (Sun, 26 Feb 2017) --- src/gui/movieplayer.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 87499697e..05fd0b093 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1285,8 +1285,11 @@ void CMoviePlayerGui::PlayFileLoop(void) bool first_start = true; bool update_lcd = true; int eof = 0; + int eof2 = 0; + int position_tmp = 0; bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);; keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL; + while (playstate >= CMoviePlayerGui::PLAY) { if (update_lcd) { @@ -1320,6 +1323,20 @@ void CMoviePlayerGui::PlayFileLoop(void) printf("CMoviePlayerGui::%s: spd %d pos %d/%d (%d, %d%%)\n", __func__, speed, position, duration, duration-position, file_prozent); #endif /* in case ffmpeg report incorrect values */ + if((playstate == CMoviePlayerGui::PLAY) && (speed == 1)){ + if(position_tmp != position){ + position_tmp = position ; + eof2 = 0; + }else{ + if (++eof2 > 6) { + at_eof = true; + break; + } + } + } + else{ + eof2 = 0; + } int posdiff = duration - position; if ((posdiff >= 0) && (posdiff < 2000) && timeshift == TSHIFT_MODE_OFF) {