From 9e8f933e1edf26506e0c7a0bd4765da53d0fe948 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Oct 2009 06:18:21 +0200 Subject: [PATCH] enna: - update to enna-20091012 - varous cleanups - change enna.conf a little bit --- packages/mediacenter/enna/build | 4 +- packages/mediacenter/enna/config/enna.cfg | 89 ++++++++++++++++----- packages/mediacenter/enna/install | 9 +-- packages/mediacenter/enna/url | 2 +- packages/mediacenter/enna/xinitrc.d/99_enna | 18 ++--- 5 files changed, 86 insertions(+), 36 deletions(-) mode change 100644 => 100755 packages/mediacenter/enna/xinitrc.d/99_enna diff --git a/packages/mediacenter/enna/build b/packages/mediacenter/enna/build index e499902734..75f575d7e8 100755 --- a/packages/mediacenter/enna/build +++ b/packages/mediacenter/enna/build @@ -21,7 +21,7 @@ $SCRIPTS/build libvalhalla $SCRIPTS/build libexif $SCRIPTS/build libXrandr $SCRIPTS/build libcddb -# $SCRIPTS/build lirc +$SCRIPTS/build lirc $SCRIPTS/build gettext cd $PKG_BUILD @@ -36,7 +36,6 @@ LIBS="-lintl" \ --enable-shared \ --disable-theme \ --enable-activity-games \ - --enable-activity-infos \ --enable-activity-music \ --enable-activity-photo \ --enable-activity-tv \ @@ -55,7 +54,6 @@ LIBS="-lintl" \ --disable-volume-mtab \ --enable-libcddb \ --enable-libcurl \ - --enable-libexif \ --enable-libxml2 \ --enable-libxrandr \ diff --git a/packages/mediacenter/enna/config/enna.cfg b/packages/mediacenter/enna/config/enna.cfg index 454d6126c7..c9321d78fb 100644 --- a/packages/mediacenter/enna/config/enna.cfg +++ b/packages/mediacenter/enna/config/enna.cfg @@ -1,32 +1,65 @@ [enna] +#none,event,info,warning,error,critical verbosity=info -fullscreen=1 -use_covers=1 -use_snapshots=1 -theme=default -engine=opengl_x11 -backend=libplayer log_file=/var/log/enna.log +#0,1 +fullscreen=1 + +idle_timeout=0 + +#/home/user/theme.edj for specific file or just 'default' if theme is +#located at /usr/share/enna/theme/default.edj +theme=default + +#software_x11,xrender_x11,opengl_x11,software_x11_16 +engine=opengl_x11 + music_ext=3gp,aac,ape,apl,flac,m4a,mac,mka,mp2,mp3,mp4,mpc,ogg,ra,wav,wma -video_ext=asf,avi,divx,dvr-ms,flv,m1v,m2v,m4p,m4v,mkv,mov,mp4,mp4v,mpe,mpeg,mpg,ogm,qt,rm,rmvb,swf,ts,vdr,vob,vro,wmv,y4m +video_ext=asf,avi,divx,dvr-ms,evo,flc,fli,flv,m1v,m2v,m4p,m4v,mkv,mov,mp4,mp4v,mpe,mpeg,mpg,ogm,qt,rm,rmvb,swf,ts,vdr,vob,vro,wmv,y4m photo_ext=jpg,jpeg,png,gif,tif,tiff,xpm -[libplayer] -type=xine +[mediaplayer] +# Values by default are 'mplayer' type, 'auto' video_out, 'auto' audio_out +# and 'warning' verbosity. Change these parameters only if that is really +# necessary. + +#mplayer,xine +type=mplayer #dvd_type= #tv_type= + +#auto,vdpau,x11,xv,gl,fb video_out=auto -audio_out=auto + +#auto,alsa,oss +audio_out=alsa + +#verbose,info,warning,error,critical,none verbosity=info -# Metadata module (video) -blacklist_keywords=0tv,1080p,2hd,720p,ac3,booya,caph,crimson,ctu,dimension,divx,dot,dsr,dvdrip,dvdscr,e7,etach,fov,fqm,hdq,hdtv,lol,mainevent,notv,pdtv,proper,pushercrew,repack,reseed,screencam,screener,sys,vtv,x264,xor,xvid +#auto,top,middle,bottom +sub_align=auto + +#auto (value set to 100 for bottom),M..N where M and N are integer +sub_pos=auto + +#auto (value set to 5) ,M..N where M and N are integer +sub_scale=auto + +#auto,yes,no +sub_visibility=auto + +#no,soft,hard +framedrop=no [localfiles] path_music=file:///storage/Musik,Music,icon/favorite -path_video=file:///storage/Videos,Movies,icon/favorite +#path_music=file:///path/to/server/Medias/Music,Server,icon/dev/nfs +path_video=file:///storage/Videos,Videos,icon/favorite +#path_video=file:///path/to/server/Medias/Videos,Server,icon/dev/nfs path_photo=file:///storage/Bilder,Photos,icon/favorite +#path_photo=file:///path/to/server/Medias/Photos,Server,icon/dev/nfs [netstreams] stream_video=http://mafreebox.freebox.fr/freeboxtv/playlist.m3u,FreeboxTV,icon/freeboxtv @@ -37,18 +70,38 @@ stream_video=http://mafreebox.freebox.fr/freeboxtv/playlist.m3u,FreeboxTV,icon/f # Remote VDR: 'netvdr://192.168.1.1:18701 #vdr_uri= -[weather] -city=Paris -lang=en +# Default: 2001 +#svdrp_port= -[valhalla] -path=file:///storage +# Default: 30 +#svdrp_timeout= + +#verbose,info,warning,error,critical,none +#svdrp_verbosity=info + +# Don't exit if a timer will fire before this value (in minutes) +# Default: 15 +#timer_quit_threshold= + +[weather] +city=New York + +[media_db] +path=file:///storage/Musik +# path=file:///path/to/server/Medias/Music verbosity=info parser_number=2 commit_interval=128 +# <=0 for infinite scan_loop=-1 +# time [sec] for sleeping between loops scan_sleep=900 +# 0: normal, -20: higher, 19 lower scan_priority=19 +# blacklisted keywords +blacklist_keywords=0tv,1080p,2hd,720p,ac3,booya,caph,crimson,ctu,dimension,divx,dot,dsr,dvdrip,dvdscr,e7,etach,fov,fqm,hdq,hdtv,lol,mainevent,notv,pdtv,proper,pushercrew,repack,reseed,screencam,screener,sys,vtv,x264,xor,xvid + [podcast] #stream=stream url +stream=http://example.com/podcast.xml diff --git a/packages/mediacenter/enna/install b/packages/mediacenter/enna/install index 71d6f53814..8a4920b1ed 100755 --- a/packages/mediacenter/enna/install +++ b/packages/mediacenter/enna/install @@ -15,15 +15,15 @@ $SCRIPTS/install elementary $SCRIPTS/install libxml2 $SCRIPTS/install libplayer $SCRIPTS/install libvalhalla +$SCRIPTS/install libsvdrp $SCRIPTS/install libexif $SCRIPTS/install libXrandr $SCRIPTS/install libcddb $SCRIPTS/install enna-theme $SCRIPTS/install liberation-fonts - -[ "$LIRC" = yes ] && $SCRIPTS/install lirc -[ "$GAMES" = yes ] && $SCRIPTS/install efreet -[ "$VDR" = yes ] && $SCRIPTS/install libsvdrp +$SCRIPTS/install lirc +$SCRIPTS/install vdr +$SCRIPTS/install efreet PKG_DIR=`find $PACKAGES -type d -name $1` @@ -48,4 +48,3 @@ done mkdir -p $INSTALL/usr/etc cp $PKG_DIR/config/enna.cfg $INSTALL/usr/etc -$SCRIPTS/install vdr diff --git a/packages/mediacenter/enna/url b/packages/mediacenter/enna/url index 6e88014be9..c7dcea5e36 100644 --- a/packages/mediacenter/enna/url +++ b/packages/mediacenter/enna/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/enna-20091010.tar.bz2 +http://sources.openelec.tv/svn/enna-20091012.tar.bz2 diff --git a/packages/mediacenter/enna/xinitrc.d/99_enna b/packages/mediacenter/enna/xinitrc.d/99_enna old mode 100644 new mode 100755 index b849a9d7aa..16f0395892 --- a/packages/mediacenter/enna/xinitrc.d/99_enna +++ b/packages/mediacenter/enna/xinitrc.d/99_enna @@ -13,13 +13,13 @@ export ELM_ENGINE=gl args="-f -c $ENNA_CONFIG" -while true; do + while true; do DISPLAY=:0.0 /usr/bin/enna ${args} > /dev/null 2>&1 - if [ "$?" = 0 ]; then - if [ -x /usr/bin/vdrshutdown ]; then - /usr/bin/vdrshutdown - killall -q -TERM runvdr - fi - break - fi -done +# if [ "$?" = 0 ]; then +# if [ -x /usr/bin/vdrshutdown ]; then +# /usr/bin/vdrshutdown +# killall -q -TERM runvdr +# fi +# break +# fi + done