Merge lp:~markjtully/unity-lens-music/genres into lp:unity-lens-music

[Mark Tully]

Added more genres to the genre map

This change adds extra genres to the genre map. It does not change any of the UI (ie. doesn't add any new genre filters) The new genre map looks like:

blues --> blues
classic --> classic, classical, opera (new)
country --> country
disco --> disco
funk --> funk
rock --> rock, heavy, hard, rock and roll (new)
metal --> metal, heavy, heavy metal
hip hop --> hip-hop, rap (new), rap & hip-hop (new)
house --> house, chillout, minimal, hard, electronic, dance (new)
new wave --> new-wave
r-and-b --> r-and-b, r&b (new)
punk --> punk, punk rock, hardcore, heavy
jazz --> jazz
pop --> pop
reggae --> reggae
soul --> soul, gospel
techno --> techno, minimal, trance, chillout, electronic, electronica, dance (new)
other --> other, african, alternative, ambient, asian, brazilian, celtic (new), christmas (new), folk (new), latin (new), oldies (new), soundtrack (new), traditional (new), world (new)

[Michal Hruby (mhr3)]

Thanks Mark, it's looking good and since it just adds extra genre mapping I don't think tests are needed.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/genre.vala'
--- src/genre.vala	2012-03-19 13:06:29 +0000
+++ src/genre.vala	2012-04-10 16:49:49 +0000
@@ -55,6 +55,7 @@
       /* classic */
       map.set (CLASSIC_ID, "classic");
       map.set (CLASSIC_ID, "classical");
+      map.set (CLASSIC_ID, "opera");
 
       /* country */
       map.set (COUNTRY_ID, "country");
@@ -69,13 +70,17 @@
       map.set (ROCK_ID, "rock");
       map.set (ROCK_ID, "heavy");
       map.set (ROCK_ID, "hard");
+      map.set (ROCK_ID, "rock and roll");
 
       /* metal */
       map.set (METAL_ID, "metal");
       map.set (METAL_ID, "heavy");
+      map.set (METAL_ID, "heavy metal");
 
       /*hip hop */
       map.set (HIPHOP_ID, "hip-hop");
+      map.set (HIPHOP_ID, "rap");
+      map.set (HIPHOP_ID, "rap & hip hop");
 
       /*house*/
       map.set (HOUSE_ID, "house");
@@ -83,12 +88,14 @@
       map.set (HOUSE_ID, "minimal");
       map.set (HOUSE_ID, "hard");
       map.set (HOUSE_ID, "electronic");
+      map.set (HOUSE_ID, "dance");
 
       /*new wave*/
       map.set (NEWWAVE_ID, "new-wave");
 
       /*r-and-b*/
       map.set (RANDB_ID, "r-and-b");
+      map.set (RANDB_ID, "r&b");
 
       /*punk*/
       map.set (PUNK_ID, "punk");
@@ -116,6 +123,7 @@
       map.set (TECHNO_ID, "chillout");
       map.set (TECHNO_ID, "electronic");
       map.set (TECHNO_ID, "electronica");
+      map.set (TECHNO_ID, "dance");
 
       /*other*/
       map.set (OTHER_ID, "other");
@@ -124,6 +132,14 @@
       map.set (OTHER_ID, "ambient");
       map.set (OTHER_ID, "asian");
       map.set (OTHER_ID, "brazilian");
+      map.set (OTHER_ID, "celtic");
+      map.set (OTHER_ID, "christmas");
+      map.set (OTHER_ID, "folk");
+      map.set (OTHER_ID, "latin");
+      map.set (OTHER_ID, "oldies");
+      map.set (OTHER_ID, "soundtrack");
+      map.set (OTHER_ID, "traditional");
+      map.set (OTHER_ID, "world");
 
       inverted_map = new HashMap<string, string> ();
       foreach (var key in map.get_keys ())