summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-02-06 17:36:05 +0100
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-02-10 15:28:53 +0100
commit2f3deede9240f192b540266a923b98425d072f92 (patch)
tree3dadad31ef2f556cf7d275f872f8b831ab1351b6
parentac4f1b6b5e6021c5ef6e9e3033e06215d4ba1274 (diff)
downloaddesktop-skin-2f3deede9240f192b540266a923b98425d072f92.tar.gz
desktop-skin-2f3deede9240f192b540266a923b98425d072f92.tar.bz2
desktop-skin-2f3deede9240f192b540266a923b98425d072f92.zip
Change-Id: If3a63307606c508b5816ea3cbe603c0198d59005 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rwxr-xr-xScript/launch_video.sh3
-rwxr-xr-xScript/launch_video2.sh21
-rw-r--r--Video/Caminandes_1080p.mp4bin0 -> 35103580 bytes
-rw-r--r--applications/tizen/caminandes.desktop5
-rw-r--r--applications/tizen/launcher.conf1
-rw-r--r--backgrounds/tizen/tizen_common_3.0.pngbin0 -> 2417221 bytes
-rw-r--r--backgrounds/tizen/tizen_common_3.0.xcfbin0 -> 5912029 bytes
-rw-r--r--icons/tizen/32x32/caminandes.pngbin0 -> 2902 bytes
-rw-r--r--icons/tizen/caminandes.xcfbin0 -> 41406 bytes
-rw-r--r--packaging/desktop-skin.spec9
10 files changed, 32 insertions, 7 deletions
diff --git a/Script/launch_video.sh b/Script/launch_video.sh
index 5d1ebb5..5b1293b 100755
--- a/Script/launch_video.sh
+++ b/Script/launch_video.sh
@@ -7,9 +7,6 @@
touch $HOME/gstvid-pid
alreadyrunning=`cat $HOME/gstvid-pid`
-#URL=http://intel07.vannes/~sdx/Downloads/Amazing%20Nature%20full%20HD%20720p.mp4
-#URL=http://intel07.vannes/~sdx/Videos/big_buck_bunny_480p_surround-fix.avi
-#URL=http://intel07.vannes/~sdx/Videos/caminandes_480p.avi
URL=file:///usr/share/media/videos/AmazingNature_480p.mp4
if [ $(echo $alreadyrunning | wc -w) -lt 3 ] ; then
diff --git a/Script/launch_video2.sh b/Script/launch_video2.sh
new file mode 100755
index 0000000..017fb0a
--- /dev/null
+++ b/Script/launch_video2.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#
+# Launch web cam
+#
+
+touch $HOME/gstvid-pid
+alreadyrunning=`cat $HOME/gstvid-pid`
+
+URL=file:///usr/share/media/videos/Caminandes_1080p.mp4
+
+if [ $(echo $alreadyrunning | wc -w) -lt 1 ] ; then
+ echo "create new"
+ gst-launch-1.0 playbin uri=$URL &
+ echo $! >> $HOME/gstvid-pid
+else echo "already running"
+ for x in $alreadyrunning; do kill -9 $x; done
+ rm -rf $HOME/gstvid-pid
+fi
+
+
diff --git a/Video/Caminandes_1080p.mp4 b/Video/Caminandes_1080p.mp4
new file mode 100644
index 0000000..7d63f75
--- /dev/null
+++ b/Video/Caminandes_1080p.mp4
Binary files differ
diff --git a/applications/tizen/caminandes.desktop b/applications/tizen/caminandes.desktop
new file mode 100644
index 0000000..1927104
--- /dev/null
+++ b/applications/tizen/caminandes.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Caminandes
+Type=Application
+Exec=/usr/bin/launch_video2.sh
+Icon=/usr/share/icons/tizen/32x32/caminandes.png
diff --git a/applications/tizen/launcher.conf b/applications/tizen/launcher.conf
index 0e185a6..063f66f 100644
--- a/applications/tizen/launcher.conf
+++ b/applications/tizen/launcher.conf
@@ -1,5 +1,6 @@
/usr/share/applications/tizen/weston-terminal.desktop
/usr/share/applications/tizen/webcam.desktop
/usr/share/applications/tizen/video.desktop
+/usr/share/applications/tizen/video2.desktop
/usr/share/applications/tizen/calculator.desktop
/usr/share/applications/tizen/web-browser.desktop
diff --git a/backgrounds/tizen/tizen_common_3.0.png b/backgrounds/tizen/tizen_common_3.0.png
new file mode 100644
index 0000000..25fdf19
--- /dev/null
+++ b/backgrounds/tizen/tizen_common_3.0.png
Binary files differ
diff --git a/backgrounds/tizen/tizen_common_3.0.xcf b/backgrounds/tizen/tizen_common_3.0.xcf
new file mode 100644
index 0000000..3c942ec
--- /dev/null
+++ b/backgrounds/tizen/tizen_common_3.0.xcf
Binary files differ
diff --git a/icons/tizen/32x32/caminandes.png b/icons/tizen/32x32/caminandes.png
new file mode 100644
index 0000000..7dd2ef5
--- /dev/null
+++ b/icons/tizen/32x32/caminandes.png
Binary files differ
diff --git a/icons/tizen/caminandes.xcf b/icons/tizen/caminandes.xcf
new file mode 100644
index 0000000..af99c91
--- /dev/null
+++ b/icons/tizen/caminandes.xcf
Binary files differ
diff --git a/packaging/desktop-skin.spec b/packaging/desktop-skin.spec
index c873b85..d636b77 100644
--- a/packaging/desktop-skin.spec
+++ b/packaging/desktop-skin.spec
@@ -28,11 +28,13 @@ cp %{SOURCE1001} .
mkdir -p %{buildroot}%{_bindir}
install -m 755 Script/launch_cam.sh %{buildroot}%{_bindir}
install -m 755 Script/launch_video.sh %{buildroot}%{_bindir}
+install -m 755 Script/launch_video2.sh %{buildroot}%{_bindir}
install -m 755 Script/mark_image.py %{buildroot}%{_bindir}
install -m 755 Script/wifi %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/media/videos
install -m 644 Video/AmazingNature_480p.mp4 %{buildroot}%{_datadir}/media/videos
+install -m 644 Video/Caminandes_1080p.mp4 %{buildroot}%{_datadir}/media/videos
mkdir -p %{buildroot}%{_datadir}/media/photos
install -m 644 Photos/* %{buildroot}%{_datadir}/media/photos
@@ -44,16 +46,15 @@ mkdir -p %{buildroot}%{_datadir}/applications/tizen
install -m 644 applications/tizen/* %{buildroot}%{_datadir}/applications/tizen
mkdir -p %{buildroot}%{_datadir}/backgrounds/tizen
-install -m 644 backgrounds/tizen/golfe-morbihan.jpg %{buildroot}%{_datadir}/backgrounds/tizen/golfe-morbihan.jpg
-install -m 644 backgrounds/tizen/tizen_common.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common.png
+install -m 644 backgrounds/tizen/tizen_common_3.0.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common_3.0.png
%post
-ln -sf tizen_common.png %{_datadir}/backgrounds/tizen/current
+ln -sf tizen_common_3.0.png %{_datadir}/backgrounds/tizen/current
%files
%manifest %{name}.manifest
%{_bindir}/*
-%{_datadir}/media/videos/AmazingNature_480p.mp4
+%{_datadir}/media/videos/*
%{_datadir}/media/photos/*
%{_datadir}/icons/tizen/32x32/*
%{_datadir}/applications/tizen/*