# HG changeset patch # User veltr # Date 1339004185 -7200 # Node ID f1d070549d949d5ae7a20e4c17e3ff951d0e4a5f # Parent 446e7f0c49691fd5c56aee97da54a27a1e25a188 Added audio information to test data diff -r 446e7f0c4969 -r f1d070549d94 crea/integration/data/au-clair-de-la-lune.json --- a/crea/integration/data/au-clair-de-la-lune.json Wed Jun 06 18:35:36 2012 +0200 +++ b/crea/integration/data/au-clair-de-la-lune.json Wed Jun 06 19:36:25 2012 +0200 @@ -63,29 +63,186 @@ "annotations": [ { "id": "annotation-0", - "begin": 46785, - "end": 46785, + "begin": 135332, + "end": 135332, "content": { "title": "", - "description": "blue happy" + "description": "blue surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "surprised" + } + ] + }, { + "id": "annotation-1", + "begin": 30590, + "end": 30590, + "content": { + "title": "", + "description": "yellow unhappy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "yellow" + }, { + "id-ref": "unhappy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191048270" + } + }, { + "id": "annotation-2", + "begin": 41823, + "end": 41823, + "content": { + "title": "", + "description": "red happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "happy" + } + ] + }, { + "id": "annotation-3", + "begin": 22421, + "end": 22421, + "content": { + "title": "", + "description": "blue surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "blue" }, { + "id-ref": "surprised" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606190910299" + } + }, { + "id": "annotation-4", + "begin": 61797, + "end": 61797, + "content": { + "title": "", + "description": "yellow unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "yellow" + }, { + "id-ref": "unhappy" + } + ] + }, { + "id": "annotation-5", + "begin": 121288, + "end": 121288, + "content": { + "title": "", + "description": "yellow happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "yellow" + }, { "id-ref": "happy" } ] }, { - "id": "annotation-1", - "begin": 42972, - "end": 42972, + "id": "annotation-6", + "begin": 109477, + "end": 109477, + "content": { + "title": "", + "description": "red happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "happy" + } + ] + }, { + "id": "annotation-7", + "begin": 118960, + "end": 118960, + "content": { + "title": "", + "description": "blue surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "surprised" + } + ] + }, { + "id": "annotation-8", + "begin": 139718, + "end": 139718, "content": { "title": "", "description": "green surprised" @@ -93,7 +250,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -104,9 +261,9 @@ } ] }, { - "id": "annotation-2", - "begin": 136412, - "end": 136412, + "id": "annotation-9", + "begin": 50509, + "end": 50509, "content": { "title": "", "description": "blue unhappy" @@ -114,7 +271,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -125,30 +282,51 @@ } ] }, { - "id": "annotation-3", - "begin": 23611, - "end": 23611, + "id": "annotation-10", + "begin": 127102, + "end": 127102, "content": { "title": "", - "description": "green laughing" + "description": "red happy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "green" + "id-ref": "red" + }, { + "id-ref": "happy" + } + ] + }, { + "id": "annotation-11", + "begin": 35069, + "end": 35069, + "content": { + "title": "", + "description": "red laughing" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" }, { "id-ref": "laughing" } ] }, { - "id": "annotation-4", - "begin": 37030, - "end": 37030, + "id": "annotation-12", + "begin": 12624, + "end": 12624, "content": { "title": "", "description": "blue unhappy" @@ -156,7 +334,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -167,93 +345,103 @@ } ] }, { - "id": "annotation-5", - "begin": 125531, - "end": 125531, + "id": "annotation-13", + "begin": 130554, + "end": 130554, "content": { "title": "", - "description": "blue happy" + "description": "red surprised" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "blue" + "id-ref": "red" }, { - "id-ref": "happy" + "id-ref": "surprised" } ] }, { - "id": "annotation-6", - "begin": 22035, - "end": 22035, + "id": "annotation-14", + "begin": 71731, + "end": 71731, "content": { "title": "", - "description": "blue surprised" + "description": "blue laughing" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "blue" }, { - "id-ref": "surprised" + "id-ref": "laughing" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191121613" + } }, { - "id": "annotation-7", - "begin": 59459, - "end": 59459, + "id": "annotation-15", + "begin": 23071, + "end": 23071, "content": { "title": "", - "description": "yellow happy" + "description": "red laughing" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "yellow" + "id-ref": "red" }, { - "id-ref": "happy" + "id-ref": "laughing" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191026101" + } }, { - "id": "annotation-8", - "begin": 66886, - "end": 66886, + "id": "annotation-16", + "begin": 78071, + "end": 78071, "content": { "title": "", - "description": "blue unhappy" + "description": "green unhappy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "blue" + "id-ref": "green" }, { "id-ref": "unhappy" } ] }, { - "id": "annotation-9", - "begin": 1810, - "end": 1810, + "id": "annotation-17", + "begin": 42334, + "end": 42334, "content": { "title": "", "description": "green happy" @@ -261,7 +449,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -272,135 +460,35 @@ } ] }, { - "id": "annotation-10", - "begin": 10316, - "end": 10316, + "id": "annotation-18", + "begin": 113880, + "end": 113880, "content": { "title": "", - "description": "blue laughing" + "description": "yellow laughing" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "blue" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-11", - "begin": 60157, - "end": 60157, - "content": { - "title": "", - "description": "red happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "red" - }, { - "id-ref": "happy" - } - ] - }, { - "id": "annotation-12", - "begin": 51793, - "end": 51793, - "content": { - "title": "", - "description": "blue laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "blue" + "id-ref": "yellow" }, { "id-ref": "laughing" } - ] - }, { - "id": "annotation-13", - "begin": 22640, - "end": 22640, - "content": { - "title": "", - "description": "blue surprised" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "blue" - }, { - "id-ref": "surprised" - } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606190910299" + } }, { - "id": "annotation-14", - "begin": 101139, - "end": 101139, - "content": { - "title": "", - "description": "blue unhappy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "blue" - }, { - "id-ref": "unhappy" - } - ] - }, { - "id": "annotation-15", - "begin": 60754, - "end": 60754, - "content": { - "title": "", - "description": "red laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "red" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-16", - "begin": 28208, - "end": 28208, + "id": "annotation-19", + "begin": 95641, + "end": 95641, "content": { "title": "", "description": "yellow unhappy" @@ -408,7 +496,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -419,72 +507,9 @@ } ] }, { - "id": "annotation-17", - "begin": 5863, - "end": 5863, - "content": { - "title": "", - "description": "yellow unhappy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "unhappy" - } - ] - }, { - "id": "annotation-18", - "begin": 79162, - "end": 79162, - "content": { - "title": "", - "description": "yellow laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-19", - "begin": 3544, - "end": 3544, - "content": { - "title": "", - "description": "red happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "red" - }, { - "id-ref": "happy" - } - ] - }, { "id": "annotation-20", - "begin": 51259, - "end": 51259, + "begin": 142757, + "end": 142757, "content": { "title": "", "description": "blue laughing" @@ -492,7 +517,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -504,50 +529,8 @@ ] }, { "id": "annotation-21", - "begin": 105224, - "end": 105224, - "content": { - "title": "", - "description": "yellow laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-22", - "begin": 136776, - "end": 136776, - "content": { - "title": "", - "description": "yellow laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-23", - "begin": 19221, - "end": 19221, + "begin": 146013, + "end": 146013, "content": { "title": "", "description": "green happy" @@ -555,7 +538,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -566,219 +549,9 @@ } ] }, { - "id": "annotation-24", - "begin": 113180, - "end": 113180, - "content": { - "title": "", - "description": "yellow surprised" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "surprised" - } - ] - }, { - "id": "annotation-25", - "begin": 64079, - "end": 64079, - "content": { - "title": "", - "description": "red unhappy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "red" - }, { - "id-ref": "unhappy" - } - ] - }, { - "id": "annotation-26", - "begin": 12436, - "end": 12436, - "content": { - "title": "", - "description": "green unhappy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "green" - }, { - "id-ref": "unhappy" - } - ] - }, { - "id": "annotation-27", - "begin": 89472, - "end": 89472, - "content": { - "title": "", - "description": "blue happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "blue" - }, { - "id-ref": "happy" - } - ] - }, { - "id": "annotation-28", - "begin": 30282, - "end": 30282, - "content": { - "title": "", - "description": "yellow happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "happy" - } - ] - }, { - "id": "annotation-29", - "begin": 113761, - "end": 113761, - "content": { - "title": "", - "description": "red surprised" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "red" - }, { - "id-ref": "surprised" - } - ] - }, { - "id": "annotation-30", - "begin": 18843, - "end": 18843, - "content": { - "title": "", - "description": "green happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "green" - }, { - "id-ref": "happy" - } - ] - }, { - "id": "annotation-31", - "begin": 119803, - "end": 119803, - "content": { - "title": "", - "description": "green happy" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "green" - }, { - "id-ref": "happy" - } - ] - }, { - "id": "annotation-32", - "begin": 62282, - "end": 62282, - "content": { - "title": "", - "description": "blue surprised" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "blue" - }, { - "id-ref": "surprised" - } - ] - }, { - "id": "annotation-33", - "begin": 34747, - "end": 34747, - "content": { - "title": "", - "description": "green surprised" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "green" - }, { - "id-ref": "surprised" - } - ] - }, { - "id": "annotation-34", - "begin": 137734, - "end": 137734, + "id": "annotation-22", + "begin": 30647, + "end": 30647, "content": { "title": "", "description": "yellow unhappy" @@ -786,7 +559,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -797,9 +570,51 @@ } ] }, { - "id": "annotation-35", - "begin": 91252, - "end": 91252, + "id": "annotation-23", + "begin": 113046, + "end": 113046, + "content": { + "title": "", + "description": "blue laughing" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "laughing" + } + ] + }, { + "id": "annotation-24", + "begin": 22487, + "end": 22487, + "content": { + "title": "", + "description": "red happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "happy" + } + ] + }, { + "id": "annotation-25", + "begin": 73757, + "end": 73757, "content": { "title": "", "description": "green happy" @@ -807,7 +622,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -816,11 +631,110 @@ }, { "id-ref": "happy" } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191026101" + } + }, { + "id": "annotation-26", + "begin": 107130, + "end": 107130, + "content": { + "title": "", + "description": "yellow happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "yellow" + }, { + "id-ref": "happy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606190910299" + } + }, { + "id": "annotation-27", + "begin": 139121, + "end": 139121, + "content": { + "title": "", + "description": "blue unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "unhappy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191121613" + } + }, { + "id": "annotation-28", + "begin": 98209, + "end": 98209, + "content": { + "title": "", + "description": "blue unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "unhappy" + } ] }, { - "id": "annotation-36", - "begin": 54141, - "end": 54141, + "id": "annotation-29", + "begin": 119558, + "end": 119558, + "content": { + "title": "", + "description": "green unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "green" + }, { + "id-ref": "unhappy" + } + ] + }, { + "id": "annotation-30", + "begin": 118248, + "end": 118248, "content": { "title": "", "description": "green surprised" @@ -828,7 +742,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -839,9 +753,35 @@ } ] }, { - "id": "annotation-37", - "begin": 43859, - "end": 43859, + "id": "annotation-31", + "begin": 127177, + "end": 127177, + "content": { + "title": "", + "description": "red surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "surprised" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191109062" + } + }, { + "id": "annotation-32", + "begin": 49000, + "end": 49000, "content": { "title": "", "description": "green laughing" @@ -849,7 +789,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -858,74 +798,58 @@ }, { "id-ref": "laughing" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191121613" + } }, { - "id": "annotation-38", - "begin": 84034, - "end": 84034, + "id": "annotation-33", + "begin": 30317, + "end": 30317, "content": { "title": "", - "description": "blue unhappy" + "description": "blue laughing" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "blue" }, { - "id-ref": "unhappy" + "id-ref": "laughing" } ] }, { - "id": "annotation-39", - "begin": 64840, - "end": 64840, + "id": "annotation-34", + "begin": 129677, + "end": 129677, "content": { "title": "", - "description": "green unhappy" + "description": "green happy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "green" }, { - "id-ref": "unhappy" + "id-ref": "happy" } ] }, { - "id": "annotation-40", - "begin": 33911, - "end": 33911, - "content": { - "title": "", - "description": "yellow laughing" - }, - "media": "au-clair-de-la-lune", - "meta": { - "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", - "dc:creator": "Math.random()" - }, - "tags": [ - { - "id-ref": "yellow" - }, { - "id-ref": "laughing" - } - ] - }, { - "id": "annotation-41", - "begin": 125826, - "end": 125826, + "id": "annotation-35", + "begin": 73832, + "end": 73832, "content": { "title": "", "description": "blue surprised" @@ -933,7 +857,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -944,30 +868,82 @@ } ] }, { - "id": "annotation-42", - "begin": 77736, - "end": 77736, + "id": "annotation-36", + "begin": 97352, + "end": 97352, "content": { "title": "", - "description": "yellow surprised" + "description": "blue surprised" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "surprised" + } + ] + }, { + "id": "annotation-37", + "begin": 40777, + "end": 40777, + "content": { + "title": "", + "description": "yellow unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "yellow" }, { - "id-ref": "surprised" + "id-ref": "unhappy" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606190910299" + } }, { - "id": "annotation-43", - "begin": 60254, - "end": 60254, + "id": "annotation-38", + "begin": 24691, + "end": 24691, + "content": { + "title": "", + "description": "blue happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "happy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191109062" + } + }, { + "id": "annotation-39", + "begin": 135481, + "end": 135481, "content": { "title": "", "description": "red laughing" @@ -975,7 +951,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -986,72 +962,197 @@ } ] }, { - "id": "annotation-44", - "begin": 85733, - "end": 85733, + "id": "annotation-40", + "begin": 119682, + "end": 119682, "content": { "title": "", - "description": "green surprised" + "description": "yellow surprised" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "green" + "id-ref": "yellow" }, { "id-ref": "surprised" } ] }, { - "id": "annotation-45", - "begin": 93488, - "end": 93488, + "id": "annotation-41", + "begin": 33967, + "end": 33967, "content": { "title": "", - "description": "red laughing" + "description": "red surprised" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "surprised" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191026101" + } + }, { + "id": "annotation-42", + "begin": 45133, + "end": 45133, + "content": { + "title": "", + "description": "blue surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "blue" + }, { + "id-ref": "surprised" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191026101" + } + }, { + "id": "annotation-43", + "begin": 59779, + "end": 59779, + "content": { + "title": "", + "description": "red surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "red" }, { - "id-ref": "laughing" + "id-ref": "surprised" } ] }, { - "id": "annotation-46", - "begin": 32151, - "end": 32151, + "id": "annotation-44", + "begin": 81347, + "end": 81347, "content": { "title": "", - "description": "blue unhappy" + "description": "red happy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "happy" + } + ] + }, { + "id": "annotation-45", + "begin": 36877, + "end": 36877, + "content": { + "title": "", + "description": "red happy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "happy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191048270" + } + }, { + "id": "annotation-46", + "begin": 133810, + "end": 133810, + "content": { + "title": "", + "description": "yellow surprised" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { - "id-ref": "blue" + "id-ref": "yellow" }, { - "id-ref": "unhappy" + "id-ref": "surprised" } ] }, { "id": "annotation-47", - "begin": 73299, - "end": 73299, + "begin": 80937, + "end": 80937, + "content": { + "title": "", + "description": "red unhappy" + }, + "media": "au-clair-de-la-lune", + "meta": { + "id-ref": "musitag", + "dc:created": "2012-06-06T17:28:54Z", + "dc:creator": "Math.random()" + }, + "tags": [ + { + "id-ref": "red" + }, { + "id-ref": "unhappy" + } + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191109062" + } + }, { + "id": "annotation-48", + "begin": 73482, + "end": 73482, "content": { "title": "", "description": "yellow unhappy" @@ -1059,7 +1160,7 @@ "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ @@ -1068,28 +1169,38 @@ }, { "id-ref": "unhappy" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191048270" + } }, { - "id": "annotation-48", - "begin": 25807, - "end": 25807, + "id": "annotation-49", + "begin": 2453, + "end": 2453, "content": { "title": "", - "description": "yellow laughing" + "description": "yellow happy" }, "media": "au-clair-de-la-lune", "meta": { "id-ref": "musitag", - "dc:created": "2012-05-31T09:21:56Z", + "dc:created": "2012-06-06T17:28:54Z", "dc:creator": "Math.random()" }, "tags": [ { "id-ref": "yellow" }, { - "id-ref": "laughing" + "id-ref": "happy" } - ] + ], + "audio": { + "src": "mic", + "mimetype": "audio/mp3", + "href": "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191121613" + } } ] } \ No newline at end of file diff -r 446e7f0c4969 -r f1d070549d94 crea/integration/generator.html --- a/crea/integration/generator.html Wed Jun 06 18:35:36 2012 +0200 +++ b/crea/integration/generator.html Wed Jun 06 19:36:25 2012 +0200 @@ -25,6 +25,13 @@ _annotationTypeList = new IriSP.Model.List(_directory), _colors = ['red','yellow','green','blue'], _emoticons = ['happy','unhappy','laughing','surprised'], + _audioUrls = [ + "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191121613", + "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191109062", + "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191048270", + "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606191026101", + "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/r_20120606190910299" + ], _alltags = _colors.concat(_emoticons), _duration = 147000; @@ -60,6 +67,13 @@ _annotation.created = new Date(); _annotation.creator = "Math.random()"; _annotation.description = _color + " " + _emoticon; + if (Math.random() < .33) { + _annotation.audio = { + src: "mic", + mimetype: "audio/mp3", + href: _audioUrls[Math.floor(5*Math.random())] + } + } _annotationList.push(_annotation); } diff -r 446e7f0c4969 -r f1d070549d94 crea/integration/metadataplayer/LdtPlayer-core.js --- a/crea/integration/metadataplayer/LdtPlayer-core.js Wed Jun 06 18:35:36 2012 +0200 +++ b/crea/integration/metadataplayer/LdtPlayer-core.js Wed Jun 06 19:36:25 2012 +0200 @@ -2066,91 +2066,7 @@ break; } -};/* Used when Putting annotations on the platform */ - -if (typeof IriSP.serializers === "undefined") { - IriSP.serializers = {} -} - -IriSP.serializers.ldt_annotate = { - types : { - annotation : { - serialized_name : "annotations", - serializer : function(_data, _source) { - return { - begin: _data.begin.milliseconds, - end: _data.end.milliseconds, - content: { - data: _data.description - }, - tags: _data.getTagTexts(), - media: _source.unNamespace(_data.getMedia().id), - title: _data.title, - type_title: _data.getAnnotationType().title, - type: _source.unNamespace(_data.getAnnotationType().id) - } - } - } - }, - serialize : function(_source) { - var _res = {}, - _this = this; - _source.forEach(function(_list, _typename) { - if (typeof _this.types[_typename] !== "undefined") { - _res[_this.types[_typename].serialized_name] = _list.map(function(_el) { - return _this.types[_typename].serializer(_el, _source); - }); - } - }); - _res.meta = { - creator: _source.creator, - created: _source.created - } - return JSON.stringify(_res); - }, - deSerialize : function(_data, _source) { - if (typeof _data == "string") { - _data = JSON.parse(_data); - } - _source.addList('tag', new IriSP.Model.List(_source.directory)); - _source.addList('annotationType', new IriSP.Model.List(_source.directory)); - _source.addList('annotation', new IriSP.Model.List(_source.directory)); - if (typeof _data.annotations == "object" && _data.annotations && _data.annotations.length) { - var _anndata = _data.annotations[0], - _ann = new IriSP.Model.Annotation(_anndata.id, _source); - _ann.title = _anndata.content.title || ""; - _ann.description = _anndata.content.data || ""; - _ann.created = new Date(_data.meta.created); - _ann.setMedia(_anndata.media, _source); - var _anntypes = _source.getAnnotationTypes(true).searchByTitle(_anndata.type_title); - if (_anntypes.length) { - var _anntype = _anntypes[0]; - } else { - var _anntype = new IriSP.Model.AnnotationType(_anndata.type, _source); - _anntype.title = _anndata.type_title; - _source.getAnnotationTypes().push(_anntype); - } - _ann.setAnnotationType(_anntype.id); - var _tagIds = IriSP._(_anndata.tags).map(function(_title) { - var _tags = _source.getTags(true).searchByTitle(_title); - if (_tags.length) { - var _tag = _tags[0]; - } - else { - _tag = new IriSP.Model.Tag(_title.replace(/\W/g,'_'),_source); - _tag.title = _title; - _source.getTags().push(_tag); - } - return _tag.id; - }); - _ann.setTags(_tagIds); - _ann.setBegin(_anndata.begin); - _ann.setEnd(_anndata.end); - _ann.creator = _data.meta.creator; - _source.getAnnotations().push(_ann); - } - } -}/* LDT Platform Serializer */ +};/* LDT Platform Serializer */ if (typeof IriSP.serializers === "undefined") { IriSP.serializers = {} @@ -2251,6 +2167,9 @@ if (typeof _data.meta["dc:source"] !== "undefined" && typeof _data.meta["dc:source"].content !== "undefined") { _res.source = JSON.parse(_data.meta["dc:source"].content); } + if (typeof _data.audio !== "undefined" && _data.audio.href) { + _res.audio = _data.audio; + } return _res; }, serializer : function(_data, _source) { @@ -2273,7 +2192,8 @@ return { "id-ref" : _source.unNamespace(_id) } - }) + }), + audio : _data.audio } } }, @@ -2345,3 +2265,88 @@ } } +/* Used when Putting annotations on the platform */ + +if (typeof IriSP.serializers === "undefined") { + IriSP.serializers = {} +} + +IriSP.serializers.ldt_annotate = { + types : { + annotation : { + serialized_name : "annotations", + serializer : function(_data, _source) { + return { + begin: _data.begin.milliseconds, + end: _data.end.milliseconds, + content: { + data: _data.description + }, + tags: _data.getTagTexts(), + media: _source.unNamespace(_data.getMedia().id), + title: _data.title, + type_title: _data.getAnnotationType().title, + type: _source.unNamespace(_data.getAnnotationType().id) + } + } + } + }, + serialize : function(_source) { + var _res = {}, + _this = this; + _source.forEach(function(_list, _typename) { + if (typeof _this.types[_typename] !== "undefined") { + _res[_this.types[_typename].serialized_name] = _list.map(function(_el) { + return _this.types[_typename].serializer(_el, _source); + }); + } + }); + _res.meta = { + creator: _source.creator, + created: _source.created + } + return JSON.stringify(_res); + }, + deSerialize : function(_data, _source) { + if (typeof _data == "string") { + _data = JSON.parse(_data); + } + _source.addList('tag', new IriSP.Model.List(_source.directory)); + _source.addList('annotationType', new IriSP.Model.List(_source.directory)); + _source.addList('annotation', new IriSP.Model.List(_source.directory)); + if (typeof _data.annotations == "object" && _data.annotations && _data.annotations.length) { + var _anndata = _data.annotations[0], + _ann = new IriSP.Model.Annotation(_anndata.id, _source); + _ann.title = _anndata.content.title || ""; + _ann.description = _anndata.content.data || ""; + _ann.created = new Date(_data.meta.created); + _ann.setMedia(_anndata.media, _source); + var _anntypes = _source.getAnnotationTypes(true).searchByTitle(_anndata.type_title); + if (_anntypes.length) { + var _anntype = _anntypes[0]; + } else { + var _anntype = new IriSP.Model.AnnotationType(_anndata.type, _source); + _anntype.title = _anndata.type_title; + _source.getAnnotationTypes().push(_anntype); + } + _ann.setAnnotationType(_anntype.id); + var _tagIds = IriSP._(_anndata.tags).map(function(_title) { + var _tags = _source.getTags(true).searchByTitle(_title); + if (_tags.length) { + var _tag = _tags[0]; + } + else { + _tag = new IriSP.Model.Tag(_title.replace(/\W/g,'_'),_source); + _tag.title = _title; + _source.getTags().push(_tag); + } + return _tag.id; + }); + _ann.setTags(_tagIds); + _ann.setBegin(_anndata.begin); + _ann.setEnd(_anndata.end); + _ann.creator = _data.meta.creator; + _source.getAnnotations().push(_ann); + } + } +} \ No newline at end of file diff -r 446e7f0c4969 -r f1d070549d94 crea/integration/metadataplayer/MusitagAnnotations.js --- a/crea/integration/metadataplayer/MusitagAnnotations.js Wed Jun 06 18:35:36 2012 +0200 +++ b/crea/integration/metadataplayer/MusitagAnnotations.js Wed Jun 06 19:36:25 2012 +0200 @@ -52,7 +52,9 @@ + '
' + '
' + '
' - + '
'; + + '' + + ( typeof _annotation.audio !== "undefined" && _annotation.audio.href ? '
' : '' ) + + ''; }).join(''); _html += ''; } diff -r 446e7f0c4969 -r f1d070549d94 crea/integration/metadataplayer/MusitagAnnotator.js --- a/crea/integration/metadataplayer/MusitagAnnotator.js Wed Jun 06 18:35:36 2012 +0200 +++ b/crea/integration/metadataplayer/MusitagAnnotator.js Wed Jun 06 19:36:25 2012 +0200 @@ -70,7 +70,7 @@ + '

Enregistre
ta voix

' + '
' - + '' + + ' ' + ' ' + ' ' + ' ' @@ -122,20 +122,38 @@ this.bindPopcorn("timeupdate","onTimeupdate"); this.bindPopcorn("IriSP.MusitagAnnotator.hide","hide"); this.bindPopcorn("IriSP.MusitagAnnotator.show","show"); + this.recorder = this.$.find("embed")[0]; + + var _this = this; + this.$.find('.Musitag-Annotator-tagInSelector').click(function() { var _class = IriSP.jQuery(this).children(':last-child').attr('class'), - _classes = _class.split(' '); + _classes = _class.split(' '), + _type = _classes[0].replace(/^\w+-/,""), + _value = _classes[1].replace(/^\w+-/,""); + _this.annotation[_type] = _value; + _this.checkAnnotation(); IriSP.jQuery('.Musitag-Annotator-tagInSend .' + _classes[0]).attr('class',_class); IriSP.jQuery(this).siblings().removeClass('down') .children(':last-child').css('opacity',.35); IriSP.jQuery(this).addClass('down') .children(':last-child').css('opacity',1); }); - var _this = this; + this.$.find('.Musitag-Annotator-close').click(function() { + _this.recorder.stopRecord(); _this.hide(); _this.player.popcorn.trigger("IriSP.MusitagAndYou.show"); - }) + }); + + this.$.find('.Musitag-Annotator-Note').click(function() { + _this.recorder.stopRecord(); + }); + + window.setAudioUrl = function(_url) { + _this.annotation.audio_url = _url; + console.log(_url); + } } IriSP.Widgets.MusitagAnnotator.prototype.onTimeupdate = function() { @@ -144,11 +162,23 @@ this.main_div.css("margin-left",Math.max(this.min_left, Math.min(this.max_right - this.main_width, _x - this.main_width / 2))+"px"); } +IriSP.Widgets.MusitagAnnotator.prototype.checkAnnotation = function() { + var _res = this.annotation.emoticon && this.annotation.color; + this.$.find('.Musitag-Annotator-Note').css("opacity", _res ? 1 : .5); + return _res; +} + IriSP.Widgets.MusitagAnnotator.prototype.show = function() { this.$.show(); this.$.find('.Musitag-Annotator-tagInSelector').removeClass("down"); this.$.find(".Musitag-Annotator-tagInSend .Musitag-color").attr("class","Musitag-color"); this.$.find(".Musitag-Annotator-tagInSend .Musitag-emoticon").attr("class","Musitag-emoticon hidden"); + this.annotation = { + audio_url: false, + emoticon: false, + color: false + }; + this.checkAnnotation(); this.position_bar.slideDown(200); }