removed unnecessary pattern rules

2 files changed, 27 insertions, 24 deletions

diff --git a/pages/Makefile b/pages/Makefile
index 5945b09..de2011d 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -7,7 +7,7 @@ CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
 CXXFLAGS += `tntnet-config --cxxflags`
 LDFLAGS  += `tntnet-config --libs`
 
-INCLUDES += -I.. -I../pagelib -I$(VDRDIR)/include
+INCLUDES += -I.. -I$(VDRDIR)/include
 
 ### The directory environment:
 
@@ -17,7 +17,7 @@ VDRDIR   ?= ../../../..
 
 OBJS	= menu.o event_widget.o channels.o recordings.o schedule.o \
           screenshot.o timers.o whats_on_now.o whats_on_next.o     \
-		  keypress.o remote.o channels_widget.o edit_timer.o
+	  keypress.o remote.o channels_widget.o edit_timer.o
 
 ### Default rules:
 
@@ -33,18 +33,6 @@ all: libpages.a
 %.cpp: %.ecpp
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
 
-%.cpp: %.gif
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_GIF) -b -m "image/gif" $<
-
-%.cpp: %.jpg
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JPG) -b -m "image/jpg" $<
-
-%.cpp: %.css
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "text/css" $<
-
-%.cpp: %.js
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b -m "test/javascript" $<
-
 ### Targets:
 
 libpages.a: $(OBJS)
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 116505a..ea5c02b 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -3,7 +3,7 @@
 #include <vdr/config.h>
 #include <vdr/i18n.h>
 #include "tools.h"
-// #include "recordings.h"
+#include "recordings.h"
 
 using namespace vdrlive;
 
@@ -29,25 +29,40 @@ using namespace vdrlive;
 				<$ tr("Recordings") $>
 			</div>
 %			if (Recordings.Count() == 0) {
-			Keine Aufnahmen vorhanden
+				Keine Aufnahmen vorhanden
 %			} else {
-			<table class="recording" cellspacing="0" cellpadding="0">
+				<table class="recording" cellspacing="0" cellpadding="0">
 				<tr>
+					<td class="head"><$ tr("Structure") $></td>
 					<td class="head"><$ tr("Date") $></td>
 					<td class="head"><$ tr("Time") $></td>
+					<td class="head"><$ tr("Levels") $></td>
 					<td class="head"><$ tr("Name") $></td>
 				</tr>
+%				RecordingsTree recordingsTree;
+				<div class="recordings">
+					 <ul>
 <{
 				bool active = false;
-				for (cRecording* recording = Recordings.First(); recording != 0; recording = Recordings.Next( recording ) ) {
-					const cRecordingInfo* recInfo = recording->Info();
+				RecordingsTree::Map::iterator iter;
+				for (iter = recordingsTree.begin(); iter != recordingsTree.end(); iter++) {
+					RecordingsTree::RecordingsItemPtr recItem = iter->second;
 					active = !active;
 }>
-				<tr class="<? active ? "active" ?>">
-					<td><$ FormatDateTime(tr("%a, %b %d"), recording->start) $></td>
-					<td><$ FormatDateTime(tr("%I:%M %p"), recording->start) $></td>
-					<td><$ recording->Name() $></td>
-				</tr>
+					<table class="recording" cellspacing="0" cellpadding="0">
+					<tr class="<? active ? "active" ?>">
+						 <td>&nbsp;</td>
+%					if (recItem->IsDir()) {
+						 <td><$ recItem->StartTime() $></td>
+						 <td><$ recItem->StartTime() $></td>
+%					} else {
+						 <td>&nbsp;</td>
+						 <td><$ FormatDateTime(tr("%a, %b %d"), recItem->StartTime()) $></td>
+						 <td><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></td>
+%					}
+						 <td><$ recItem->Name() $></td>
+					</tr>
+					</table>
 <{
 				}
 			}