Music Lens

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

  1. genres
  2. Merge into trunk
Proposed by Mark Tully
Status: Merged
Approved by: Michal Hruby
Approved revision: 78
Merged at revision: 79
Proposed branch: lp:~markjtully/unity-lens-music/genres
Merge into: lp:unity-lens-music
Diff against target: 67 lines (+16/-0)
1 file modified
src/genre.vala (+16/-0)
To merge this branch: bzr merge lp:~markjtully/unity-lens-music/genres
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Review via email: mp+101414@code.launchpad.net

Commit message

Added more genres to the genre map

Description of the change

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)

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

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

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/genre.vala'
2--- src/genre.vala 2012-03-19 13:06:29 +0000
3+++ src/genre.vala 2012-04-10 16:49:49 +0000
4@@ -55,6 +55,7 @@
5 /* classic */
6 map.set (CLASSIC_ID, "classic");
7 map.set (CLASSIC_ID, "classical");
8+ map.set (CLASSIC_ID, "opera");
9
10 /* country */
11 map.set (COUNTRY_ID, "country");
12@@ -69,13 +70,17 @@
13 map.set (ROCK_ID, "rock");
14 map.set (ROCK_ID, "heavy");
15 map.set (ROCK_ID, "hard");
16+ map.set (ROCK_ID, "rock and roll");
17
18 /* metal */
19 map.set (METAL_ID, "metal");
20 map.set (METAL_ID, "heavy");
21+ map.set (METAL_ID, "heavy metal");
22
23 /*hip hop */
24 map.set (HIPHOP_ID, "hip-hop");
25+ map.set (HIPHOP_ID, "rap");
26+ map.set (HIPHOP_ID, "rap & hip hop");
27
28 /*house*/
29 map.set (HOUSE_ID, "house");
30@@ -83,12 +88,14 @@
31 map.set (HOUSE_ID, "minimal");
32 map.set (HOUSE_ID, "hard");
33 map.set (HOUSE_ID, "electronic");
34+ map.set (HOUSE_ID, "dance");
35
36 /*new wave*/
37 map.set (NEWWAVE_ID, "new-wave");
38
39 /*r-and-b*/
40 map.set (RANDB_ID, "r-and-b");
41+ map.set (RANDB_ID, "r&b");
42
43 /*punk*/
44 map.set (PUNK_ID, "punk");
45@@ -116,6 +123,7 @@
46 map.set (TECHNO_ID, "chillout");
47 map.set (TECHNO_ID, "electronic");
48 map.set (TECHNO_ID, "electronica");
49+ map.set (TECHNO_ID, "dance");
50
51 /*other*/
52 map.set (OTHER_ID, "other");
53@@ -124,6 +132,14 @@
54 map.set (OTHER_ID, "ambient");
55 map.set (OTHER_ID, "asian");
56 map.set (OTHER_ID, "brazilian");
57+ map.set (OTHER_ID, "celtic");
58+ map.set (OTHER_ID, "christmas");
59+ map.set (OTHER_ID, "folk");
60+ map.set (OTHER_ID, "latin");
61+ map.set (OTHER_ID, "oldies");
62+ map.set (OTHER_ID, "soundtrack");
63+ map.set (OTHER_ID, "traditional");
64+ map.set (OTHER_ID, "world");
65
66 inverted_map = new HashMap<string, string> ();
67 foreach (var key in map.get_keys ())

Subscribers

People subscribed via source and target branches

to all changes: