| 1 |
hd_brummy 12/04/07 08:24:58 |
| 2 |
|
| 3 |
Added: vdr-1.7.27.diff |
| 4 |
Log: |
| 5 |
eapi=4; compilefix >=vdr-1.7.27 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vdr-1.7.27.diff |
| 16 |
=================================================================== |
| 17 |
diff -Naur extrecmenu-1.2.1.orig/mymenueditrecording.c extrecmenu-1.2.1/mymenueditrecording.c |
| 18 |
--- extrecmenu-1.2.1.orig/mymenueditrecording.c 2012-04-07 09:48:21.000000000 +0200 |
| 19 |
+++ extrecmenu-1.2.1/mymenueditrecording.c 2012-04-07 09:52:03.000000000 +0200 |
| 20 |
@@ -500,8 +500,8 @@ |
| 21 |
myMenuRecordingDetails::myMenuRecordingDetails(cRecording *Recording):cOsdMenu(tr("Details"),12) |
| 22 |
{ |
| 23 |
recording=Recording; |
| 24 |
- priority=recording->priority; |
| 25 |
- lifetime=recording->lifetime; |
| 26 |
+ priority=recording->Priority(); |
| 27 |
+ lifetime=recording->Lifetime(); |
| 28 |
|
| 29 |
Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY)); |
| 30 |
Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME)); |
| 31 |
@@ -514,7 +514,10 @@ |
| 32 |
{ |
| 33 |
if(Key==kOk) |
| 34 |
{ |
| 35 |
- if((priority!=recording->priority)||(lifetime!=recording->lifetime)) |
| 36 |
+ int old_priority = recording->Priority(); |
| 37 |
+ int old_lifetime = recording->Lifetime(); |
| 38 |
+ if((priority!=old_priority)||(lifetime!=old_lifetime)) |
| 39 |
+// if((priority!=recording->priority)||(lifetime!=recording->lifetime)) |
| 40 |
{ |
| 41 |
#if VDRVERSNUM > 10713 |
| 42 |
if(recording->IsPesRecording()) |
| 43 |
diff -Naur extrecmenu-1.2.1.orig/tools.c extrecmenu-1.2.1/tools.c |
| 44 |
--- extrecmenu-1.2.1.orig/tools.c 2012-04-07 09:48:21.000000000 +0200 |
| 45 |
+++ extrecmenu-1.2.1/tools.c 2012-04-07 09:56:33.000000000 +0200 |
| 46 |
@@ -456,7 +456,7 @@ |
| 47 |
if(!(fromfile=fromfilename->Open()) || !(tofile=tofilename->Open())) |
| 48 |
return; |
| 49 |
fromfile->SetReadAhead(MEGABYTE(20)); |
| 50 |
- index=mark->position; |
| 51 |
+ index=mark->Position(); |
| 52 |
mark=frommarks.Next(mark); |
| 53 |
tomarks.Add(0); |
| 54 |
tomarks.Save(); |
| 55 |
@@ -542,8 +542,8 @@ |
| 56 |
filesize+=length; |
| 57 |
if(!lastiframe) |
| 58 |
lastiframe=toindex->Last(); |
| 59 |
- |
| 60 |
- if(mark && index >= mark->position) |
| 61 |
+ |
| 62 |
+ if(mark && index >= mark->Position()) |
| 63 |
{ |
| 64 |
mark=frommarks.Next(mark); |
| 65 |
tomarks.Add(lastiframe); |
| 66 |
@@ -552,7 +552,7 @@ |
| 67 |
tomarks.Save(); |
| 68 |
if(mark) |
| 69 |
{ |
| 70 |
- index=mark->position; |
| 71 |
+ index=mark->Position(); |
| 72 |
mark=frommarks.Next(mark); |
| 73 |
currentfilenumber=0; |
| 74 |
cutin=true; |
| 75 |
diff -Naur extrecmenu-1.2.1.orig/mymenurecordings.c extrecmenu-1.2.1/mymenurecordings.c |
| 76 |
--- extrecmenu-1.2.1.orig/mymenurecordings.c 2012-04-07 10:08:35.000000000 +0200 |
| 77 |
+++ extrecmenu-1.2.1/mymenurecordings.c 2012-04-07 10:17:19.000000000 +0200 |
| 78 |
@@ -66,7 +66,9 @@ |
| 79 |
else |
| 80 |
{ |
| 81 |
stringstream text; |
| 82 |
- text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n"; |
| 83 |
+// text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n"; |
| 84 |
+ time_t start = recording->Start(); |
| 85 |
+ text << *DateString(start) << ", " << *TimeString(start) << "\n\n"; |
| 86 |
|
| 87 |
if(recording->Info()->Title()) |
| 88 |
{ |
| 89 |
@@ -95,8 +97,12 @@ |
| 90 |
else |
| 91 |
text << tr("Size") << ": " << recmb << " MB\n"; |
| 92 |
|
| 93 |
- text << trVDR("Priority") << ": " << recording->priority << "\n"; |
| 94 |
- text << trVDR("Lifetime") << ": " << recording->lifetime << "\n"; |
| 95 |
+// text << trVDR("Priority") << ": " << recording->priority << "\n"; |
| 96 |
+// text << trVDR("Lifetime") << ": " << recording->lifetime << "\n"; |
| 97 |
+ int prio = recording->Priority(); |
| 98 |
+ int lft = recording->Lifetime(); |
| 99 |
+ text << trVDR("Priority") << ": " << prio << "\n"; |
| 100 |
+ text << trVDR("Lifetime") << ": " << lft << "\n"; |
| 101 |
|
| 102 |
DisplayMenu()->SetText(text.str().c_str(),false); |
| 103 |
cStatus::MsgOsdTextItem(text.str().c_str()); |
| 104 |
@@ -192,7 +198,9 @@ |
| 105 |
|
| 106 |
// date and time of recording |
| 107 |
struct tm tm_r; |
| 108 |
- struct tm *t=localtime_r(&Recording->start,&tm_r); |
| 109 |
+// struct tm *t=localtime_r(&Recording->start,&tm_r); |
| 110 |
+ time_t start = Recording->Start(); |
| 111 |
+ struct tm *t=localtime_r(&start,&tm_r); |
| 112 |
|
| 113 |
idbuffer << t->tm_mday << t->tm_mon << t->tm_year |
| 114 |
<< t->tm_hour << t->tm_min; |
Archives