summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf <ulf.hofemeier@intel.com>2012-10-02 13:36:35 -0700
committerUlf <ulf.hofemeier@intel.com>2012-10-02 13:36:35 -0700
commit224788fff7997db29bc5a6288351c585b3d81c58 (patch)
treece5c7a231d714daba54fbc96bfe57b09a134b67f
parent6a4d0ac0f8442f44bea05932065ed4885284e235 (diff)
downloadivi-demo-config-224788fff7997db29bc5a6288351c585b3d81c58.tar.gz
ivi-demo-config-224788fff7997db29bc5a6288351c585b3d81c58.tar.bz2
ivi-demo-config-224788fff7997db29bc5a6288351c585b3d81c58.zip
Removed duplicate files and created README.submit/trunk/20121002.203640accepted/trunk/20121002.201333
-rw-r--r--README1
-rw-r--r--configwheeldemo19
-rw-r--r--rundemo.sh76
-rw-r--r--start_video.sh8
-rw-r--r--xorg-dual.conf17
5 files changed, 1 insertions, 120 deletions
diff --git a/README b/README
new file mode 100644
index 0000000..3002071
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+The config files for Tizen IVI demos reside in the packaging directory. Please add files as needed to the packaging directory and list them as additional sources in the spec file.
diff --git a/configwheeldemo b/configwheeldemo
deleted file mode 100644
index d0354e1..0000000
--- a/configwheeldemo
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "sources" : [
- {
- "name" : "WheelSource",
- "path" : "/usr/lib/automotive-message-broker/wheelsourceplugin.so"
- }
- ],
- "sinks": [
- {
- "name" : "WebSocketSink",
- "path" : "/usr/lib/automotive-message-broker/websocketsinkplugin.so"
- } ,
- {
- "path" : "/usr/lib/automotive-message-broker/demosinkplugin.so",
- "script" : "/usr/lib/automotive-message-broker/scripts/rundemo.sh %1"
- }
- ]
-}
-
diff --git a/rundemo.sh b/rundemo.sh
deleted file mode 100644
index 0de2a05..0000000
--- a/rundemo.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-BUTTONVALUE=$1
-echo "Button pressed: ${BUTTONVALUE}"
-
-GST_LAUNCH_BIN="/usr/bin/gst-launch-0.10"
-
-VIDEO_SCRIPT_NAME="/usr/lib/automotive-message-broker/scripts/start_video.sh"
-RIGHT_CAMERA_DEV="/dev/video0"
-LEFT_CAMERA_DEV="/dev/video1"
-
-VIDEO_DISPLAY=":0"
-CAMERA_DISPLAY=":0"
-
-case ${BUTTONVALUE} in
- "Right")
- echo "Starting right-camera view"
- RIGHT_CAMERA_PID=$[ $(pgrep -f $RIGHT_CAMERA_DEV) ]
- if [ $RIGHT_CAMERA_PID = "0" ]; then
- DISPLAY=$CAMERA_DISPLAY $GST_LAUNCH_BIN v4l2src device=$RIGHT_CAMERA_DEV ! 'video/x-raw-yuv,width=1920,height=1080,framerate=5/1' ! xvimagesink
- fi
- ;;
- "Left")
- echo "Starting left-camera view"
- LEFT_CAMERA_PID=$[ $(pgrep -f $LEFT_CAMERA_DEV) ]
- if [ $LEFT_CAMERA_PID = "0" ]; then
- DISPLAY=$CAMERA_DISPLAY $GST_LAUNCH_BIN v4l2src device=$LEFT_CAMERA_DEV ! 'video/x-raw-yuv,width=1920,height=1080,framerate=5/1' ! xvimagesink
- fi
- ;;
- "Off")
-# killall $GST_LAUNCH_BIN
- RIGHT_CAMERA_PID=$[ $(pgrep -f $RIGHT_CAMERA_DEV) ]
- LEFT_CAMERA_PID=$[ $(pgrep -f $LEFT_CAMERA_DEV) ]
- if [ $RIGHT_CAMERA_PID != "0" ]; then
- echo "Stopping right-view camera"
- kill $RIGHT_CAMERA_PID
- elif [ $LEFT_CAMERA_PID != "0" ]; then
- echo "Stopping left-view camera"
- kill $LEFT_CAMERA_PID
- else
- echo "No camera to stop"
- fi
- ;;
-
- "Button1")
- #Run script 1 here
- echo "Button 1 script - initiating NFC BT handover"
- /usr/lib/neard/test/bt-handover
- ;;
- "Button2")
- #Run script 2 here
- echo "Button 2 script!"
- ;;
- "Button3")
- #Run script 3 here
- echo "Button 3 script!"
- ;;
- "Button4")
- #Run script 4 here
- VIDEO_SCRIPT_PID=$[ $(pgrep -f $VIDEO_SCRIPT_NAME) ]
- if [ $VIDEO_SCRIPT_PID = "0" ]; then
- echo "Starting Kids entertainment!"
- DISPLAY=$VIDEO_DISPLAY $VIDEO_SCRIPT_NAME
- else
- echo "Stopping Kids entertainment!"
- while [ $VIDEO_SCRIPT_PID != "0" ]; do
- pkill -P $VIDEO_SCRIPT_PID gst-launch
- VIDEO_SCRIPT_PID=$[ $(pgrep -f $VIDEO_SCRIPT_NAME) ]
- done
- fi
- ;;
- *)
- echo "Button not implemented"
- ;;
-esac
-
diff --git a/start_video.sh b/start_video.sh
deleted file mode 100644
index 9edcb42..0000000
--- a/start_video.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#while true ;
-# do
-# gst-launch-0.10 playbin2 uri=file:///root/videos/The_Magic_of_Flight_720p.mp4 ;
- gst-launch-0.10 filesrc location=/root/videos/The_Magic_of_Flight_720p.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
- gst-launch-0.10 filesrc location=/root/videos/SuperSpeedway_720p.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
-#done
-
diff --git a/xorg-dual.conf b/xorg-dual.conf
deleted file mode 100644
index f60e76a..0000000
--- a/xorg-dual.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-Section "Device"
- Identifier "Intel GenX"
- Driver "intel"
- Option "monitor-HDMI3" "driver-screen"
- Option "monitor-VGA1" "passenger-screen"
-EndSection
-
-Section "Monitor"
- Identifier "driver-screen"
- Option "PreferredMode" "1024x768"
-EndSection
-
-Section "Monitor"
- Identifier "passenger-screen"
- Option "PreferredMode" "1024x768"
- Option "RightOf" "driver-screen"
-EndSection