scop pushed to vdr (f22). "Drop unused patches"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 6 11:56:41 UTC 2015
>From e6376d8ac9895e8b1088cffe37df3f08aeaf4d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Thu, 19 Feb 2015 22:26:19 +0200
Subject: Drop unused patches
diff --git a/vdr-1.7.28-vasarajanauloja-jumpplay.patch b/vdr-1.7.28-vasarajanauloja-jumpplay.patch
deleted file mode 100644
index 717d263..0000000
--- a/vdr-1.7.28-vasarajanauloja-jumpplay.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -up vdr-1.7.28/config.c~ vdr-1.7.28/config.c
---- vdr-1.7.28/config.c~ 2012-05-11 14:06:57.000000000 +0300
-+++ vdr-1.7.28/config.c 2012-06-03 21:38:49.494966365 +0300
-@@ -455,6 +455,9 @@ cSetup::cSetup(void)
- ShowReplayMode = 0;
- ShowRemainingTime = 0;
- ResumeID = 0;
-+ JumpPlay = 0;
-+ PlayJump = 0;
-+ PauseLastMark = 0;
- CurrentChannel = -1;
- CurrentVolume = MAXVOLUME;
- CurrentDolby = 0;
-@@ -650,6 +653,9 @@ bool cSetup::Parse(const char *Name, con
- else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
- else if (!strcasecmp(Name, "ShowRemainingTime")) ShowRemainingTime = atoi(Value);
- else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
-+ else if (!strcasecmp(Name, "JumpPlay")) JumpPlay = atoi(Value);
-+ else if (!strcasecmp(Name, "PlayJump")) PlayJump = atoi(Value);
-+ else if (!strcasecmp(Name, "PauseLastMark")) PauseLastMark = atoi(Value);
- else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
- else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
- else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value);
-@@ -748,6 +754,9 @@ bool cSetup::Save(void)
- Store("ShowReplayMode", ShowReplayMode);
- Store("ShowRemainingTime", ShowRemainingTime);
- Store("ResumeID", ResumeID);
-+ Store("JumpPlay", JumpPlay);
-+ Store("PlayJump", PlayJump);
-+ Store("PauseLastMark", PauseLastMark);
- Store("CurrentChannel", CurrentChannel);
- Store("CurrentVolume", CurrentVolume);
- Store("CurrentDolby", CurrentDolby);
-diff -up vdr-1.7.28/config.h~ vdr-1.7.28/config.h
---- vdr-1.7.28/config.h~ 2012-04-15 13:45:32.000000000 +0300
-+++ vdr-1.7.28/config.h 2012-06-03 21:38:48.350980409 +0300
-@@ -30,6 +30,8 @@
- #define APIVERSION "1.7.28"
- #define APIVERSNUM 10728 // Version * 10000 + Major * 100 + Minor
-
-+#define JUMPPLAYVERSNUM 100
-+
- // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
-@@ -318,6 +320,9 @@ public:
- int ShowReplayMode;
- int ShowRemainingTime;
- int ResumeID;
-+ int JumpPlay;
-+ int PlayJump;
-+ int PauseLastMark;
- int CurrentChannel;
- int CurrentVolume;
- int CurrentDolby;
-diff -up vdr-1.7.28/dvbplayer.c~ vdr-1.7.28/dvbplayer.c
---- vdr-1.7.28/dvbplayer.c~ 2012-06-03 21:34:11.678840928 +0300
-+++ vdr-1.7.28/dvbplayer.c 2012-06-03 21:38:47.111995584 +0300
-@@ -204,6 +204,7 @@ private:
- cNonBlockingFileReader *nonBlockingFileReader;
- cRingBufferFrame *ringBuffer;
- cPtsIndex ptsIndex;
-+ cMarks marks;
- cFileName *fileName;
- cIndexFile *index;
- cUnbufferedFile *replayFile;
-@@ -286,6 +287,7 @@ cDvbPlayer::cDvbPlayer(const char *FileN
- }
- else if (PauseLive)
- framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
-+ marks.Load(FileName, framesPerSecond, isPesRecording);
- }
-
- cDvbPlayer::~cDvbPlayer()
-@@ -365,6 +367,10 @@ bool cDvbPlayer::Save(void)
- int Index = ptsIndex.FindIndex(DeviceGetSTC());
- if (Index >= 0) {
- int backup = int(round(RESUMEBACKUP * framesPerSecond));
-+ // set resume position to 0 if replay stops at the first mark
-+ if (Setup.PlayJump && marks.First() &&
-+ abs(Index - marks.First()->Position()) <= backup)
-+ Index = 0;
- if (Index >= index->Last() - backup)
- Index = 0;
- else {
-@@ -395,11 +401,26 @@ void cDvbPlayer::Action(void)
- {
- uchar *p = NULL;
- int pc = 0;
-+ bool cutIn = false;
-+ int total = -1;
-
- readIndex = Resume();
- if (readIndex >= 0)
- isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
-
-+ if (Setup.PlayJump && readIndex <= 0 && marks.First() && index) {
-+ int Index = marks.First()->Position();
-+ uint16_t FileNumber;
-+ off_t FileOffset;
-+ if (index->Get(Index, &FileNumber, &FileOffset) &&
-+ NextFile(FileNumber, FileOffset)) {
-+ isyslog("PlayJump: start replay at first mark %d (%s)",
-+ Index, *IndexToHMSF(Index, true, framesPerSecond));
-+ readIndex = Index;
-+ }
-+ }
-+
-+ bool LastMarkPause = false;
- nonBlockingFileReader = new cNonBlockingFileReader;
- int Length = 0;
- bool Sleep = false;
-@@ -426,7 +447,7 @@ void cDvbPlayer::Action(void)
-
- // Read the next frame from the file:
-
-- if (playMode != pmStill && playMode != pmPause) {
-+ if (playMode != pmStill && playMode != pmPause && !LastMarkPause) {
- if (!readFrame && (replayFile || readIndex >= 0)) {
- if (!nonBlockingFileReader->Reading()) {
- if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
-@@ -463,6 +484,44 @@ void cDvbPlayer::Action(void)
- else if (index) {
- uint16_t FileNumber;
- off_t FileOffset;
-+ if (Setup.PlayJump || Setup.PauseLastMark) {
-+ // check for end mark - jump to next mark or pause
-+ readIndex++;
-+ marks.Update();
-+ cMark *m = marks.Get(readIndex);
-+ if (m && (m->Index() & 0x01) != 0) {
-+ m = marks.Next(m);
-+ int Index;
-+ if (m)
-+ Index = m->Position();
-+ else if (Setup.PauseLastMark) {
-+ // pause at last mark
-+ isyslog("PauseLastMark: pause at position %d (%s)",
-+ readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
-+ LastMarkPause = true;
-+ Index = -1;
-+ }
-+ else if (total == index->Last())
-+ // at last mark jump to end of recording
-+ Index = index->Last() - 1;
-+ else
-+ // jump but stay off end of live-recordings
-+ Index = index->GetNextIFrame(index->Last() - int(round(MAXSTUCKATEOF * framesPerSecond)), true);
-+ // don't jump in edited recordings
-+ if (Setup.PlayJump && Index > readIndex &&
-+ Index > index->GetNextIFrame(readIndex, true)) {
-+ isyslog("PlayJump: %d frames to %d (%s)",
-+ Index - readIndex, Index,
-+ *IndexToHMSF(Index, true, framesPerSecond));
-+ readIndex = Index;
-+ cutIn = true;
-+ }
-+ }
-+ readIndex--;
-+ }
-+ // for detecting growing length of live-recordings
-+ if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent) && readIndependent)
-+ total = index->Last();
- if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
- readIndex++;
- else
-@@ -507,6 +566,13 @@ void cDvbPlayer::Action(void)
- // Store the frame in the buffer:
-
- if (readFrame) {
-+ if (cutIn) {
-+ if (isPesRecording)
-+ cRemux::SetBrokenLink(readFrame->Data(), readFrame->Count());
-+ else
-+ TsSetTeiOnBrokenPackets(readFrame->Data(), readFrame->Count());
-+ cutIn = false;
-+ }
- if (ringBuffer->Put(readFrame))
- readFrame = NULL;
- else
-@@ -572,8 +638,13 @@ void cDvbPlayer::Action(void)
- p = NULL;
- }
- }
-- else
-+ else {
-+ if (LastMarkPause) {
-+ LastMarkPause = false;
-+ playMode = pmPause;
-+ }
- Sleep = true;
-+ }
-
- // Handle hitting begin/end of recording:
-
-diff -up vdr-1.7.28/menu.c~ vdr-1.7.28/menu.c
---- vdr-1.7.28/menu.c~ 2012-06-03 21:34:11.681840873 +0300
-+++ vdr-1.7.28/menu.c 2012-06-03 21:38:47.814986979 +0300
-@@ -3285,6 +3285,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
- Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
- Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime));
- Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
-+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Jump&Play"), &data.JumpPlay));
-+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Play&Jump"), &data.PlayJump));
-+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause at last mark"), &data.PauseLastMark));
- }
-
- void cMenuSetupReplay::Store(void)
-@@ -4906,8 +4909,17 @@ void cReplayControl::MarkJump(bool Forwa
- if (GetIndex(Current, Total)) {
- cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
- if (m) {
-- Goto(m->Position(), true);
-- displayFrames = true;
-+ bool Play2, Forward2;
-+ int Speed;
-+ if (Setup.JumpPlay && GetReplayMode(Play2, Forward2, Speed) &&
-+ Play2 && Forward && m->Position() < Total - SecondsToFrames(3, FramesPerSecond())) {
-+ Goto(m->Position());
-+ Play();
-+ }
-+ else {
-+ Goto(m->Position(), true);
-+ displayFrames = true;
-+ }
- }
- }
- }
-@@ -4963,7 +4975,7 @@ void cReplayControl::EditTest(void)
- if (!m)
- m = marks.GetNext(Current);
- if (m) {
-- if ((m->Index() & 0x01) != 0)
-+ if ((m->Index() & 0x01) != 0 && !Setup.PlayJump)
- m = marks.Next(m);
- if (m) {
- Goto(m->Position() - SecondsToFrames(3, FramesPerSecond()));
diff --git a/vdr-2.0.5-vasarajanauloja-resetresume.patch b/vdr-2.0.5-vasarajanauloja-resetresume.patch
deleted file mode 100644
index c7438ee..0000000
--- a/vdr-2.0.5-vasarajanauloja-resetresume.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up vdr-2.0.5/dvbplayer.c~ vdr-2.0.5/dvbplayer.c
---- vdr-2.0.5/dvbplayer.c~ 2014-01-07 19:00:26.483871477 +0200
-+++ vdr-2.0.5/dvbplayer.c 2014-01-07 19:01:30.715138152 +0200
-@@ -376,7 +376,7 @@ bool cDvbPlayer::Save(void)
- if (Index >= 0) {
- int backup = int(round(RESUMEBACKUP * framesPerSecond));
- if (Index >= index->Last() - backup)
-- Index = 0;
-+ index->GetNextIFrame(0, true);
- else {
- Index -= backup;
- if (Index > 0)
-diff -up vdr-2.0.5/recording.h~ vdr-2.0.5/recording.h
---- vdr-2.0.5/recording.h~ 2014-01-07 19:00:26.487871556 +0200
-+++ vdr-2.0.5/recording.h 2014-01-07 19:02:15.812069420 +0200
-@@ -132,7 +132,7 @@ public:
- int FileSizeMB(void) const;
- ///< Returns the total file size of this recording (in MB), or -1 if the file
- ///< size is unknown.
-- bool IsNew(void) const { return GetResume() < 0; }
-+ bool IsNew(void) const { return GetResume() <= 0; }
- bool IsEdited(void) const;
- bool IsPesRecording(void) const { return isPesRecording; }
- bool IsOnVideoDirectoryFileSystem(void) const;
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/vdr.git/commit/?h=f22&id=e6376d8ac9895e8b1088cffe37df3f08aeaf4d71
More information about the scm-commits
mailing list