summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffroy Van Cutsem <geoffroy.vancutsem@intel.com>2012-10-09 06:44:07 +0200
committerGeoffroy Van Cutsem <geoffroy.vancutsem@intel.com>2012-10-09 06:48:07 +0200
commit8b13415adcb7df762a7de9916ddab94573baecc0 (patch)
tree8e2fa3ae20855eff76dae9f1278a905e65459723
parent3aafc8256211ca64d2276ea1862e976b1f082aa5 (diff)
downloadivi-demo-config-8b13415adcb7df762a7de9916ddab94573baecc0.tar.gz
ivi-demo-config-8b13415adcb7df762a7de9916ddab94573baecc0.tar.bz2
ivi-demo-config-8b13415adcb7df762a7de9916ddab94573baecc0.zip
Revert last change because created a regressionsubmit/trunk/20121009.050512accepted/trunk/20121009.044651
Change-Id: I5e89911797ce56c288889bf81e6703b885292bd0
-rw-r--r--packaging/ivi-demo-config.changes4
-rw-r--r--packaging/rundemo.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/packaging/ivi-demo-config.changes b/packaging/ivi-demo-config.changes
index a79df4f..485f99d 100644
--- a/packaging/ivi-demo-config.changes
+++ b/packaging/ivi-demo-config.changes
@@ -1,3 +1,7 @@
+* Tue Oct 09 2012 Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> submit/trunk/20121009.044154@c8f38f7
+- Add function ('Button2') to skip to next video on the list
+- Fix machine-info file (use correct PRETTY_HOSTNAME)
+
-------------------------------------------------------------------
Tue Oct 2 17:32:10 UTC 2012 - tracy.graydon@intel.com
- Touching changes file to test gerrit submission again
diff --git a/packaging/rundemo.sh b/packaging/rundemo.sh
index 723ddc8..cd8c50c 100644
--- a/packaging/rundemo.sh
+++ b/packaging/rundemo.sh
@@ -5,7 +5,7 @@ echo "Button pressed: ${BUTTONVALUE}"
GST_LAUNCH_BIN="/usr/bin/gst-launch-0.10"
-VIDEO_SCRIPT_NAME=$0
+VIDEO_SCRIPT_NAME="/usr/lib/automotive-message-broker/scripts/start_video.sh"
RIGHT_CAMERA_DEV="/dev/video0"
LEFT_CAMERA_DEV="/dev/video1"