summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
Diffstat (limited to 'pages')
-rw-r--r--pages/Makefile2
-rw-r--r--pages/epginfo.ecpp2
-rw-r--r--pages/ibox.ecpp2
-rw-r--r--pages/recordings.ecpp16
4 files changed, 11 insertions, 11 deletions
diff --git a/pages/Makefile b/pages/Makefile
index 09dfd63..9945f1f 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -43,7 +43,7 @@ all: libpages.a
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
-$(DEPFILE): Makefile $(OBJS:%.o=%.cpp)
+$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp)
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@
-include $(DEPFILE)
diff --git a/pages/epginfo.ecpp b/pages/epginfo.ecpp
index c14d89d..4f49f0f 100644
--- a/pages/epginfo.ecpp
+++ b/pages/epginfo.ecpp
@@ -7,7 +7,7 @@
#include "setup.h"
#include "tools.h"
#include "epg_events.h"
-#include "recordings.h"
+#include "recman.h"
namespace vdrlive {
class SchedulesLock
diff --git a/pages/ibox.ecpp b/pages/ibox.ecpp
index 0118c07..147dcfa 100644
--- a/pages/ibox.ecpp
+++ b/pages/ibox.ecpp
@@ -10,7 +10,7 @@
#include "setup.h"
#include "tools.h"
#include "epg_events.h"
-#include "recordings.h"
+#include "recman.h"
using namespace vdrlive;
using namespace std;
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index dabb301..f0d6553 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -6,7 +6,7 @@
#include "tools.h"
#include "epg_events.h"
-#include "recordings.h"
+#include "recman.h"
#include "setup.h"
using namespace vdrlive;
@@ -19,7 +19,7 @@ using namespace std;
bool logged_in(false);
</%session>
<%request scope="page">
-RecordingsTree recordingsTree(LiveRecordingsManager());
+ RecordingsTreePtr recordingsTree(LiveRecordingsManager()->GetRecordingsTree());
</%request>
<%include>page_init.eh</%include>
<%cpp>
@@ -62,11 +62,11 @@ RecordingsTree recordingsTree(LiveRecordingsManager());
int level = 0;
</%args>
<%cpp>
-RecordingsTree::Map::iterator iter;
-RecordingsTree::Map::iterator end = recordingsTree.end(path);
+RecordingsMap::iterator iter;
+RecordingsMap::iterator end = recordingsTree->end(path);
-for (iter = recordingsTree.begin(path); iter != end; ++iter) {
- RecordingsTree::RecordingsItemPtr recItem = iter->second;
+for (iter = recordingsTree->begin(path); iter != end; ++iter) {
+ RecordingsItemPtr recItem = iter->second;
string folderimg("folder_closed.png");
string collapseimg("plus.png");
if (recItem->IsDir()) {
@@ -88,8 +88,8 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
% }
%}
<%cpp>
-for (iter = recordingsTree.begin(path); iter != end; ++iter) {
- RecordingsTree::RecordingsItemPtr recItem = iter->second;
+for (iter = recordingsTree->begin(path); iter != end; ++iter) {
+ RecordingsItemPtr recItem = iter->second;
if (!recItem->IsDir()) {
string day(FormatDateTime("%a,", recItem->StartTime()));
string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;");