From 721f6213cc1343e4ab613a89be55d37dd0780244 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Mon, 17 Sep 2007 22:23:40 +0000 Subject: - Moved images from compiled in image dir to data dir 'img'. - Fixed MapUrl entries to the new image location - Adapted some pages for the new image locations. - Added a preload functionalty to fill file cache at plugin startup. --- Makefile | 9 ++-- css/styles.css | 40 +++++++-------- doc/ChangeLog | 10 ++++ images/Makefile | 58 ---------------------- images/active.png | Bin 854 -> 0 bytes images/arrow.png | Bin 419 -> 0 bytes images/arrow_rec.gif | Bin 2962 -> 0 bytes images/bg_box_h.png | Bin 126 -> 0 bytes images/bg_box_l.png | Bin 163 -> 0 bytes images/bg_box_r.png | Bin 160 -> 0 bytes images/bg_header_h.png | Bin 131 -> 0 bytes images/bg_header_l.png | Bin 182 -> 0 bytes images/bg_header_r.png | Bin 190 -> 0 bytes images/bg_line.png | Bin 144 -> 0 bytes images/bg_line_top.png | Bin 90 -> 0 bytes images/bg_tools.png | Bin 151 -> 0 bytes images/button_blue.png | Bin 406 -> 0 bytes images/button_green.png | Bin 452 -> 0 bytes images/button_new.png | Bin 931 -> 0 bytes images/button_red.png | Bin 463 -> 0 bytes images/button_yellow.png | Bin 411 -> 0 bytes images/close.png | Bin 575 -> 0 bytes images/del.png | Bin 832 -> 0 bytes images/edit.png | Bin 809 -> 0 bytes images/favicon.ico | Bin 3638 -> 0 bytes images/ffw.png | Bin 852 -> 0 bytes images/file.png | Bin 644 -> 0 bytes images/folder_closed.png | Bin 625 -> 0 bytes images/folder_open.png | Bin 762 -> 0 bytes images/help.png | Bin 818 -> 0 bytes images/imdb.png | Bin 958 -> 0 bytes images/inactive.png | Bin 805 -> 0 bytes images/logo.png | Bin 14040 -> 0 bytes images/logo_login.png | Bin 33390 -> 0 bytes images/menu_line_bg.png | Bin 185 -> 0 bytes images/minus.png | Bin 472 -> 0 bytes images/movie.png | Bin 778 -> 0 bytes images/on_dvd.png | Bin 821 -> 0 bytes images/one_downarrow.png | Bin 808 -> 0 bytes images/one_uparrow.png | Bin 781 -> 0 bytes images/pause.png | Bin 748 -> 0 bytes images/play.png | Bin 820 -> 0 bytes images/plus.png | Bin 480 -> 0 bytes images/record.png | Bin 815 -> 0 bytes images/record_timer.png | Bin 833 -> 0 bytes images/reload.png | Bin 713 -> 0 bytes images/remotecontrol.jpg | Bin 19596 -> 0 bytes images/rwd.png | Bin 863 -> 0 bytes images/search.png | Bin 940 -> 0 bytes images/stop.png | Bin 713 -> 0 bytes images/stop_update.png | Bin 748 -> 0 bytes images/transparent.png | Bin 70 -> 0 bytes images/tv.jpg | Bin 48098 -> 0 bytes images/zap.png | Bin 551 -> 0 bytes javascript/treeview.js | 4 +- live.cpp | 7 ++- live/img/active.png | Bin 0 -> 854 bytes live/img/arrow.png | Bin 0 -> 419 bytes live/img/arrow_rec.gif | Bin 0 -> 2962 bytes live/img/bg_box_h.png | Bin 0 -> 126 bytes live/img/bg_box_l.png | Bin 0 -> 163 bytes live/img/bg_box_r.png | Bin 0 -> 160 bytes live/img/bg_header_h.png | Bin 0 -> 131 bytes live/img/bg_header_l.png | Bin 0 -> 182 bytes live/img/bg_header_r.png | Bin 0 -> 190 bytes live/img/bg_line.png | Bin 0 -> 144 bytes live/img/bg_line_top.png | Bin 0 -> 90 bytes live/img/bg_tools.png | Bin 0 -> 151 bytes live/img/button_blue.png | Bin 0 -> 406 bytes live/img/button_green.png | Bin 0 -> 452 bytes live/img/button_new.png | Bin 0 -> 931 bytes live/img/button_red.png | Bin 0 -> 463 bytes live/img/button_yellow.png | Bin 0 -> 411 bytes live/img/close.png | Bin 0 -> 575 bytes live/img/del.png | Bin 0 -> 832 bytes live/img/edit.png | Bin 0 -> 809 bytes live/img/favicon.ico | Bin 0 -> 3638 bytes live/img/ffw.png | Bin 0 -> 852 bytes live/img/file.png | Bin 0 -> 644 bytes live/img/folder_closed.png | Bin 0 -> 625 bytes live/img/folder_open.png | Bin 0 -> 762 bytes live/img/help.png | Bin 0 -> 818 bytes live/img/imdb.png | Bin 0 -> 958 bytes live/img/inactive.png | Bin 0 -> 805 bytes live/img/logo.png | Bin 0 -> 14040 bytes live/img/logo_login.png | Bin 0 -> 33390 bytes live/img/menu_line_bg.png | Bin 0 -> 185 bytes live/img/minus.png | Bin 0 -> 472 bytes live/img/movie.png | Bin 0 -> 778 bytes live/img/on_dvd.png | Bin 0 -> 821 bytes live/img/one_downarrow.png | Bin 0 -> 808 bytes live/img/one_uparrow.png | Bin 0 -> 781 bytes live/img/pause.png | Bin 0 -> 748 bytes live/img/play.png | Bin 0 -> 820 bytes live/img/plus.png | Bin 0 -> 480 bytes live/img/record.png | Bin 0 -> 815 bytes live/img/record_timer.png | Bin 0 -> 833 bytes live/img/reload.png | Bin 0 -> 713 bytes live/img/remotecontrol.jpg | Bin 0 -> 19596 bytes live/img/rwd.png | Bin 0 -> 863 bytes live/img/search.png | Bin 0 -> 940 bytes live/img/stop.png | Bin 0 -> 713 bytes live/img/stop_update.png | Bin 0 -> 748 bytes live/img/transparent.png | Bin 0 -> 70 bytes live/img/tv.jpg | Bin 0 -> 48098 bytes live/img/zap.png | Bin 0 -> 551 bytes live/js/live/pageenhance.js | 14 +++--- live/js/live/vdr_status.js | 2 +- pages/pageelems.ecpp | 3 +- pages/recordings.ecpp | 6 +-- pages/searchtimers.ecpp | 2 +- pages/timers.ecpp | 8 +-- preload.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++++ preload.h | 11 +++++ tntconfig.cpp | 12 +++-- 115 files changed, 195 insertions(+), 107 deletions(-) delete mode 100644 images/Makefile delete mode 100644 images/active.png delete mode 100644 images/arrow.png delete mode 100644 images/arrow_rec.gif delete mode 100644 images/bg_box_h.png delete mode 100644 images/bg_box_l.png delete mode 100644 images/bg_box_r.png delete mode 100644 images/bg_header_h.png delete mode 100644 images/bg_header_l.png delete mode 100644 images/bg_header_r.png delete mode 100644 images/bg_line.png delete mode 100644 images/bg_line_top.png delete mode 100644 images/bg_tools.png delete mode 100644 images/button_blue.png delete mode 100644 images/button_green.png delete mode 100644 images/button_new.png delete mode 100644 images/button_red.png delete mode 100644 images/button_yellow.png delete mode 100644 images/close.png delete mode 100644 images/del.png delete mode 100644 images/edit.png delete mode 100644 images/favicon.ico delete mode 100644 images/ffw.png delete mode 100644 images/file.png delete mode 100644 images/folder_closed.png delete mode 100644 images/folder_open.png delete mode 100644 images/help.png delete mode 100644 images/imdb.png delete mode 100644 images/inactive.png delete mode 100644 images/logo.png delete mode 100644 images/logo_login.png delete mode 100644 images/menu_line_bg.png delete mode 100644 images/minus.png delete mode 100644 images/movie.png delete mode 100644 images/on_dvd.png delete mode 100644 images/one_downarrow.png delete mode 100644 images/one_uparrow.png delete mode 100644 images/pause.png delete mode 100644 images/play.png delete mode 100644 images/plus.png delete mode 100644 images/record.png delete mode 100644 images/record_timer.png delete mode 100644 images/reload.png delete mode 100644 images/remotecontrol.jpg delete mode 100644 images/rwd.png delete mode 100644 images/search.png delete mode 100644 images/stop.png delete mode 100644 images/stop_update.png delete mode 100644 images/transparent.png delete mode 100644 images/tv.jpg delete mode 100644 images/zap.png create mode 100644 live/img/active.png create mode 100644 live/img/arrow.png create mode 100644 live/img/arrow_rec.gif create mode 100644 live/img/bg_box_h.png create mode 100644 live/img/bg_box_l.png create mode 100644 live/img/bg_box_r.png create mode 100644 live/img/bg_header_h.png create mode 100644 live/img/bg_header_l.png create mode 100644 live/img/bg_header_r.png create mode 100644 live/img/bg_line.png create mode 100644 live/img/bg_line_top.png create mode 100644 live/img/bg_tools.png create mode 100644 live/img/button_blue.png create mode 100644 live/img/button_green.png create mode 100644 live/img/button_new.png create mode 100644 live/img/button_red.png create mode 100644 live/img/button_yellow.png create mode 100644 live/img/close.png create mode 100644 live/img/del.png create mode 100644 live/img/edit.png create mode 100644 live/img/favicon.ico create mode 100644 live/img/ffw.png create mode 100644 live/img/file.png create mode 100644 live/img/folder_closed.png create mode 100644 live/img/folder_open.png create mode 100644 live/img/help.png create mode 100644 live/img/imdb.png create mode 100644 live/img/inactive.png create mode 100644 live/img/logo.png create mode 100644 live/img/logo_login.png create mode 100644 live/img/menu_line_bg.png create mode 100644 live/img/minus.png create mode 100644 live/img/movie.png create mode 100644 live/img/on_dvd.png create mode 100644 live/img/one_downarrow.png create mode 100644 live/img/one_uparrow.png create mode 100644 live/img/pause.png create mode 100644 live/img/play.png create mode 100644 live/img/plus.png create mode 100644 live/img/record.png create mode 100644 live/img/record_timer.png create mode 100644 live/img/reload.png create mode 100644 live/img/remotecontrol.jpg create mode 100644 live/img/rwd.png create mode 100644 live/img/search.png create mode 100644 live/img/stop.png create mode 100644 live/img/stop_update.png create mode 100644 live/img/transparent.png create mode 100644 live/img/tv.jpg create mode 100644 live/img/zap.png create mode 100644 preload.cpp create mode 100644 preload.h diff --git a/Makefile b/Makefile index c1d1605..c2a4789 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.49 2007/09/02 18:42:07 winni Exp $ +# $Id: Makefile,v 1.50 2007/09/17 22:23:40 tadi Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -57,16 +57,15 @@ export DEFINES LIBS += httpd/libhttpd.a -SUBDIRS = httpd pages css images javascript +SUBDIRS = httpd pages css javascript ### The object files (add further files here): PLUGINOBJS = $(PLUGIN).o thread.o tntconfig.o setup.o i18n.o timers.o \ tools.o recordings.o tasks.o status.o epg_events.o epgsearch.o \ - grab.o md5.o filecache.o livefeatures.o + grab.o md5.o filecache.o livefeatures.o preload.o -WEBLIBS = pages/libpages.a css/libcss.a images/libimages.a \ - javascript/libjavascript.a +WEBLIBS = pages/libpages.a css/libcss.a javascript/libjavascript.a ### Default rules: diff --git a/css/styles.css b/css/styles.css index 9bc25ea..0043e22 100644 --- a/css/styles.css +++ b/css/styles.css @@ -328,7 +328,7 @@ div.info-win { .info-win .info-win-top .info-win-c .info-win-b .close { width: 16px; height: 16px; - background: transparent url(close.png) no-repeat top right; + background: transparent url(img/close.png) no-repeat top right; } .info-win .info-win-top .info-win-c .info-win-b .close:hover { @@ -371,7 +371,7 @@ div.info-win { */ div.menu { - background: #000057 url(menu_line_bg.png) repeat-x; + background: #000057 url(img/menu_line_bg.png) repeat-x; min-height: 27px; margin: 0; padding: 0 0 0 10px; @@ -408,12 +408,12 @@ div.inhalt { div.pagemenu { margin-top: 2px; padding-top: 6px; - background: #FFFFFF url(bg_line.png) top repeat-x; + background: #FFFFFF url(img/bg_line.png) top repeat-x; } div.pagemenu div { /* padding-bottom: 6px; */ - background: #FFFFFF url(bg_line_top.png) bottom repeat-x; + background: #FFFFFF url(img/bg_line_top.png) bottom repeat-x; } div.pagemenu div div { @@ -501,7 +501,7 @@ div#infobox div.st_header div.caption { div#infobox div.st_content { overflow: hidden; padding: 4px; - background: white url('bg_line_top.png') top left repeat-x; + background: white url(img/bg_line_top.png) top left repeat-x; } div#infobox div.st_content div.duration { @@ -549,7 +549,7 @@ button.green { width: 100px; height: 20px; background-color: inherit; - background-image: url(button_green.png); + background-image: url(img/button_green.png); background-repeat: no-repeat; color: #FFFFFF; font-size: 11px; @@ -564,7 +564,7 @@ button.red { width: 100px; height: 20px; background-color: inherit; - background-image: url(button_red.png); + background-image: url(img/button_red.png); background-repeat: no-repeat; color: #FFFFFF; font-size: 11px; @@ -579,7 +579,7 @@ button.blue { width: 100px; height: 20px; background-color: inherit; - background-image: url(button_blue.png); + background-image: url(img/button_blue.png); background-repeat: no-repeat; color: #FFFFFF; font-size: 11px; @@ -647,16 +647,16 @@ div.event div.station { div.station div { margin: 0; padding: 0; - background: url(bg_box_l.png) top left no-repeat; + background: url(img/bg_box_l.png) top left no-repeat; height: 23px; } div.station div div { - background: url(bg_box_r.png) top right no-repeat; + background: url(img/bg_box_r.png) top right no-repeat; } div.station div div div { - background: url(bg_box_h.png) repeat-x; + background: url(img/bg_box_h.png) repeat-x; line-height: 20px; vertical-align: middle; text-align: left; @@ -688,7 +688,7 @@ div.content { margin: 0; overflow: hidden; - background: white url(bg_tools.png) top left repeat-y; + background: white url(img/bg_tools.png) top left repeat-y; border-left: 1px solid #000000; border-right: 1px solid #000000; border-bottom: 1px solid #000000; @@ -773,7 +773,7 @@ table.listing { } table.listing tr td { - background: transparent url(bg_line.png) bottom repeat-x; + background: transparent url(img/bg_line.png) bottom repeat-x; border-bottom: 1px solid #C0C1DA; } @@ -824,16 +824,16 @@ table.listing a { div.boxheader { margin: 0px; padding: 0px; - background: url(bg_box_l.png) top left no-repeat; + background: url(img/bg_box_l.png) top left no-repeat; } div.boxheader div { margin: 0px; - background: url(bg_box_r.png) top right no-repeat; + background: url(img/bg_box_r.png) top right no-repeat; } div.boxheader div div { - background: url(bg_box_h.png) repeat-x; + background: url(img/bg_box_h.png) repeat-x; vertical-align: middle; text-align: left; margin-right: 3px; @@ -864,7 +864,7 @@ div.recordings { div.recording_item { overflow: hidden; - background: url(bg_line.png) bottom repeat-x; + background: url(img/bg_line.png) bottom repeat-x; border-bottom: 1px solid #C0C1DA; } @@ -920,7 +920,7 @@ div.recording_item { */ div.screenshot { - background-image: url(tv.jpg); + background-image: url(img/tv.jpg); background-repeat: no-repeat; height: 240px; width: 320px; @@ -973,7 +973,7 @@ table.formular { table.formular tr td { vertical-align: top; vertical-align: middle; - background: url(bg_line.png) bottom repeat-x; + background: url(img/bg_line.png) bottom repeat-x; border-bottom: 1px solid #C0C1DA; } @@ -1045,7 +1045,7 @@ table.login tr td { .info-win div.epg_content { padding: 0px 0px 7px 0px; margin: 0px 0px 0px 0px; - background: transparent url(bg_tools.png) top left repeat-y; + background: transparent url(img/bg_tools.png) top left repeat-y; border: 0px; overflow: hidden; } diff --git a/doc/ChangeLog b/doc/ChangeLog index dc00cd3..bf2062b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2007-09-18 Dieter Hametner + + - Eliminated 'images' directory. The images are now not longer + compiled with ecpp into the executable module of live. With the + content.ecpp part and file cache we have a equally performant + solution to compiled in files. + - Added file cache preload functionality. The file cache is filled + with a list of files defined at compile time on plugin startup + time. + 2007-09-09 Dieter Hametner * tntconfig.cpp: allways give absolute paths to content.ecpp diff --git a/images/Makefile b/images/Makefile deleted file mode 100644 index a5db639..0000000 --- a/images/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -CXX ?= g++ -AR ?= ar -ECPPC ?= ecppc - -CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC - -CXXFLAGS += `tntnet-config --cxxflags` -LDFLAGS += `tntnet-config --libs` - -INCLUDES += -I.. - -### The directory environment: -VDRDIR ?= ../../../.. - -### The object files (add further files here): - -OBJS = logo.o record.o active.o inactive.o button_blue.o \ - file.o folder_closed.o folder_open.o plus.o minus.o \ - transparent.o edit.o del.o play.o close.o \ - bg_header_h.o bg_header_l.o bg_header_r.o bg_box_h.o \ - bg_box_l.o bg_box_r.o movie.o menu_line_bg.o \ - bg_line.o bg_tools.o zap.o favicon.o bg_line_top.o \ - reload.o stop_update.o one_uparrow.o one_downarrow.o \ - tv.o remotecontrol.o search.o record_timer.o \ - button_red.o button_green.o button_new.o help.o \ - logo_login.o button_yellow.o arrow.o arrow_rec.o \ - on_dvd.o pause.o ffw.o rwd.o stop.o imdb.o - -### Default rules: - -.PHONY: all clean - -all: libimages.a - -### Implicit rules: - -%.o: %.cpp - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< - -%.cpp: %.png - $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/png" $< - -%.cpp: %.gif - $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/gif" $< - -%.cpp: %.jpg - $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/jpg" $< - -%.cpp: %.ico - $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "image/x-icon" $< - -### Targets: - -libimages.a: $(OBJS) - $(AR) r $@ $^ - -clean: - @rm -f *~ *.o core* libimages.a $(OBJS:%.o=%.cpp) diff --git a/images/active.png b/images/active.png deleted file mode 100644 index 156a8e0..0000000 Binary files a/images/active.png and /dev/null differ diff --git a/images/arrow.png b/images/arrow.png deleted file mode 100644 index 0c7c14d..0000000 Binary files a/images/arrow.png and /dev/null differ diff --git a/images/arrow_rec.gif b/images/arrow_rec.gif deleted file mode 100644 index 115520e..0000000 Binary files a/images/arrow_rec.gif and /dev/null differ diff --git a/images/bg_box_h.png b/images/bg_box_h.png deleted file mode 100644 index 7889b87..0000000 Binary files a/images/bg_box_h.png and /dev/null differ diff --git a/images/bg_box_l.png b/images/bg_box_l.png deleted file mode 100644 index 82ef026..0000000 Binary files a/images/bg_box_l.png and /dev/null differ diff --git a/images/bg_box_r.png b/images/bg_box_r.png deleted file mode 100644 index 6284c4f..0000000 Binary files a/images/bg_box_r.png and /dev/null differ diff --git a/images/bg_header_h.png b/images/bg_header_h.png deleted file mode 100644 index 5a9f00b..0000000 Binary files a/images/bg_header_h.png and /dev/null differ diff --git a/images/bg_header_l.png b/images/bg_header_l.png deleted file mode 100644 index 2034acc..0000000 Binary files a/images/bg_header_l.png and /dev/null differ diff --git a/images/bg_header_r.png b/images/bg_header_r.png deleted file mode 100644 index 63b8708..0000000 Binary files a/images/bg_header_r.png and /dev/null differ diff --git a/images/bg_line.png b/images/bg_line.png deleted file mode 100644 index 4a5c9c9..0000000 Binary files a/images/bg_line.png and /dev/null differ diff --git a/images/bg_line_top.png b/images/bg_line_top.png deleted file mode 100644 index 49d3975..0000000 Binary files a/images/bg_line_top.png and /dev/null differ diff --git a/images/bg_tools.png b/images/bg_tools.png deleted file mode 100644 index 48c8f64..0000000 Binary files a/images/bg_tools.png and /dev/null differ diff --git a/images/button_blue.png b/images/button_blue.png deleted file mode 100644 index f18eb4e..0000000 Binary files a/images/button_blue.png and /dev/null differ diff --git a/images/button_green.png b/images/button_green.png deleted file mode 100644 index 23b40bd..0000000 Binary files a/images/button_green.png and /dev/null differ diff --git a/images/button_new.png b/images/button_new.png deleted file mode 100644 index 88c27f5..0000000 Binary files a/images/button_new.png and /dev/null differ diff --git a/images/button_red.png b/images/button_red.png deleted file mode 100644 index 5492ec7..0000000 Binary files a/images/button_red.png and /dev/null differ diff --git a/images/button_yellow.png b/images/button_yellow.png deleted file mode 100644 index 02c00cf..0000000 Binary files a/images/button_yellow.png and /dev/null differ diff --git a/images/close.png b/images/close.png deleted file mode 100644 index caeadcb..0000000 Binary files a/images/close.png and /dev/null differ diff --git a/images/del.png b/images/del.png deleted file mode 100644 index 88a48fd..0000000 Binary files a/images/del.png and /dev/null differ diff --git a/images/edit.png b/images/edit.png deleted file mode 100644 index f5a3308..0000000 Binary files a/images/edit.png and /dev/null differ diff --git a/images/favicon.ico b/images/favicon.ico deleted file mode 100644 index a4fd15d..0000000 Binary files a/images/favicon.ico and /dev/null differ diff --git a/images/ffw.png b/images/ffw.png deleted file mode 100644 index aeec194..0000000 Binary files a/images/ffw.png and /dev/null differ diff --git a/images/file.png b/images/file.png deleted file mode 100644 index 340102c..0000000 Binary files a/images/file.png and /dev/null differ diff --git a/images/folder_closed.png b/images/folder_closed.png deleted file mode 100644 index 18428be..0000000 Binary files a/images/folder_closed.png and /dev/null differ diff --git a/images/folder_open.png b/images/folder_open.png deleted file mode 100644 index 027d91e..0000000 Binary files a/images/folder_open.png and /dev/null differ diff --git a/images/help.png b/images/help.png deleted file mode 100644 index 861f009..0000000 Binary files a/images/help.png and /dev/null differ diff --git a/images/imdb.png b/images/imdb.png deleted file mode 100644 index 6983d44..0000000 Binary files a/images/imdb.png and /dev/null differ diff --git a/images/inactive.png b/images/inactive.png deleted file mode 100644 index b14096d..0000000 Binary files a/images/inactive.png and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 0aa62d5..0000000 Binary files a/images/logo.png and /dev/null differ diff --git a/images/logo_login.png b/images/logo_login.png deleted file mode 100644 index 59161c3..0000000 Binary files a/images/logo_login.png and /dev/null differ diff --git a/images/menu_line_bg.png b/images/menu_line_bg.png deleted file mode 100644 index 8b8f603..0000000 Binary files a/images/menu_line_bg.png and /dev/null differ diff --git a/images/minus.png b/images/minus.png deleted file mode 100644 index 05fb45e..0000000 Binary files a/images/minus.png and /dev/null differ diff --git a/images/movie.png b/images/movie.png deleted file mode 100644 index 5465ab6..0000000 Binary files a/images/movie.png and /dev/null differ diff --git a/images/on_dvd.png b/images/on_dvd.png deleted file mode 100644 index 13c1168..0000000 Binary files a/images/on_dvd.png and /dev/null differ diff --git a/images/one_downarrow.png b/images/one_downarrow.png deleted file mode 100644 index a4f8e50..0000000 Binary files a/images/one_downarrow.png and /dev/null differ diff --git a/images/one_uparrow.png b/images/one_uparrow.png deleted file mode 100644 index dfad497..0000000 Binary files a/images/one_uparrow.png and /dev/null differ diff --git a/images/pause.png b/images/pause.png deleted file mode 100644 index 1b44908..0000000 Binary files a/images/pause.png and /dev/null differ diff --git a/images/play.png b/images/play.png deleted file mode 100644 index b1c46f9..0000000 Binary files a/images/play.png and /dev/null differ diff --git a/images/plus.png b/images/plus.png deleted file mode 100644 index 7613c9c..0000000 Binary files a/images/plus.png and /dev/null differ diff --git a/images/record.png b/images/record.png deleted file mode 100644 index fc8e383..0000000 Binary files a/images/record.png and /dev/null differ diff --git a/images/record_timer.png b/images/record_timer.png deleted file mode 100644 index 0fe4846..0000000 Binary files a/images/record_timer.png and /dev/null differ diff --git a/images/reload.png b/images/reload.png deleted file mode 100644 index 694efb6..0000000 Binary files a/images/reload.png and /dev/null differ diff --git a/images/remotecontrol.jpg b/images/remotecontrol.jpg deleted file mode 100644 index a9e1c2d..0000000 Binary files a/images/remotecontrol.jpg and /dev/null differ diff --git a/images/rwd.png b/images/rwd.png deleted file mode 100644 index 54ec330..0000000 Binary files a/images/rwd.png and /dev/null differ diff --git a/images/search.png b/images/search.png deleted file mode 100644 index 30852da..0000000 Binary files a/images/search.png and /dev/null differ diff --git a/images/stop.png b/images/stop.png deleted file mode 100644 index bb79efb..0000000 Binary files a/images/stop.png and /dev/null differ diff --git a/images/stop_update.png b/images/stop_update.png deleted file mode 100644 index 4ffdef7..0000000 Binary files a/images/stop_update.png and /dev/null differ diff --git a/images/transparent.png b/images/transparent.png deleted file mode 100644 index 37c28e7..0000000 Binary files a/images/transparent.png and /dev/null differ diff --git a/images/tv.jpg b/images/tv.jpg deleted file mode 100644 index 34aee1c..0000000 Binary files a/images/tv.jpg and /dev/null differ diff --git a/images/zap.png b/images/zap.png deleted file mode 100644 index e332d2c..0000000 Binary files a/images/zap.png and /dev/null differ diff --git a/javascript/treeview.js b/javascript/treeview.js index 3f6fea9..e9edbdd 100644 --- a/javascript/treeview.js +++ b/javascript/treeview.js @@ -70,14 +70,14 @@ function Toggle(node) if (sibling.style.display == 'none') { if (imgChild != null) - setImages(imgChild, "minus.png", "folder_open.png"); + setImages(imgChild, "img/minus.png", "img/folder_open.png"); sibling.style.display = 'block'; } // Collapse the branch if it IS visible else { if (imgChild != null) - setImages(imgChild, "plus.png", "folder_closed.png"); + setImages(imgChild, "img/plus.png", "img/folder_closed.png"); sibling.style.display = 'none'; } } diff --git a/live.cpp b/live.cpp index 5ac6cf7..f18949c 100644 --- a/live.cpp +++ b/live.cpp @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: live.cpp,v 1.16 2007/08/19 19:48:54 tadi Exp $ + * $Id: live.cpp,v 1.17 2007/09/17 22:23:40 tadi Exp $ */ #include @@ -14,6 +14,7 @@ #include "tasks.h" #include "thread.h" #include "timers.h" +#include "preload.h" namespace vdrlive { @@ -47,6 +48,10 @@ bool Plugin::Start(void) #endif // force status monitor startup LiveStatusMonitor(); + + // preload files into file Cache + PreLoadFileCache(m_configDirectory); + // XXX error handling m_thread.reset( new ServerThread ); m_thread->Start(); diff --git a/live/img/active.png b/live/img/active.png new file mode 100644 index 0000000..156a8e0 Binary files /dev/null and b/live/img/active.png differ diff --git a/live/img/arrow.png b/live/img/arrow.png new file mode 100644 index 0000000..0c7c14d Binary files /dev/null and b/live/img/arrow.png differ diff --git a/live/img/arrow_rec.gif b/live/img/arrow_rec.gif new file mode 100644 index 0000000..115520e Binary files /dev/null and b/live/img/arrow_rec.gif differ diff --git a/live/img/bg_box_h.png b/live/img/bg_box_h.png new file mode 100644 index 0000000..7889b87 Binary files /dev/null and b/live/img/bg_box_h.png differ diff --git a/live/img/bg_box_l.png b/live/img/bg_box_l.png new file mode 100644 index 0000000..82ef026 Binary files /dev/null and b/live/img/bg_box_l.png differ diff --git a/live/img/bg_box_r.png b/live/img/bg_box_r.png new file mode 100644 index 0000000..6284c4f Binary files /dev/null and b/live/img/bg_box_r.png differ diff --git a/live/img/bg_header_h.png b/live/img/bg_header_h.png new file mode 100644 index 0000000..5a9f00b Binary files /dev/null and b/live/img/bg_header_h.png differ diff --git a/live/img/bg_header_l.png b/live/img/bg_header_l.png new file mode 100644 index 0000000..2034acc Binary files /dev/null and b/live/img/bg_header_l.png differ diff --git a/live/img/bg_header_r.png b/live/img/bg_header_r.png new file mode 100644 index 0000000..63b8708 Binary files /dev/null and b/live/img/bg_header_r.png differ diff --git a/live/img/bg_line.png b/live/img/bg_line.png new file mode 100644 index 0000000..4a5c9c9 Binary files /dev/null and b/live/img/bg_line.png differ diff --git a/live/img/bg_line_top.png b/live/img/bg_line_top.png new file mode 100644 index 0000000..49d3975 Binary files /dev/null and b/live/img/bg_line_top.png differ diff --git a/live/img/bg_tools.png b/live/img/bg_tools.png new file mode 100644 index 0000000..48c8f64 Binary files /dev/null and b/live/img/bg_tools.png differ diff --git a/live/img/button_blue.png b/live/img/button_blue.png new file mode 100644 index 0000000..f18eb4e Binary files /dev/null and b/live/img/button_blue.png differ diff --git a/live/img/button_green.png b/live/img/button_green.png new file mode 100644 index 0000000..23b40bd Binary files /dev/null and b/live/img/button_green.png differ diff --git a/live/img/button_new.png b/live/img/button_new.png new file mode 100644 index 0000000..88c27f5 Binary files /dev/null and b/live/img/button_new.png differ diff --git a/live/img/button_red.png b/live/img/button_red.png new file mode 100644 index 0000000..5492ec7 Binary files /dev/null and b/live/img/button_red.png differ diff --git a/live/img/button_yellow.png b/live/img/button_yellow.png new file mode 100644 index 0000000..02c00cf Binary files /dev/null and b/live/img/button_yellow.png differ diff --git a/live/img/close.png b/live/img/close.png new file mode 100644 index 0000000..caeadcb Binary files /dev/null and b/live/img/close.png differ diff --git a/live/img/del.png b/live/img/del.png new file mode 100644 index 0000000..88a48fd Binary files /dev/null and b/live/img/del.png differ diff --git a/live/img/edit.png b/live/img/edit.png new file mode 100644 index 0000000..f5a3308 Binary files /dev/null and b/live/img/edit.png differ diff --git a/live/img/favicon.ico b/live/img/favicon.ico new file mode 100644 index 0000000..a4fd15d Binary files /dev/null and b/live/img/favicon.ico differ diff --git a/live/img/ffw.png b/live/img/ffw.png new file mode 100644 index 0000000..aeec194 Binary files /dev/null and b/live/img/ffw.png differ diff --git a/live/img/file.png b/live/img/file.png new file mode 100644 index 0000000..340102c Binary files /dev/null and b/live/img/file.png differ diff --git a/live/img/folder_closed.png b/live/img/folder_closed.png new file mode 100644 index 0000000..18428be Binary files /dev/null and b/live/img/folder_closed.png differ diff --git a/live/img/folder_open.png b/live/img/folder_open.png new file mode 100644 index 0000000..027d91e Binary files /dev/null and b/live/img/folder_open.png differ diff --git a/live/img/help.png b/live/img/help.png new file mode 100644 index 0000000..861f009 Binary files /dev/null and b/live/img/help.png differ diff --git a/live/img/imdb.png b/live/img/imdb.png new file mode 100644 index 0000000..6983d44 Binary files /dev/null and b/live/img/imdb.png differ diff --git a/live/img/inactive.png b/live/img/inactive.png new file mode 100644 index 0000000..b14096d Binary files /dev/null and b/live/img/inactive.png differ diff --git a/live/img/logo.png b/live/img/logo.png new file mode 100644 index 0000000..0aa62d5 Binary files /dev/null and b/live/img/logo.png differ diff --git a/live/img/logo_login.png b/live/img/logo_login.png new file mode 100644 index 0000000..59161c3 Binary files /dev/null and b/live/img/logo_login.png differ diff --git a/live/img/menu_line_bg.png b/live/img/menu_line_bg.png new file mode 100644 index 0000000..8b8f603 Binary files /dev/null and b/live/img/menu_line_bg.png differ diff --git a/live/img/minus.png b/live/img/minus.png new file mode 100644 index 0000000..05fb45e Binary files /dev/null and b/live/img/minus.png differ diff --git a/live/img/movie.png b/live/img/movie.png new file mode 100644 index 0000000..5465ab6 Binary files /dev/null and b/live/img/movie.png differ diff --git a/live/img/on_dvd.png b/live/img/on_dvd.png new file mode 100644 index 0000000..13c1168 Binary files /dev/null and b/live/img/on_dvd.png differ diff --git a/live/img/one_downarrow.png b/live/img/one_downarrow.png new file mode 100644 index 0000000..a4f8e50 Binary files /dev/null and b/live/img/one_downarrow.png differ diff --git a/live/img/one_uparrow.png b/live/img/one_uparrow.png new file mode 100644 index 0000000..dfad497 Binary files /dev/null and b/live/img/one_uparrow.png differ diff --git a/live/img/pause.png b/live/img/pause.png new file mode 100644 index 0000000..1b44908 Binary files /dev/null and b/live/img/pause.png differ diff --git a/live/img/play.png b/live/img/play.png new file mode 100644 index 0000000..b1c46f9 Binary files /dev/null and b/live/img/play.png differ diff --git a/live/img/plus.png b/live/img/plus.png new file mode 100644 index 0000000..7613c9c Binary files /dev/null and b/live/img/plus.png differ diff --git a/live/img/record.png b/live/img/record.png new file mode 100644 index 0000000..fc8e383 Binary files /dev/null and b/live/img/record.png differ diff --git a/live/img/record_timer.png b/live/img/record_timer.png new file mode 100644 index 0000000..0fe4846 Binary files /dev/null and b/live/img/record_timer.png differ diff --git a/live/img/reload.png b/live/img/reload.png new file mode 100644 index 0000000..694efb6 Binary files /dev/null and b/live/img/reload.png differ diff --git a/live/img/remotecontrol.jpg b/live/img/remotecontrol.jpg new file mode 100644 index 0000000..a9e1c2d Binary files /dev/null and b/live/img/remotecontrol.jpg differ diff --git a/live/img/rwd.png b/live/img/rwd.png new file mode 100644 index 0000000..54ec330 Binary files /dev/null and b/live/img/rwd.png differ diff --git a/live/img/search.png b/live/img/search.png new file mode 100644 index 0000000..30852da Binary files /dev/null and b/live/img/search.png differ diff --git a/live/img/stop.png b/live/img/stop.png new file mode 100644 index 0000000..bb79efb Binary files /dev/null and b/live/img/stop.png differ diff --git a/live/img/stop_update.png b/live/img/stop_update.png new file mode 100644 index 0000000..4ffdef7 Binary files /dev/null and b/live/img/stop_update.png differ diff --git a/live/img/transparent.png b/live/img/transparent.png new file mode 100644 index 0000000..37c28e7 Binary files /dev/null and b/live/img/transparent.png differ diff --git a/live/img/tv.jpg b/live/img/tv.jpg new file mode 100644 index 0000000..34aee1c Binary files /dev/null and b/live/img/tv.jpg differ diff --git a/live/img/zap.png b/live/img/zap.png new file mode 100644 index 0000000..e332d2c Binary files /dev/null and b/live/img/zap.png differ diff --git a/live/js/live/pageenhance.js b/live/js/live/pageenhance.js index d469a8b..0cbf2ff 100644 --- a/live/js/live/pageenhance.js +++ b/live/js/live/pageenhance.js @@ -14,11 +14,12 @@ var PageEnhance = new Class({ actionLinkSelector: 'a[href^="vdr_request/"]', hintTipSelector: '*[title]', hintClassName: 'hint', - notifyIdPrefix: 'notify', - infoWinStrings: { + infoWinOptions: { + bodyselect: 'div.epg_content', loadingMsg: 'loading', errorMsg: 'an error occured!' }, + notifyIdPrefix: 'notify', notifyStrings: { successMsg: ' Success!', errorMsg: ' failed!' @@ -68,12 +69,9 @@ var PageEnhance = new Class({ epgid = found[1]; el.addEvent('click', function(event){ var event = new Event(event); - new InfoWin.Ajax(epgid, href, { - bodyselect: 'div.epg_content', - onDomExtend: this.domExtend.bind(this), - loadingMsg: this.options.infoWinStrings.loadingMsg, - errorMsg: this.options.infoWinStrings.errorMsg - }).show(event); + new InfoWin.Ajax(epgid, href, $merge(this.options.infoWinOptions, { + onDomExtend: this.domExtend.bind(this) + })).show(event); event.stop(); return false; }.bind(this)); diff --git a/live/js/live/vdr_status.js b/live/js/live/vdr_status.js index c24ed72..13e4a0d 100644 --- a/live/js/live/vdr_status.js +++ b/live/js/live/vdr_status.js @@ -68,7 +68,7 @@ var LiveVdrInfo = Ajax.extend({ var img = $('statusReloadBtn'); if (img != null) { // change image according to state. - img.src = this.reload ? 'stop_update.png' : 'reload.png'; + img.src = this.reload ? 'img/stop_update.png' : 'img/reload.png'; } } if (this.reload) diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 8371ba3..3d6b866 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -152,7 +152,8 @@ int update_status(1);