Merge lp:~lorenzo-carbonell/anoise/anoise into lp:anoise/trunk

Proposed by costales
Status: Rejected
Rejected by: costales
Proposed branch: lp:~lorenzo-carbonell/anoise/anoise
Merge into: lp:anoise/trunk
Diff against target: 28 lines (+4/-1)
2 files modified
README (+3/-0)
anoise/anoise.py (+1/-1)
To merge this branch: bzr merge lp:~lorenzo-carbonell/anoise/anoise
Reviewer Review Type Date Requested Status
costales Disapprove
Review via email: mp+255137@code.launchpad.net
To post a comment you must log in.
Revision history for this message
costales (costales) :
review: Approve
Revision history for this message
costales (costales) wrote :

Incomplete reference for image license

review: Disapprove

Unmerged revisions

13. By Lorenzo Carbonell

Added river noise

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2015-04-02 10:04:44 +0000
3+++ README 2015-04-02 19:51:56 +0000
4@@ -71,3 +71,6 @@
5 Night
6 Image: CC BY 3.0 https://www.iconfinder.com/icons/216526/night_weather_icon
7 Sound: CC0 1.0 http://www.freesound.org/people/martypinso/sounds/22604/
8+River
9+ Image: CC BY 3.0 https://www.iconfinder.com/icons/494635/forest_mountain_river_snow_icon
10+ Sound: CC0 1.0 https://freesound.org/people/Philip%20Goddard/sounds/180462/
11
12=== modified file 'anoise/anoise.py'
13--- anoise/anoise.py 2015-04-02 10:11:29 +0000
14+++ anoise/anoise.py 2015-04-02 19:51:56 +0000
15@@ -122,7 +122,7 @@
16 self.player.set_property('uri', self.sounds.get_current_filename())
17 self.is_playing = False
18
19- dummy_i18n = (_("Coffee Shop"), _("Fire"), _("Forest"), _("Night"), _("Rain"), _("Sea"), _("Storm"), _("Wind")) # Need i18n
20+ dummy_i18n = (_("Coffee Shop"), _("Fire"), _("Forest"), _("Night"), _("Rain"), _("River"), _("Sea"), _("Storm"), _("Wind")) # Need i18n
21
22 self.bus = self.player.get_bus()
23 self.bus.add_signal_watch()
24
25=== added file 'sounds/river.ogg'
26Binary files sounds/river.ogg 1970-01-01 00:00:00 +0000 and sounds/river.ogg 2015-04-02 19:51:56 +0000 differ
27=== added file 'sounds/river.png'
28Binary files sounds/river.png 1970-01-01 00:00:00 +0000 and sounds/river.png 2015-04-02 19:51:56 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: