# HG changeset patch # User bastiena # Date 1343900836 -7200 # Node ID a7bcf5ad4d25da6ff926c3a381235b6f25fea122 # Parent a1476fa4c75bb2673991e673ce0ce63b58610f2c Front IDILL: path changed for online_videos.json diff -r a1476fa4c75b -r a7bcf5ad4d25 .hgignore.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore.orig Thu Aug 02 11:47:16 2012 +0200 @@ -0,0 +1,97 @@ +syntax: regexp +middleware/Communication/(bin|obj) +middleware/Debug/(bin|obj) +middleware/Tracking/(bin|obj) +syntax: glob +*.suo +middleware/lib/TuioServer.dll +front_processing/src/Trakers_gestures/code/* +front_processing/src/Trakers/code/* +front_processing/extern/TUIO_PROCESSING/library/* +front_processing/extern/TUIO_JAVA/TuioDemo.jar +front_processing/extern/TUIO_JAVA/libTUIO.jar +front_processing/src/Trakers/application.windows/lib/* +front_processing/src/Trakers_gestures/application.windows/lib/* +middleware/dist/Output/* +front_processing/src/Trakers_gestures/application.windows/Trakers_gestures.exe +front_processing/src/Trakers/application.windows/Trakers.exe +front_processing/src/Fluid_manipulation/code/* +front_processing/src/Interaction_examples/Hand_press/code/* +front_processing/src/Interaction_examples/Hand_signal/code/* +front_processing/src/Interaction_examples/Hands_1D/code/* +front_processing/src/Interaction_examples/Hands_2D/code/* +front_processing/src/Smoke_manipulation/code/* +front_processing/src/*/application.windows/lib/* +front_processing/src/*/application.windows/* +front_processing/src/Interaction_examples/*/application.windows/lib/* +front_processing/src/Interaction_examples/*/application.windows/* +middleware/dist/dotNetFx40_Client_x86_x64.exe +middleware/lib/Tracking.dll +middleware/lib/Debug.dll +middleware/lib/Communication.dll +middleware/extern/TuioServer/Tuio.Test/bin/Debug/Bespoke.Common.dll +middleware/src/bin/Release/*.dll +middleware/src/bin/Release/*.pdb +middleware/src/obj/x86/* +middleware/src/bin/Release/Trakers.vshost.exe.manifest +middleware/src/bin/Release/Trakers.vshost.exe.Config +middleware/src/bin/Release/Properties/Resources.resx +middleware/src/bin/Release/Properties/Resources.Designer.cs +middleware/src/bin/Release/MainModule.vshost.exe.manifest +middleware/src/bin/Release/MainModule.vshost.exe +middleware/src/bin/Release/MainModule.exe +front_idill/extern/fajran-npTuioClient/npTuioClient.sln.old +front_idill/extern/fajran-npTuioClient/npTuioClient.vcxproj.user +front_idill/extern/fajran-npTuioClient/UpgradeLog.XML +front_idill/extern/fajran-npTuioClient/Debug/ +front_idill/extern/fajran-npTuioClient/ipch/ +front_idill/extern/fajran-npTuioClient/Release/ +front_idill/extern/fajran-npTuioClient/npTuioClient.sdf +front_idill/extern/TestClient/obj/ +front_idill/extern/fajran-npTuioClient/TestClient/Release/ +front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj.user +front_idill/extern/fajran-npTuioClient/TestClient/TestClient.vcxproj.filters +front_idill/src/snapshots-little/ +front_idill/src/snapshots/ +front_idill/src/player/markers/wheel.png +front_idill/src/player/markers/wave.png +front_idill/src/player/markers/updown.png +front_idill/src/player/markers/swipe-down.png +front_idill/src/player/markers/slow.png +front_idill/src/player/markers/run.png +front_idill/src/player/markers/right-angle.png +front_idill/src/player/markers/pendulum.png +front_idill/src/player/markers/knee-up.png +front_idill/src/player/markers/jump.png +front_idill/src/player/markers/join-hands.png +front_idill/src/player/markers/hello.png +front_idill/src/player/markers/cross.png +front_idill/src/player/markers/circle.png +front_idill/src/player/markers/bend.png +front_idill/src/player/markers/beat.png +front_idill/src/player/markers/arc.png +front_idill/src/player/TODO player 11-05-12.txt +front_idill/src/player/TODO player 02-05-12.txt +middleware.zip +middleware/dist/wampserver2.2e.exe +front_idill/src/communication/js/client.js.bak +front_idill/src/mosaic/js/mosaic.js.bak +front_idill/src/player/videos/*.mp4 +middleware/src/bin/Release/Front Processing.lnk +middleware/src/bin/Release/Front JS.lnk +middleware/src/bin/Release/ErrorFile.txt +middleware/src/bin/Documentation - Front IDILL.html +middleware/src/bin/*.txt +middleware/src/bin/*.html +front_idill/src/img/(6a) - Copy (2).png +front_idill/src/img/(6a).png +front_idill/src/img/background.bak.png +front_idill/src/mosaic/js/pointers - Copy.js +front_idill/src/pictos/help/img bak/* +front_idill/src/config_kinect.json +front_idill/src/config_souris.json +syntax: regexp +middleware/extern/.*/(bin|obj) +middleware/src/bin/Debug/* +middleware/src/bin/Release/*.dll +front_idill/extern/fajran-npTuioClient/_UpgradeReport_Files/* diff -r a1476fa4c75b -r a7bcf5ad4d25 front_idill/src/player/json/online_videos.json --- a/front_idill/src/player/json/online_videos.json Thu Aug 02 11:01:41 2012 +0200 +++ b/front_idill/src/player/json/online_videos.json Thu Aug 02 11:47:16 2012 +0200 @@ -2,7 +2,7 @@ "videos" : [ { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/ba4d888c-66b7-11e1-91ba-00145ea4a2be?callback=?", - "snapshot": "50 shots.png", + "snapshot": "50 shots.jpg", "gestures": [ { "gesture_name": "bend", @@ -16,7 +16,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/076230fe-66b9-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "deep end dance.png", + "snapshot": "deep end dance.jpg", "gestures": [ { "gesture_name": "circle", @@ -42,7 +42,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/f80bd9fe-66b6-11e1-91ba-00145ea4a2be?callback=?", - "snapshot": "encontro cotidianos.png", + "snapshot": "encontro cotidianos.jpg", "gestures": [ { "gesture_name": "contact", @@ -64,7 +64,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/f1cee904-66b7-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "fenella.png", + "snapshot": "fenella.jpg", "gestures": [ { "gesture_name": "knee-up", @@ -78,7 +78,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/98517ca6-66b8-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "i am my mother.png", + "snapshot": "i am my mother.jpg", "gestures": [ { "gesture_name": "", @@ -88,7 +88,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/d610e47e-66b7-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "instrument.png", + "snapshot": "instrument.jpg", "gestures": [ { "gesture_name": "", @@ -98,7 +98,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/e2b5b9e8-562c-11e1-b3c3-00145ea49a02?callback=?", - "snapshot": "joudance 2 in asakusa_stage1.png", + "snapshot": "joudance 2 in asakusa_stage1.jpg", "gestures": [ { "gesture_name": "", @@ -108,7 +108,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/23256da6-66b9-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "mue.png", + "snapshot": "mue.jpg", "gestures": [ { "gesture_name": "", @@ -118,7 +118,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/c66bfa64-66b6-11e1-91ba-00145ea4a2be?callback=?", - "snapshot": "new under the sun.png", + "snapshot": "new under the sun.jpg", "gestures": [ { "gesture_name": "", @@ -128,7 +128,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/cfd63004-66b8-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "nid de lune.png", + "snapshot": "nid de lune.jpg", "gestures": [ { "gesture_name": "", @@ -138,7 +138,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/2f8b92b6-66b7-11e1-91ba-00145ea4a2be?callback=?", - "snapshot": "patria.png", + "snapshot": "patria.jpg", "gestures": [ { "gesture_name": "circle", @@ -156,7 +156,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/294f727c-66b8-11e1-91ba-00145ea4a2be?callback=?", - "snapshot": "sliced.png", + "snapshot": "sliced.jpg", "gestures": [ { "gesture_name": "", @@ -166,7 +166,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/3f1f08e6-66b9-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "stronger.png", + "snapshot": "stronger.jpg", "gestures": [ { "gesture_name": "jump", @@ -188,7 +188,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/82cd7e30-66b7-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "vrtti.png", + "snapshot": "vrtti.jpg", "gestures": [ { "gesture_name": "", @@ -198,7 +198,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/60d03074-66b8-11e1-80f6-00145ea4a2be?callback=?", - "snapshot": "you are you.png", + "snapshot": "you are you.jpg", "gestures": [ { "gesture_name": "", @@ -208,7 +208,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/15a75eea-8870-11e1-9bba-00145ea4a2be?callback=?", - "snapshot": "alger.png", + "snapshot": "alger.jpg", "gestures": [ { "gesture_name": "", @@ -218,7 +218,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/ffbe189a-886e-11e1-9ee2-00145ea4a2be?callback=?", - "snapshot": "animalz.png", + "snapshot": "animalz.jpg", "gestures": [ { "gesture_name": "", @@ -228,7 +228,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/a52dc4c4-886f-11e1-9bba-00145ea4a2be?callback=?", - "snapshot": "exotica.png", + "snapshot": "exotica.jpg", "gestures": [ { "gesture_name": "", @@ -238,7 +238,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/8a29e4f0-886f-11e1-9ee2-00145ea4a2be?callback=?", - "snapshot": "respire.png", + "snapshot": "respire.jpg", "gestures": [ { "gesture_name": "", @@ -248,7 +248,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/2377411e-9f74-11e1-9f9f-00145ea4a2be?callback=?", - "snapshot": "flying lesson.png", + "snapshot": "flying lesson.jpg", "gestures": [ { "gesture_name": "", @@ -258,7 +258,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/e3d42dc4-9f73-11e1-9f9f-00145ea4a2be?callback=?", - "snapshot": "aside.png", + "snapshot": "aside.jpg", "gestures": [ { "gesture_name": "", @@ -268,7 +268,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/a98a7bc4-8870-11e1-9ee2-00145ea4a2be?callback=?", - "snapshot": "the rat.png", + "snapshot": "the rat.jpg", "gestures": [ { "gesture_name": "", @@ -278,7 +278,7 @@ }, { "metadata": "http://ldt.iri.centrepompidou.fr//ldtplatform/ldt/cljson/id/f47e1578-8870-11e1-9ee2-00145ea4a2be?callback=?", - "snapshot": "tank man tango a tianmen memorial.png", + "snapshot": "tank man tango a tianmen memorial.jpg", "gestures": [ { "gesture_name": "",