From 50346e5d4b163f028f6f9a06c0778e7c8ba53259 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 13 Jun 2012 21:09:44 +0000 Subject: [PATCH] strip->squeeze, depend on fixed tool git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1057 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- var/mongoose/cgi-bin/browse/assets.jim | 4 ++-- var/mongoose/cgi-bin/browse/strip/strip.jim | 12 ++++++------ var/mongoose/html/css/jquery.contextMenu.css | 1 + var/mongoose/html/img/context/compress.png | Bin 0 -> 704 bytes 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 var/mongoose/html/img/context/compress.png diff --git a/CONTROL/control b/CONTROL/control index c5ea4e1..d56d619 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.9.11-1 +Version: 0.9.11-2 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.1) +Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.2) Suggests: ffmpeg,webif-iphone Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse/assets.jim b/var/mongoose/cgi-bin/browse/assets.jim index 117974e..9e7eb95 100755 --- a/var/mongoose/cgi-bin/browse/assets.jim +++ b/var/mongoose/cgi-bin/browse/assets.jim @@ -15,9 +15,9 @@ puts { } if {$model eq "HDR"} { puts {
  • Decrypt
    • } - puts {
  • Strip
    • } + puts {
  • Squeeze
    • } } else { - puts {
  • Strip
    • } + puts {
  • Squeeze
    • } } if {[system pkginst ffmpeg]} { puts { diff --git a/var/mongoose/cgi-bin/browse/strip/strip.jim b/var/mongoose/cgi-bin/browse/strip/strip.jim index 30ba123..8f262fe 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.jim +++ b/var/mongoose/cgi-bin/browse/strip/strip.jim @@ -25,10 +25,10 @@ puts "
    -Strip unecessary frames from recording +Make recordings smaller by removing unecessary frames -

    This process will remove freeview EIT packets from the recording.
    -These packets are not required but typically increase the size of the +

    This process will remove freeview EPG data from the recording.
    +These data are not required and can increase the size of the recording file by as much as 20%.
    Your original recording files will be retained in a folder called _original.     @@ -38,7 +38,7 @@ Your original recording files will be retained in a folder called _original. Length:[clock format $len -format %T] Size:[pretty_size [$ts size]] ([$ts get definition]) Time: -Stripping will take around [clock format $esttime -format "%T"] +Squeezing will take around [clock format $esttime -format "%T"] Estimated Saving: Analysing file, please wait... @@ -51,11 +51,11 @@ Your original recording files will be retained in a folder called _original. >

    diff --git a/var/mongoose/html/css/jquery.contextMenu.css b/var/mongoose/html/css/jquery.contextMenu.css index 71be894..1b5abc3 100644 --- a/var/mongoose/html/css/jquery.contextMenu.css +++ b/var/mongoose/html/css/jquery.contextMenu.css @@ -64,5 +64,6 @@ .contextMenu LI.delete A { background-image: url(/img/context/delete.png); } .contextMenu LI.cut A { background-image: url(/img/context/cut.png); } .contextMenu LI.quit A { background-image: url(/img/context/door.png); } +.contextMenu LI.compress A { background-image: url(/img/context/compress.png); } diff --git a/var/mongoose/html/img/context/compress.png b/var/mongoose/html/img/context/compress.png new file mode 100644 index 0000000000000000000000000000000000000000..183511d3ff6201afad5548e353391ea1dd5029de GIT binary patch literal 704 zcmV;x0zdtUP)~?B6dLZY-YXJ9FnfKeoRg{{Q^;5w5vo&YEZNFaQz%zJFr) z^Yjvm)ht2^VA|raI)i@8Z|Ui44?R_okzgq7ocr|O-+zq%p|*hy`1|uS!<+m2Pz(^| z4h7T4ZLTxS+xqb-$OR9cya2mk-nMhVnD_^FG1!3rf4(t@Xn3O-01^Wm{`U_vPK(Wd4{nx+U_qHE)#TJ4fIR#na|64D;hKs4`L(G5v@BuLL z{)2-{2&mvKt~9V``z8!AIa%2qY;5eF;P5`zD9&J1|5B=T&X!qk-oEt4W(dgNGuIw` zdgIO=FdHcJ1DJl^fekp{D8_I=e>X#6fW8or&wW?21Pk}#!sI< z0uvu3zFA<3dY9~e_v+;{P^x4Q;Nt_O_qozy0!dF^eVG30^@}V;1x2vB*Kb}jaB^@} z$%qNG0_7GmF(9QK5MX0tWBB_0JHxAY?~*uqMHpVcdzbm`$It&)Z`^<+;cq|w1I1dQ za`7z4PW|=!H^ZO5f5Gg3fBzgmcKVd%-`~FuO{&R^L{^vAGJQEv&JLu8kpVXl0XYbW me*!UjEC~ZKJIGFe00RIYB^8