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