Changes for page Music Management

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,50 +2,39 @@
1		-We decided to use the 5 following songs to underline our provided activities with suitable music
2	2	**Songs we used:**
3	3
4	4	{{html}}
5		-
	4	+<!-- Your HTML code here -->
6	6	<table width='100%'>
7	7	<tr>
8		-<th width='20%'>Song</th>
9		-<th width='20%'>Interpret</th>
10		-<th width='20%'>Genre</th>
11		-<th width='40%'>Situation when it's played</th>
	7	+<th width='25%'>Song</th>
	8	+<th width='25%'>Interpret</th>
	9	+<th width='25%'>Genre</th>
	10	+<th width='25%'>Situation when it's played</th>
12	12
13	13	</tr>
14	14	<tr>
15	15	<td>Introduction music "perception"</td>
16		-<td>Benjamin Tissot</td>
17	17	<td>unknown</td>
18		-<td>Introduction, played until face is recognized</td>
	16	+<td>unknown</td>
19	19	</tr>
20	20	<tr>
21		-<td>Summer of '69</td>
	19	+<td>Summer of 69</td>
22	22	<td>Brian Adams</td>
23		-<td>Rock, Pop Rock</td>
24		-<td>Entertaining while waiting for the caretaker to come</td>
	21	+<td>unknown</td>
25	25	</tr>
26	26	<tr>
27	27	<td>Take Five</td>
28	28	<td>The Dave Brubeck Quartet</td>
29	29	<td>Jazz</td>
30		-<td>If the activity "going to the living room" is suggested</td>
31	31	</tr>
32	32	<tr>
33	33	<td>Escape (The Pina Colada Song) </td>
34	34	<td>Rupert Holmes</td>
35		-<td>Folk, Pop</td>
36		-<td>If the activity "have a coffee" is suggested</td>
	31	+<td>unknown</td>
37	37	</tr>
38	38	<tr>
39	39	<td>Tiny Dancer</td>
40	40	<td>Elton John</td>
41		-<td>Folk, Pop</td>
42		-<td>If the activity "doing a puzzle" is suggested</td>
	36	+<td>unknown</td>
43	43	</tr>
44	44
45		-{{/html}}
46		-
47		-The songs were bought and downloaded from amazon music and cut into ~10 seconds to 1 minute pieces. Only the introduction music was freely available on the "bensound" webpage [1]. The songs were added to the Choregraphe program in mp3 format.
48		-We found out, that the wav format, which is also compatible with the pepper robot, was too large. The time to compile and run the program took around 1 minute. After we changed all music files into mp3 format, it was much faster (~10s loading time).
49		-
50		-[1] [[https://www.bensound.com/royalty-free-music/track/perception]]
	39	+{{html}}