Stefan Saraev 2013-02-13 20:27:23 +02:00
parent fc61557865
commit 0bf911e4f5
2 changed files with 90 additions and 0 deletions

View File

@ -0,0 +1,50 @@
From 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9 Mon Sep 17 00:00:00 2001
From: Dieter Hametner
Date: Sun, 25 Mar 2012 14:42:12 +0000
Subject: Updated LIVE to latest changes in vdr 1.7.27
- Do not use the direct access to cRecoding members any more.
---
diff --git a/epg_events.cpp b/epg_events.cpp
index a514769..cd4996e 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -182,12 +182,20 @@ namespace vdrlive
time_t EpgRecording::GetStartTime() const
{
+#if VDRVERSNUM < 10726
return m_recording ? m_recording->start : 0;
+#else
+ return m_recording ? m_recording->Start() : 0;
+#endif
}
time_t EpgRecording::GetEndTime() const
{
+#if VDRVERSNUM < 10726
return m_recording ? m_recording->start : 0;
+#else
+ return m_recording ? m_recording->Start() : 0;
+#endif
}
const string EpgRecording::Name() const
diff --git a/recman.cpp b/recman.cpp
index fb315d2..6a2fc00 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -383,7 +383,11 @@ namespace vdrlive {
time_t RecordingsItemRec::StartTime() const
{
+#if VDRVERSNUM < 10726
return m_recording->start;
+#else
+ return m_recording->Start();
+#endif
}
long RecordingsItemRec::Duration() const
--
cgit v0.9.0.2-40-g7c79

View File

@ -0,0 +1,40 @@
From c3ecf9fabb674bc154f5a08cdd62e74e2b5d0e36 Mon Sep 17 00:00:00 2001
From: Christian Ruppert
Date: Sun, 03 Jun 2012 23:42:31 +0000
Subject: Compile fix for >=vdr-1.7.28
---
diff --git a/tasks.cpp b/tasks.cpp
index 9f20190..2a2b8d5 100644
--- a/tasks.cpp
+++ b/tasks.cpp
@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
const char *current = NowReplaying();
if (!current || (0 != strcmp(current, recording->FileName()))) {
+#if VDRVERSNUM >= 10728
+ cReplayControl::SetRecording( 0 );
+ cControl::Shutdown();
+ cReplayControl::SetRecording( recording->FileName() );
+#else
cReplayControl::SetRecording( 0, 0 );
cControl::Shutdown();
cReplayControl::SetRecording( recording->FileName(), recording->Title() );
+#endif
cControl::Launch( new cReplayControl );
cControl::Attach();
}
@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
return;
}
+#if VDRVERSNUM >= 10728
+ cReplayControl::SetRecording( 0 );
+#else
cReplayControl::SetRecording( 0, 0 );
+#endif
cControl::Shutdown();
}
--
cgit v0.9.0.2-40-g7c79