|
 |
983249 |
--- orig-1.0.9/wl_player/bltk_wl_player_make_binary.sh 2009-04-10 09:14:20.000000000 +0200
|
|
|
983249 |
+++ curr-1.0.9-1/wl_player/bltk_wl_player_make_binary.sh 2009-07-17 11:03:55.178141070 +0200
|
|
|
983249 |
@@ -108,9 +108,13 @@
|
|
|
983249 |
return 0
|
|
|
983249 |
}
|
|
|
983249 |
|
|
|
983249 |
-{
|
|
|
983249 |
-startup
|
|
|
983249 |
-make_mplayer_bin
|
|
|
983249 |
-cleanup 0
|
|
|
983249 |
-}
|
|
|
983249 |
-
|
|
|
983249 |
+if [[ "$WL_PLAYER_ENABLED" = "YES" && "$WL_PLAYER_EXTERN" = "YES" ]]
|
|
|
983249 |
+then
|
|
|
983249 |
+ {
|
|
|
983249 |
+ startup
|
|
|
983249 |
+ make_mplayer_bin
|
|
|
983249 |
+ cleanup 0
|
|
|
983249 |
+ }
|
|
|
983249 |
+else
|
|
|
983249 |
+ exit 0
|
|
|
983249 |
+fi
|
|
|
983249 |
--- orig-1.0.9/wl_player/bltk_wl_player.sh 2009-04-10 09:14:20.000000000 +0200
|
|
|
983249 |
+++ curr-1.0.9-1/wl_player/bltk_wl_player.sh 2009-07-17 11:03:55.189691473 +0200
|
|
|
983249 |
@@ -38,6 +38,9 @@
|
|
|
983249 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
983249 |
#
|
|
|
983249 |
|
|
|
983249 |
+BLTK_PLAYER_PROG_FLG=
|
|
|
983249 |
+
|
|
|
983249 |
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
|
|
|
983249 |
|
|
|
983249 |
source `dirname $0`/../../bin/bltk_wl_common
|
|
|
983249 |
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
|
|
|
983249 |
@@ -54,27 +57,22 @@
|
|
|
983249 |
wl_check_install player
|
|
|
983249 |
wl_check_error $?
|
|
|
983249 |
|
|
|
983249 |
- if [[ $BLTK_WL_FILE = DEBUG ]]
|
|
|
983249 |
+ if [[ $BLTK_PLAYER_FILE = DEBUG ]]
|
|
|
983249 |
then
|
|
|
983249 |
- BLTK_WL_FILE=
|
|
|
983249 |
+ BLTK_PLAYER_FILE=
|
|
|
983249 |
fi
|
|
|
983249 |
- if [ $PLAY_MD != "dvd://" -a $PLAY_MD != "vcd://" ]
|
|
|
983249 |
+ if [[ -z $BLTK_PLAYER_FILE ]]
|
|
|
983249 |
then
|
|
|
983249 |
- BLTK_WL_FILE=$BLTK_EXTERN_SRC_WL_PLAYER/$PLAY_MD
|
|
|
983249 |
- else
|
|
|
983249 |
- set_dvd_config
|
|
|
983249 |
- BLTK_WL_FILE=$PLAY_MD
|
|
|
983249 |
+ BLTK_PLAYER_FILE="dvd://"
|
|
|
983249 |
fi
|
|
|
983249 |
|
|
|
983249 |
-echo ALEX DEBUG BLTK_WL_FILE is $BLTK_WL_FILE
|
|
|
983249 |
-
|
|
|
983249 |
- if [[ -z $BLTK_WL_PROG ]]
|
|
|
983249 |
- then
|
|
|
983249 |
- BLTK_WL_PROG=$BLTK_EXTERN_TGT_WL_PLAYER/mplayer/bin/mplayer
|
|
|
983249 |
- fi
|
|
|
983249 |
- if [[ -z $BLTK_WL_PROG_FLG ]]
|
|
|
983249 |
+ if [[ -z $BLTK_PLAYER_PROG ]]
|
|
|
983249 |
then
|
|
|
983249 |
- BLTK_WL_PROG_FLG="-fs -quiet"
|
|
|
983249 |
+ BLTK_PLAYER_PROG=$BLTK_EXTERN_TGT_WL_PLAYER/mplayer/bin/mplayer
|
|
|
983249 |
+ if [[ -z $BLTK_PLAYER_PROG_FLG ]]
|
|
|
983249 |
+ then
|
|
|
983249 |
+ BLTK_PLAYER_PROG_FLG="-fs -quiet"
|
|
|
983249 |
+ fi
|
|
|
983249 |
fi
|
|
|
983249 |
|
|
|
983249 |
if [[ -z $BLTK_SHOW_DEMO_NUM ]]
|
|
|
983249 |
@@ -86,13 +84,13 @@
|
|
|
983249 |
export BLTK_SHOW_DEMO_TIME=60
|
|
|
983249 |
fi
|
|
|
983249 |
|
|
|
983249 |
- wl_check_prog $BLTK_WL_PROG
|
|
|
983249 |
+ wl_check_prog $BLTK_PLAYER_PROG
|
|
|
983249 |
wl_check_error $?
|
|
|
983249 |
|
|
|
983249 |
- wl_check_run_prog $BLTK_WL_PROG
|
|
|
983249 |
+ wl_check_run_prog $BLTK_PLAYER_PROG
|
|
|
983249 |
wl_check_error $?
|
|
|
983249 |
|
|
|
983249 |
- wl_check_all_run_prog $BLTK_WL_PROG
|
|
|
983249 |
+ wl_check_all_run_prog $BLTK_PLAYER_PROG
|
|
|
983249 |
wl_check_error $?
|
|
|
983249 |
### env | sort >env.log
|
|
|
983249 |
}
|
|
|
983249 |
@@ -122,14 +120,14 @@
|
|
|
983249 |
{
|
|
|
983249 |
ST_TIME=`$BLTK_TIME_CMD`
|
|
|
983249 |
|
|
|
983249 |
- CMD="$BLTK_WL_PROG $BLTK_WL_PROG_FLG $BLTK_WL_FILE"
|
|
|
983249 |
+ CMD="$BLTK_PLAYER_PROG $BLTK_WL_PROG_FLG $BLTK_PLAYER_FILE"
|
|
|
983249 |
if [[ $BLTK_SHOW_DEMO = TRUE && $BLTK_SHOW_DEMO_TIME != 0 ]]
|
|
|
983249 |
then
|
|
|
983249 |
$CMD &
|
|
|
983249 |
wl_check_error $? "CMD failed"
|
|
|
983249 |
pid=$!
|
|
|
983249 |
sleep $BLTK_SHOW_DEMO_TIME
|
|
|
983249 |
- prog=`basename $BLTK_WL_PROG`
|
|
|
983249 |
+ prog=`basename $BLTK_PLAYER_PROG`
|
|
|
983249 |
pgrep $prog
|
|
|
983249 |
wl_check_error $? "$prog is not running"
|
|
|
983249 |
/bin/kill -QUIT $pid >/dev/null 2>&1
|
|
|
983249 |
@@ -180,7 +178,12 @@
|
|
|
983249 |
exit $1
|
|
|
983249 |
}
|
|
|
983249 |
|
|
|
983249 |
-startup
|
|
|
983249 |
-run
|
|
|
983249 |
-cleanup 0
|
|
|
983249 |
+if [ "$WL_PLAYER_ENABLED" = "YES" ]
|
|
|
983249 |
+then
|
|
|
983249 |
+ startup
|
|
|
983249 |
+ run
|
|
|
983249 |
+ cleanup 0
|
|
|
983249 |
+else
|
|
|
983249 |
+ exit 0
|
|
|
983249 |
+fi
|
|
|
983249 |
|