1 patch for repository /home/josip/bin/tahoe-tmp:

Sat Aug 14 19:29:19 CEST 2010  josip.lisec@gmail.com
  * updates14082010
  * Implemented search interface
  * Implemented playlist manager
  * Implemented playlist exporters (XSPF, PLS, M3U)
  * Separated 'main menu' into two menus
  * Fixed possible issues with da.ui.Column's performance
  * More UTF-8 related fixes to da.util.ID3v2Parser

New patches:

[updates14082010
josip.lisec@gmail.com**20100814172919
 Ignore-this: 4a70a398132d7b306c0b29d5ed36fe54
 * Implemented search interface
 * Implemented playlist manager
 * Implemented playlist exporters (XSPF, PLS, M3U)
 * Separated 'main menu' into two menus
 * Fixed possible issues with da.ui.Column's performance
 * More UTF-8 related fixes to da.util.ID3v2Parser
] {
hunk ./contrib/musicplayer/INSTALL 1
-=== Installing Music Player for Tahoe (codename 'Daaw') ===
+= Installing Music Player for Tahoe (codename 'Daaw') =
 
 == Maths and Systems Theory quiz ==
 If you already have a 'build' directory, feel free to skip this step.
hunk ./contrib/musicplayer/INSTALL 14
 and computing related courses.
 
 Just in case you haven't, you can type in next line into your shell:
-  $ python manage.py build
-  running build
+  $ python manage.py roll
+  running roll
   Calculating dependencies...
   Compressing <something>...
   ...
hunk ./contrib/musicplayer/INSTALL 19
-  Done!
+  You're ready to rock 'n' roll!
 
 Bravo, you're done! (just make sure you have a 'build' directory)
 
hunk ./contrib/musicplayer/INSTALL 29
 == Battle for the Configuration File ==
 Player's configuration file is a real beast on its own,
 and in order to edit it we must prepare ourselves really good,
-otherwise, we're doomed (actually, only you are )!
+otherwise, we're doomed (actually, only you are)!
 
 Read next few steps carefully, the beast is just around the corner!
 
hunk ./contrib/musicplayer/INSTALL 33
-1. Create two dirnodes on your Tahoe-LAFS server, one will be used for storing
+1. Create two dirnodes on your Tahoe-LAFS server, one which will be used for storing
    all your music files and the other one for syncing settings between multiple
    computers.
   
hunk ./contrib/musicplayer/INSTALL 45
    <top secret no.2>
   
    (make sure Tahoe-LAFS is running on your computer before issuing those commands)
+   Pro tip: create a (S)FTP account with your music directory as it's home directory
+   and upload your music files in batches without a sweat.
 
 2. Take a big breath, as we're about to open example configuration file!
 
hunk ./contrib/musicplayer/INSTALL 54
    Now quickly, we have to replace her evil genes with a good ones,
    find following line in her DNA sequence:
   
-      "music_cap": "<bad gene no.1>",
+      "music_cap":    "<bad gene no.1>",
       "settings_cap": "<bad gene no.2>"
   
   and quickly replace <bad gene no.1> with <top secret no.1> as well as <bad gene no.2>
hunk ./contrib/musicplayer/INSTALL 66
   knows how to re-sequence DNA of living beings, and we don't want others to
   find out about that and use it in evil purposes, don't we?)
   
-  Now save the new genes under name of 'config.json'.
+  Now save the new genes under the name of 'config.json'.
 
 == The Critical Step ==
 After we've conquered the beast of configuration file we're ready to
hunk ./contrib/musicplayer/INSTALL 70
-upload the player to the Tahoe!
+upload the player to the Tahoe-LAFS!
 
 To do that, just copy the 'build' directory to 'public_html' directory of your
 Tahoe storage node (usually ~/.tahoe).
hunk ./contrib/musicplayer/INSTALL 74
-Note that 'public_html' directory is probably missing,
-so you'll have to create it on your own.
+Note that 'public_html' directory is probably missing, so you'll have to create it on your own.
 
hunk ./contrib/musicplayer/INSTALL 76
+If you are on a UNIX-like operating system, you can do it with following command:
   $ mkdir -p ~/.tahoe/public_html/musicplayer
hunk ./contrib/musicplayer/INSTALL 78
-  $ cp -r build/ ~/.tahoe/public_html/musicplayer
+  $ cp -r build/ ~/.tahoe/public_html/musicplayer/
+  
+  Pro tip: instead of copying whole 'build' directory, make a symbolic link
+  so that 'installing' a new version will be a breeze.
+
+or if you're using a Windows machine with Command prompt
+  $ mkdir %HOMEDRIVE%%HOMEPATH%\.tahoe\public_html\musicplayer
+  $ xcopy /S build\ %HOMEDRIVE%%HOMEPATH%\.tahoe\public_html\musicplayer\
+  
+(drag and drop also works)
 
 WARNING: If you don't perform next step exactly as
 you're instructed, the whole process could fail and you'll
hunk ./contrib/musicplayer/INSTALL 99
 
 == Fin ==
 You can now upload your music to the <top secret no.1> dirnode and
-launch music player by typing this URL into your web browser:
+launch music player by typing this URI into your web browser:
   http://localhost:3456/static/musicplayer
 
 If it appears that something isn't working, it probably means
hunk ./contrib/musicplayer/INSTALL 103
-that you haven't read 'The Critical Step' carefully enough. 
+that you haven't read 'The Critical Step' carefully enough, but
+if you're sure you did it as instructed, please report all bugs you encounter
+on the following address:
+  http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1023
+or ask around for josipl on tahoe-lafs IRC channel (irc.freenode.net).
 
 We hope you're going to enjoy your music even more with Music Player for Tahoe-LAFS!
hunk ./contrib/musicplayer/INSTALL 110
+
+Note: During the initial collection scan (or any other), it's suggested to
+turn off Firebug or Web Inspector's XMLHttpRequest logging feature, for sake of performance.
hunk ./contrib/musicplayer/NOTES 53
   following into Web Inspector's or Firebugs' console:
   
   `windmill.jsTests.testFailures`
-*
 
 === Documentation ===
 Player's code is fully annotated with PDoc[2] syntax, which can then generate
hunk ./contrib/musicplayer/manage.py 6
 
 import os, shutil, sys, subprocess, re
 from time import sleep
+import tempfile
 from tempfile import mkstemp
 from setuptools import setup
 from setuptools import Command
hunk ./contrib/musicplayer/manage.py 70
   """
   requires_re = re.compile('^//#require ["|\<](.+)["|\>]$', re.M)
   
-  def __init__(self, root_directory):
+  def __init__(self, root_directory, syntax_check = False):
     self.files        = {}
     self.included     = []
hunk ./contrib/musicplayer/manage.py 73
-    self.root         = root_directory    
+    self.root         = root_directory
+    self.syntax_check = syntax_check
     
     self.scan()
   
hunk ./contrib/musicplayer/manage.py 99
     
     self.files[path] = reqs
 
-  def parse(self, path, syntax_check = False):
+  def parse(self, path):
     if path in self.included:
       return ''
     if not path.endswith('.js'):
hunk ./contrib/musicplayer/manage.py 106
       # TODO: If path points to a directory, require all the files within that directory.
       return '' 
     
-    if syntax_check:
+    if self.syntax_check:
       compiler = ClosureCompiler([path], None)
       if not compiler.syntax_check():
         raise Exception('There seems to be a syntax problem. Fix it.')
hunk ./contrib/musicplayer/manage.py 117
         if not os.path.isfile(req_path):
           raise Exception('%s requires non existing file: %s' % (path, req_path))
           
-        return self.parse(req_path, syntax_check)
+        return self.parse(req_path)
      
     script_file = open(path, 'r')
     script = script_file.read()
hunk ./contrib/musicplayer/manage.py 144
   description = 'builds whole application into build directory'
   user_options = [
     ('compilation-level=', 'c', 'compilation level for Google\'s Closure compiler.'),
+    ('syntax-check', 's', 'run syntax check on every individal file')
   ]
   
   def initialize_options(self):
hunk ./contrib/musicplayer/manage.py 149
     self.compilation_level = 'SIMPLE_OPTIMIZATIONS'
+    self.syntax_check = False
     
   def finalize_options(self):
     compilation_levels = [
hunk ./contrib/musicplayer/manage.py 167
     shutil.copytree('src/resources', 'build/resources')
     shutil.copy('src/config.example.json', 'build/')
     shutil.copy('src/index.html', 'build/')
+    shutil.copy('src/playlist_download.html', 'build/')
+    shutil.copy('src/about.html', 'build/')
+    shutil.copy('src/cache.manifest', 'build/')
     
     shutil.copytree('src/libs/vendor/soundmanager/swf', 'build/resources/flash')
     shutil.copy('src/libs/vendor/persist-js/persist.swf', 'build/resources/flash')
hunk ./contrib/musicplayer/manage.py 174
     
-    os.makedirs('build/js/libs')
     os.makedirs('build/js/workers')
     shutil.copy('src/libs/vendor/browser-couch/js/worker-map-reducer.js', 'build/js/workers/map-reducer.js')
     
hunk ./contrib/musicplayer/manage.py 178
     print 'Calculating dependencies...'
-    self.deps = JSDepsBuilder('src/')
+    self.deps = JSDepsBuilder('src/', syntax_check = self.syntax_check)
     
     self._make_js('Application.js', 'build/js/app.js')
     
hunk ./contrib/musicplayer/manage.py 186
       if worker.endswith('.js'):
         self._make_js('workers/' + worker, 'build/js/workers/' + worker)
     
-    print 'Done!'
+    print 'You\'re ready to rock \'n\' roll!'
   
   def _make_js(self, root, output):
hunk ./contrib/musicplayer/manage.py 189
-    tmp_file = mkstemp()[1]
+    fd = mkstemp()
+    os.close(fd[0])
+    tmp_file = fd[1]
     self.deps.write_to_file(tmp_file, root_file = root)
     compiler = ClosureCompiler([tmp_file], output)
     compiler.compile(self.compilation_level)
hunk ./contrib/musicplayer/manage.py 303
 setup(
   name = 'tahoe-music-player',
   cmdclass = {
-    'build':    Build,
+    'roll':     Build,
     'install':  Install,
     'watch':    Watch,
     'tests':    VerifyTests,
hunk ./contrib/musicplayer/src/Application.js 17
 //#require "libs/db/PersistStorage.js"
 //#require "libs/db/DocumentTemplate.js"
 //#require "libs/util/Goal.js"
+//#require "libs/ui/Menu.js"
+//#require "libs/ui/Dialog.js"
 
 (function () {
 var BrowserCouch    = da.db.BrowserCouch,
hunk ./contrib/musicplayer/src/Application.js 23
     PersistStorage  = da.db.PersistStorage,
-    Goal            = da.util.Goal;
+    Goal            = da.util.Goal,
+    Menu            = da.ui.Menu,
+    Dialog          = da.ui.Dialog;
 
 /** section: Controllers
hunk ./contrib/musicplayer/src/Application.js 28
- *  class da.app
+ * App
  *
hunk ./contrib/musicplayer/src/Application.js 30
- *  The main controller. All methods are public.
+ * Private interface of the [[da.app]].
  **/
hunk ./contrib/musicplayer/src/Application.js 32
-da.app = {
-  /**
-   *  da.app.caps -> Object
-   *  Object with `music` and `settings` properties, ie. the contents of `config.json` file.
-   **/
-  caps: {},
-  
+var App = {
   initialize: function () {
     this.startup = new Goal({
hunk ./contrib/musicplayer/src/Application.js 35
-      checkpoints: ["domready", "settings_db", "caps", "data_db", "soundmanager"],
+      checkpoints: ["domready", "settings_db", "caps", "data_db"],
       onFinish: this.ready.bind(this)
     });
     
hunk ./contrib/musicplayer/src/Application.js 42
     BrowserCouch.get("settings", function (db) {
       da.db.SETTINGS = db;
       if(!db.getLength())
-        this.loadInitialSettings();
+        App.loadInitialSettings();
       else {
hunk ./contrib/musicplayer/src/Application.js 44
-        this.startup.checkpoint("settings_db");
-        this.getCaps();
+        App.startup.checkpoint("settings_db");
+        App.getCaps();
       }
hunk ./contrib/musicplayer/src/Application.js 47
-    }.bind(this), new PersistStorage("tahoemp_settings"));
+    }, new PersistStorage("tahoemp_settings"));
     
     BrowserCouch.get("data", function (db) {
       da.db.DEFAULT = db;
hunk ./contrib/musicplayer/src/Application.js 51
-      this.startup.checkpoint("data_db");
-    }.bind(this), new PersistStorage("tahoemp_data"));
+      App.startup.checkpoint("data_db");
+    }, new PersistStorage("tahoemp_data"));
     
hunk ./contrib/musicplayer/src/Application.js 54
-    this.addEvent("ready.controller.CollectionScanner", function () {
+    da.app.addEvent("ready.controller.CollectionScanner", function () {
       if(!da.db.DEFAULT.getLength())
         da.controller.CollectionScanner.scan();
     });
hunk ./contrib/musicplayer/src/Application.js 61
   },
   
   loadInitialSettings: function () {
-    new Request.JSON({
+    var req = new Request.JSON({
       url: "config.json",
       noCache: true,
       
hunk ./contrib/musicplayer/src/Application.js 70
           {id: "music_cap",     type: "Setting", group_id: "caps", value: data.music_cap},
           {id: "settings_cap",  type: "Setting", group_id: "caps", value: data.settings_cap}
         ], function () {
-          this.startup.checkpoint("settings_db");
+          App.startup.checkpoint("settings_db");
           
hunk ./contrib/musicplayer/src/Application.js 72
-          this.caps.music = data.music_cap;
-          this.caps.settings = data.settings_cap;
+          da.app.caps.music = data.music_cap;
+          da.app.caps.settings = data.settings_cap;
           
hunk ./contrib/musicplayer/src/Application.js 75
-          this.startup.checkpoint("caps");
+          App.startup.checkpoint("caps");
           
           if(!da.db.DEFAULT.getLength())
hunk ./contrib/musicplayer/src/Application.js 78
-            da.controller.CollectionScanner.scan();
-        }.bind(this));
-      }.bind(this),
+            App.callController("CollectionScanner", "scan");
+        });
+      },
       
       onFailure: function () {
hunk ./contrib/musicplayer/src/Application.js 83
+        delete req;
         alert("You're missing a config.json file! See docs on how to set it up.");
hunk ./contrib/musicplayer/src/Application.js 85
-        var showSettings = function () {
-          da.controller.Settings.showGroup("caps");
-        };
         
hunk ./contrib/musicplayer/src/Application.js 86
-        if(da.controller.Settings)
-          showSettings();
-        else
-          da.app.addEvent("ready.controller.Settings", showSettings);
+        App.callController("Settings", "showGroup", ["caps"]);
       }
hunk ./contrib/musicplayer/src/Application.js 88
-    }).get()
+    });
+    
+    req.get();
   },
   
   getCaps: function () {
hunk ./contrib/musicplayer/src/Application.js 106
       
       finished: function (result) {
         if(!result.rows.length)
-          return this.loadInitialSettings();
+          return App.loadInitialSettings();
+        
+        da.app.caps = {
+          music:    result.getRow("music_cap"),
+          settings: result.getRow("settings_cap")
+        };
         
hunk ./contrib/musicplayer/src/Application.js 113
-        this.caps.music = result.getRow("music_cap");
-        this.caps.settings = result.getRow("settings_cap");
-        if(!this.caps.music.length || !this.caps.music.length)
-          this.loadInitialSettings();
+        if(!da.app.caps.settings.length || !da.app.caps.music.length)
+          App.loadInitialSettings();
         else
hunk ./contrib/musicplayer/src/Application.js 116
-          this.startup.checkpoint("caps");
-      }.bind(this),
+          App.startup.checkpoint("caps");
+      },
       
       updated: function (result) {
         var music    = result.getRow("music_cap"),
hunk ./contrib/musicplayer/src/Application.js 124
             settings = result.getRow("settings_cap");
         
         if(music)
-          da.controller.CollectionScanner.scan(this.caps.music = music);
+          da.controller.CollectionScanner.scan(da.app.caps.music = music);
         
         if(settings)
hunk ./contrib/musicplayer/src/Application.js 127
-          this.caps.settings = settings;
+          da.app.caps.settings = settings;
         
hunk ./contrib/musicplayer/src/Application.js 129
-        this.startup.checkpoint("caps");
-      }.bind(this)
+        App.startup.checkpoint("caps");
+      }
     });
   },
   
hunk ./contrib/musicplayer/src/Application.js 134
+  callController: function(controller, method, args) {
+    function callControllerMethod() {
+      var c = da.controller[controller];
+      c[method].apply(c, args);
+      c = null;
+    }
+    
+    if(da.controller[controller])
+      callControllerMethod();
+    else
+      da.app.addEvent("ready.controller." + controller, callControllerMethod);
+  },
+  
   /**
    *  da.app.ready() -> undefined
    *  fires ready
hunk ./contrib/musicplayer/src/Application.js 155
    **/
   ready: function () {
     $("loader").destroy();
-    $("panes").setStyle("display", "block");
+    $("panes").style.display = "block";
+    
+    this.setupMainMenu();
+    
+    da.app.fireEvent("ready");
+    
+    var about_iframe = new Element("iframe", {
+      src: "about:blank",
+      width: 400,
+      height: 500
+    });
+    about_iframe.style.background = "#fff";
+    this.about_dialog = new Dialog({
+      html: about_iframe,
+      onShow: function () {
+        about_iframe.src = "about.html";
+      },
+      onHide: function () {
+        about_iframe.src = "about:blank";
+      }
+    });
+  },
+  
+  setupMainMenu: function () {
+    var main_menu_button = new Element("a", {
+      id:   "main_menu",
+      // triangle
+      html: "&#x25BC;",
+      href: "#",
+      events: {
+        mousedown: function (event) {
+          da.app.mainMenu.show(event);
+        },
+        click: function (event) {
+          Event.stop(event);
+        }
+      }
+    });
     
hunk ./contrib/musicplayer/src/Application.js 194
-    this.fireEvent("ready");
+    da.app.mainMenu = new Menu({
+      items: {
+        toggleShuffle: {html: "Turn shuffle on", id: "player_toggle_shuffle_menu_item", href: "#"},
+        mute:     {html: "Mute", id: "player_mute_menu_item", href: "#"},
+        _sep0:    Menu.separator,
+        
+        addToPl:  {html: "Add to playlist&hellip;", href: "#"},
+        share:    {html: "Share&hellip;",           href: "#"},
+        
+        _sep1:    Menu.separator,
+        
+        search:   {html: "Search&hellip;",    href: "#"},
+        upload:   {html: "Import&hellip;",    href: "#"},
+        rescan:   {html: "Rescan collection", href: "#"},
+        settings: {html: "Settings&hellip;",  href: "#"},
+        
+        _sep2:    Menu.separator,
+        
+        help:     {html: "Help",  href: "#"},
+        about:    {html: "About", href:"#"}
+      },
+      
+      position: {
+        position: "bottomRight",
+        edge:     "topRight",
+        offset:   { y: -3 }
+      },
+      
+      onShow: function () {
+        main_menu_button.addClass("active_menu");
+      },
+      onHide: function () {
+        main_menu_button.removeClass("active_menu");
+      },
+      onClick: function (item) {
+        var fn = da.app.mainMenuActions[item];
+        if(fn)
+          fn();
+        fn = null;
+      }
+    });
+    document.body.grab(main_menu_button);
+  }
+};
+
+/**
+ *  class da.app
+ *
+ *  The main controller.
+ **/
+da.app = {
+  /**
+   *  da.app.caps -> Object
+   *  Object with `music` and `settings` properties, ie. the contents of `config.json` file.
+   **/
+  caps: {},
+  
+  /**
+   *  da.app.mainMenu -> da.ui.Menu
+   **/
+  mainMenu: null,
+  
+  /**
+   *  da.app.mainMenuActions -> Object
+   *  Object's keys match [[da.app.mainMenu]] item keys.
+   **/
+  mainMenuActions: {
+    toggleShuffle:  function () { da.controller.Player._toggleShuffle() },
+    mute:           function () { da.controller.Player.toggleMute()     },
+    addToPl:        function () { da.controller.Playlist.addSong()      },
+    search:         function () { da.controller.Search.show()           },
+    rescan:         function () { da.controller.CollectionScanner.scan(da.app.caps.music) },
+    settings:       function () { da.controller.Settings.show()         },
+    about:          function () { App.about_dialog.show()               }
   }
 };
 $extend(da.app, new Events());
hunk ./contrib/musicplayer/src/Application.js 272
 
-da.app.initialize();
+App.initialize();
 
 window.addEvent("domready", function () {
hunk ./contrib/musicplayer/src/Application.js 275
-  da.app.startup.checkpoint("domready");
+  App.startup.checkpoint("domready");
 });
 
 })();
addfile ./contrib/musicplayer/src/about.html
hunk ./contrib/musicplayer/src/about.html 1
+<!DOCTYPE html>
+<html>
+<!-- html manifest="cache.manifest" -->
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    
+    <title>About Daaw</title>
+    <link rel="stylesheet" href="resources/css/reset.css" type="text/css" media="screen" charset="utf-8"/>
+    <link rel="stylesheet" href="resources/css/text.css"  type="text/css" media="screen" charset="utf-8"/>
+    
+    <style type="text/css">
+      body {
+        font-family: 'Droid Sans', sans-serif;
+        padding: 0 10px;
+        background: #fff;
+        width: 380px;
+        height: 500px;
+        overflow: hidden;
+      }
+      
+      header {
+        background: #f3f3f3 url(resources/images/radio_pattern.png) 0 0 repeat;
+        height: 65px;
+        overflow: hidden;
+        border-bottom: 1px solid #c0c0c0;
+        padding: 0;
+        margin: 0 -10px 10px -10px;
+        text-shadow: #fff 0 1px 0;
+        text-align: left;
+        
+        -webkit-box-shadow: #c0c0c0 0 0 5px inset;
+        -moz-box-shadow: #c0c0c0 0 0 5px inset;
+        box-shadow: #c0c0c0 0 0 5px inset;
+      }
+      
+      h1 {
+        background: url(resources/images/song_details_background.png) 0 0 repeat;
+        display: inline-block;
+        height: 50px;
+        margin: 7px 0 0 5px;
+        padding: 4px 0 0 0;
+        width: 110px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-align: center;
+      }
+      
+      h3 {
+        font-size: 16px;
+        margin-bottom: 0;
+        margin-top: 5px;
+      }
+      
+      small {
+        font-size: 0.4em;
+      }
+      
+      p {
+        padding: 10px;
+        margin: 0;
+      }
+      
+      a {
+        color: #33519d;
+        text-decoration: none;
+      }
+      
+      a:hover {
+        background: #33519d;
+        color: #fff;
+      
+        -webkit-border-radius: 2px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+      }
+      
+    </style>
+  </head>
+  <body>
+    <header>
+      <h1>Daaw<small>0.1</small></h1>
+    </header>
+    
+    <p style="font-weight:bold">
+      Daaw has been developed as part of <a href="http://socghop.appspot.com/gsoc/program/home/google/gsoc2010" target="_blank">Google Summer of Code 2010</a> by Josip Lisec and
+      mentored by David-Sarah Hopwood under <a href="http://tahoe-lafs.org/" target="_blank">Tahoe-LAFS</a> project.
+    </p>
+    <p>
+      Project is licenced under GNU General Public License version 2, or any later version.
+    </p>
+    
+    <h3>Notices</h3>
+    <p style="margin-top:0">
+      <a href="http://www.last.fm/legal/terms" target="_blank"><img src="http://cdn.last.fm/flatness/badges/lastfm_red_small.gif" align="right"/></a>
+      This application makes use of services provided by <a href="http://last.fm">Last.fm</a>.
+    </p>
+    <p>
+      Some of the icons are derived from the <a href="http://somerandomdude.com/projects/iconic/" target="_blank">Iconic Icon Set</a>, while
+      others are used without any modifications.
+    </p>
+    <p>
+      <a href="http://validator.xspf.org/referrer/" target="_blank">
+        <img src="http://svn.xiph.org/websites/xspf.org/images/banners/valid-xspf.png" style="border:0" align="right" title="This website produces valid XSPF playlist files."/>
+      </a>
+      All generated <a href="http://xspf.org/">XSPF</a> playlists are valid XSPF documents.
+    </p>
+    
+    <h3>Links</h3>
+    <ul>
+      <li><a href="http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1023" target="_blank">Bug tracker</a></li>
+      <li><a href="http://tahoe-music-player.tumblr.com/" target="_blank">Blog</a></li>
+    </ul>
+  </body>
+</html>
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 5
 //#require "doctemplates/Song.js"
 //#require "doctemplates/Artist.js"
 //#require "doctemplates/Album.js"
+//#require "doctemplates/Setting.js"
 
 (function () {
 var DocumentTemplate  = da.db.DocumentTemplate,
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 12
     Song              = DocumentTemplate.Song,
     Artist            = DocumentTemplate.Artist,
     Album             = DocumentTemplate.Album,
-    Goal              = da.util.Goal;
+    Setting           = DocumentTemplate.Setting,
+    Goal              = da.util.Goal,
+    GENRES            = da.util.GENRES;
 
 /** section: Controllers
  *  class CollectionScanner
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 32
    *  Starts a new scan using [[Application.caps.music]] as root directory.
    **/
   initialize: function (root) {
+    root = root || da.app.caps.music;
+    if(!root) {
+      this.finished = true;
+      return false;
+    }
+    
     console.log("collection scanner started");
     this.indexer = new Worker("js/workers/indexer.js");
     this.indexer.onmessage = this.onIndexerMessage.bind(this);
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 45
     this.scanner = new Worker("js/workers/scanner.js");
     this.scanner.onmessage = this.onScannerMessage.bind(this);
     
-    this.scanner.postMessage(root || da.app.caps.music);
+    this.scanner.postMessage(root);
     
     this.finished = false;
     
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 63
             this._found_files ? "Your patience has paid off." : "Make sure your files have proper ID3 tags." 
           ])
         );
+        
+        Setting.findById("last_scan").update({value: new Date()});
       }.bind(this)
     });
     
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 70
     da.ui.ROAR.alert(
       "Collection scanner started",
-      "We're scanning your musical collection. Soon new artists and songs\
-      should start popping up. Patience."
+      "Your musical collection is being scanned. You should see new artists showing \
+      up in the area above. Patience."
     );
   },
   
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 86
       this._goal.checkpoint("scanner");
       return;
     }
+    
     if(cap.debug) {
       console.log("SCANNER", cap.msg, cap.obj);
       return;
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 127
                   title:      tags.title,
                   track:      tags.track,
                   year:       tags.year,
-                  lyrics:     tags.lyrics,
-                  genre:      tags.genere,
+                  genre:      fixGenre(tags.genre),
                   artist_id:  artist_id,
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 129
-                  album_id:   album_id
+                  album_id:   album_id,
+                  plays:      0
                 });
                 
                 delete links;
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 183
   }
 });
 
-var SCANNER;
+function fixGenre (genre) {
+  return typeof genre === "number" ? genre : (GENRES.contains(genre) ? GENRES.indexOf(genre) : genre);
+}
+
+Setting.register({
+  id:           "last_scan",
+  group_id:     "CollectionScanner",
+  representAs:  "text",
+  title:        "Last scan",
+  help:         "The date your collection was scanned.",
+  value:        new Date(0)
+});
+
+da.app.addEvent("ready", function () {
+  var last_scan = Setting.findById("last_scan"),
+       five_days_ago = (new Date()) - 5*24*60*60*1000;
+  if((new Date(last_scan.get("value"))) < five_days_ago)
+    da.controller.CollectionScanner.scan();
+});
+
+var CS;
 /**
  * da.controller.CollectionScanner
  * Public interface of [[CollectionScanner]].
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 214
    *  Starts scanning music directory
    **/
   scan: function (cap) {
-    if(!SCANNER || (SCANNER && SCANNER.finished))
-      SCANNER = new CollectionScanner(cap);
+    if(!CS || (CS && CS.finished))
+      CS = new CollectionScanner(cap);
+    else if(cap && cap.length)
+      CS.scanner.postMessage(cap);
   },
   
   /**
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 224
    *  da.controller.CollectionScanner.isScanning() -> true | false
    **/
   isScanning: function () {
-    return SCANNER && !SCANNER.finished;
+    return CS ? !CS.finished : false;
   }
 };
 
hunk ./contrib/musicplayer/src/controllers/CollectionScanner.js 229
 da.app.fireEvent("ready.controller.CollectionScanner", [], 1);
+
 })();
hunk ./contrib/musicplayer/src/controllers/Navigation.js 69
       this.createHeader();
     
     this.column = new Navigation.columns[this.column_name]({
-      id: this.column_name,
-      filter: options.filter,
-      parentElement: this._el
+      id:             this.column_name,
+      filter:         options.filter,
+      parentElement:  this._el,
+      parentColumn:   this.parent_column ? this.parent_column.column : null
     });
     Navigation.adjustColumnSize(this.column);
 
hunk ./contrib/musicplayer/src/controllers/Navigation.js 108
    **/
   createHeader: function () {
     this.header = new Element("a", {
-      "class": "column_header",
-      href: "#"
+      "class":  "column_header",
+      href:     "#"
     });
     
     this.header.addEvent("click", function (event) {
hunk ./contrib/musicplayer/src/controllers/Navigation.js 119
     });
     
     this._el.grab(this.header.grab(new Element("span", {
-      html: this.column_name,
-      "class": "column_title"
+      html:     Navigation.columns[this.column_name].title,
+      "class":  "column_title"
     })));
     
     return this;
hunk ./contrib/musicplayer/src/controllers/Navigation.js 134
    **/
   createMenu: function () {
     var filters = this.column.constructor.filters,
-        items = {};
+        items = {},
+        column;
     
     if(!filters || !filters.length)
       return false;
hunk ./contrib/musicplayer/src/controllers/Navigation.js 141
     
     items[this.column_name] = {html: this.column.constructor.title, "class": "checked", href: "#"};
-    for(var n = 0, m = filters.length; n < m; n++)
-      items[filters[n]] = {html: filters[n], href: "#"};
+    for(var n = 0, m = filters.length; n < m; n++) {
+      column = Navigation.columns[filters[n]];
+      if(!column.hidden)
+        items[filters[n]] = {html: column.title, href: "#"};
+    }
     
     this.menu = new Menu({
       items: items
hunk ./contrib/musicplayer/src/controllers/Navigation.js 155
     
     this.menu.addEvent("show", function () {      
       var header = this.header;
-      header.addClass("active");
+      header.addClass("active_menu");
       // adjusting menu's width to the width of the header
       header.retrieve("menu").toElement().style.width = header.getWidth() + "px";
     }.bind(this));
hunk ./contrib/musicplayer/src/controllers/Navigation.js 161
     
     this.menu.addEvent("hide", function () {
-      this.header.removeClass("active");
+      this.header.removeClass("active_menu");
     }.bind(this));
     
     if(filters && filters.length)
hunk ./contrib/musicplayer/src/controllers/Navigation.js 209
     if(element)
       element.addClass("checked");
     
-    header.getElement(".column_title").set("text", filter_name);
+    header.getElement(".column_title").set("text", Navigation.columns[filter_name].title);
   },
   
   /**
hunk ./contrib/musicplayer/src/controllers/Navigation.js 292
   initialize: function () {
     var root_column = new NavigationColumnContainer({columnName: "Root"});
     root_column.menu.removeItem("Root");
-    root_column.menu.addItems({
-      separator_1: Menu.separator,
-      search:     {html: "Search",    href:"#"},
-      settings:   {html: "Settings",  href:"#", events: {click: da.controller.Settings.show}},
-      help:       {html: "Help",      href:"#"}
-    });
     
     var artists_column = new NavigationColumnContainer({
       columnName: "Artists",
hunk ./contrib/musicplayer/src/controllers/Navigation.js 302
     root_column.header = artists_column.header;
     
     this._header_height = artists_column.header.getHeight();
+    this._player_pane_width = $("player_pane").getWidth();
     window.addEvent("resize", function () {
       var columns = Navigation.activeColumns,
           n = columns.length,
hunk ./contrib/musicplayer/src/controllers/Navigation.js 312
       while(n--)
         columns[n].column._el.setStyles({
           height: height,
-          width: width
-        });
+          width:  width
+        }).fireEvent("resize");
       
hunk ./contrib/musicplayer/src/controllers/Navigation.js 315
-      //$("navigation_pane").style.width = width*3 + "px";
       $("navigation_pane").style.height = window.getHeight() + "px";
     }.bind(this));
     
hunk ./contrib/musicplayer/src/controllers/Navigation.js 328
    *  Adjusts column's height to window.
    **/
   adjustColumnSize: function (column) {
-    column._el.setStyles({
-      height: window.getHeight() - this._header_height,
+    var el = column.toElement();
+    el.style.height = (window.getHeight() - this._header_height) + "px";
       // -1 for te right border
hunk ./contrib/musicplayer/src/controllers/Navigation.js 331
-      width: (window.getWidth() - $("player_pane").getWidth())/3 - 1
-    });
+    el.style.width = ((window.getWidth() - this._player_pane_width)/3 - 1) + "px";
+    el.fireEvent("resize");
+    el = null;
   },
   
   /**
hunk ./contrib/musicplayer/src/controllers/Navigation.js 337
-   *  da.controller.Navigation.registerColumn(name, filters, column) -> undefined
-   *  - name (String): name of the column.
-   *  - filters (Array): names of the columns which can accept filter created (with [[da.ui.NavigationColumn#createFilter]]) by this one.
+   *  da.controller.Navigation.registerColumn(id[, title], filters, column) -> undefined
+   *  - id (String): id of the column.
+   *  - title (String): name of the column. Defaults to the value `id`, if not provided.
+   *  - filters (Array): names of the columns which can accept filter created
+   *    (with [[da.ui.NavigationColumn#createFilter]]) by this one.
    *  - column (da.ui.NavigationColumn): column class.
    *  
hunk ./contrib/musicplayer/src/controllers/Navigation.js 344
-   *  `name` (renamed to `title`) and `filters` will be added to `column` as static methods.
+   *  #### Notes
+   *  `title` and `filters` will be added to `column` as class properties.
+   *  If the `id` begins with an underscore, the column will be considered private
+   *  and it won't be visible in the menus.
    **/
hunk ./contrib/musicplayer/src/controllers/Navigation.js 349
-  registerColumn: function (name, filters, col) {
+  registerColumn: function (id, title, filters, col) {
+    if(arguments.length === 3) {
+      col     = filters;
+      filters = title;
+      title   = id;
+    }
     col.extend({
hunk ./contrib/musicplayer/src/controllers/Navigation.js 356
-      title: name,
-      filters: filters || []
+      title:   title,
+      filters: filters || [],
+      hidden:  id[0] === "_"
     });
     
hunk ./contrib/musicplayer/src/controllers/Navigation.js 361
-    this.columns[name] = col;
-    if(name !== "Root")
-      this.columns.Root.filters.push(name);
+    this.columns[id] = col;
+    if(id !== "Root")
+      this.columns.Root.filters.push(id);
     
     // TODO: If Navigation is initialized
     // then Root's menu has to be updated.
hunk ./contrib/musicplayer/src/controllers/Player.js 55
   },
   _loading: [],
   
+  play_mode: null,
+  
   /**
    *  new Player()
    *  Sets up soundManager2 and initializes player's interface.
hunk ./contrib/musicplayer/src/controllers/Player.js 62
    **/
   initialize: function () {
-    soundManager.onready(function () {
-      da.app.startup.checkpoint("soundmanager");
-    });
+    //soundManager.onready(function () {
+    //  da.app.startup.checkpoint("soundmanager");
+    //});
     
     da.app.addEvent("ready", this.initializeUI.bind(this));
     
hunk ./contrib/musicplayer/src/controllers/Player.js 79
     window.fireEvent("resize");
     
     this.progress_bar = new SegmentedProgressBar(150, 5, {
-      track: "#33519d",
+      track: "#339D4C",
       load:  "#C1C6D4"
     });
hunk ./contrib/musicplayer/src/controllers/Player.js 82
+    var load_grad = this.progress_bar.ctx.createLinearGradient(0, 0, 0, 5);
+    load_grad.addColorStop(0, "#6f7074");
+    load_grad.addColorStop(1, "#cfccd7");
+    this.progress_bar.segments.load.options.foreground = load_grad;
+    load_grad = null;
+    
+    var track_grad = this.progress_bar.ctx.createLinearGradient(0, 0, 0, 5);
+    track_grad.addColorStop(0, "#339D4C");
+    track_grad.addColorStop(1, "#326732");
+    this.progress_bar.segments.track.options.foreground = track_grad;
+    track_grad = null;
     
     this.progress_bar.toElement().id = "track_progress";
     this.progress_bar.toElement().addEvents({
hunk ./contrib/musicplayer/src/controllers/Player.js 96
-      // Has some issues in Firefox - the object's width also gets scaled
-      /*
-      mouseenter: function () {
-        this.tween("height", 15);
-      },
-      mouseleave: function () {
-        this.tween("height", 5);
-      },
-      */
       mouseup: function (e) {
         var sound = Player.nowPlaying.sound;
         if(!sound)
hunk ./contrib/musicplayer/src/controllers/Player.js 103
         
         var p = e.event.offsetX / this.getWidth();
         sound.setPosition(sound.durationEstimate * p);
+      },
+      mouseover: function () {
+        Player.elements.position.fade("in");
       }
     });
     
hunk ./contrib/musicplayer/src/controllers/Player.js 114
       wrapper:        new Element("div",  {id: "song_details"}),
       cover_wrapper:  new Element("div",  {id: "song_album_cover_wrapper"}),
       album_cover:    new Element("img",  {id: "song_album_cover"}),
-      song_title:     new Element("h2",   {id: "song_title"}),
-      album_title:    new Element("span", {id: "song_album_title"}),
-      artist_name:    new Element("span", {id: "song_artist_name"}),
-      controls:       new Element("div",  {id: "player_controls", "class": "no_selection"}),
-      play:           new Element("a",    {id: "play_button", href: "#"}),
-      next:           new Element("a",    {id: "next_song", href: "#"}),
-      prev:           new Element("a",    {id: "prev_song", href: "#"})
+      song_title:     new Element("h2",   {id: "song_title",        html: "Unknown"}),
+      album_title:    new Element("span", {id: "song_album_title",  html: "Unknown"}),
+      artist_name:    new Element("span", {id: "song_artist_name",  html: "Unknown"}),
+      controls:       new Element("div",  {id: "player_controls",   "class": "no_selection"}),
+      play:           new Element("a",    {id: "play_button",       href: "#"}),
+      next:           new Element("a",    {id: "next_song",         href: "#"}),
+      prev:           new Element("a",    {id: "prev_song",         href: "#"}),
+      position:       new Element("span", {id: "song_position",     href: "#"})
     };
     
     var play_wrapper = new Element("div", {id: "play_button_wrapper"});
hunk ./contrib/musicplayer/src/controllers/Player.js 126
     play_wrapper.grab(els.play);
-    els.controls.adopt(els.prev, play_wrapper, els.next, this.progress_bar.toElement());
+    els.controls.adopt(
+      els.prev, play_wrapper, els.next,
+      this.progress_bar.toElement(), els.position
+    );
     
     els.wrapper.grab(els.song_title);
     els.wrapper.appendText("from ");
hunk ./contrib/musicplayer/src/controllers/Player.js 143
    
     this._el.adopt(els.info_block);
     
+    els.position.set("tween", {duration: "short", link: "cancel"});
+    
     this._el.style.visibility = "hidden";
     this._visible = false;
     
hunk ./contrib/musicplayer/src/controllers/Player.js 148
-    var next = els.next, prev = els.prev;
+    // We're using them in mouseover event, 
+    // to avoid creating another closure.
+    var next = els.next,
+        prev = els.prev;
     els.play.addEvents({
       click: function () {
         Player.playPause();
hunk ./contrib/musicplayer/src/controllers/Player.js 165
       }
     });
     
-    var hideNextPrev = function () {
-      next.fade("out");
-      prev.fade("out");
-    };
+    next.addEvent("click", function () { Player.playNext() });
+    next.set("tween", {duration: "short", link: "cancel"});
     
hunk ./contrib/musicplayer/src/controllers/Player.js 168
-    els.next.addEvents({
-      click:   function () { Player.playNext() }
-    });
-    els.next.set("tween", {duration: "short", link: "cancel"});
+    prev.addEvent("click", function () { Player.playPrev() });
+    prev.set("tween", {duration: "short", link: "cancel"});
     
hunk ./contrib/musicplayer/src/controllers/Player.js 171
-    els.prev.addEvents({
-      click:    function () { Player.playPrev() } 
+    els.controls.addEvent("mouseleave", function () {
+      next.fade("out");
+      prev.fade("out");
+      Player.elements.position.fade("out");
     });
hunk ./contrib/musicplayer/src/controllers/Player.js 176
-    els.prev.set("tween", {duration: "short", link: "cancel"});
     
hunk ./contrib/musicplayer/src/controllers/Player.js 177
-    els.controls.addEvent("mouseleave", hideNextPrev);
+    this.play_mode = "normal";
     
     this.elements = els;
     delete els;
hunk ./contrib/musicplayer/src/controllers/Player.js 182
     delete play_wrapper;
+    delete play_modes;
   },
   
   /**
hunk ./contrib/musicplayer/src/controllers/Player.js 214
       np.sound.stop();
     
     this._loading.push(song.id);
+    var _np_update_buffer = +new Date();
     this.sounds[song.id] = soundManager.createSound({
       id: song.id,
       url: "/uri/" + encodeURIComponent(song.id),
hunk ./contrib/musicplayer/src/controllers/Player.js 223
       stream: true,
       
       onload: function () {
-        this._loading.remove(song.id);
-        
         if(!song.get("duration"))
           song.update({duration: this.duration});
hunk ./contrib/musicplayer/src/controllers/Player.js 225
+        
+        if(!Player.progress_bar.ticks)
+          Player.progress_bar.ticks = Math.round(this.duration / (60 * 1000));
+        
+        Player._loading.remove(song.id);
       },
       
       onplay: function () {
hunk ./contrib/musicplayer/src/controllers/Player.js 237
       },
       
       whileloading: function () {
+        // It will usually take less time to load the song than to complete the
+        // playback so we're not buffering the updates here.
         if(Player.nowPlaying.sound === this)
           Player.progress_bar.setProgress("load", this.bytesLoaded/this.bytesTotal);
       },
hunk ./contrib/musicplayer/src/controllers/Player.js 244
       
       whileplaying: function () {
-        if(Player.nowPlaying.sound === this) {
-          Player.progress_bar.setProgress("track", this.position / this.durationEstimate);
-          Player.progress_bar.toElement().title = this.position + "/" + this.durationEstimate;  
+        var d = +new Date();
+        if(d - _np_update_buffer > 1000 && Player.nowPlaying.sound === this) {
+          var pb = Player.progress_bar;
+          pb.setProgress("track", this.position / this.durationEstimate);
+          Player.elements.position.set("text",
+            (new Date(this.position)).format("%M:%S") + " of " + (new Date(this.durationEstimate)).format("%M:%S")
+          );
+          pb = null;
+          _np_update_buffer = d;
         }
       },
       
hunk ./contrib/musicplayer/src/controllers/Player.js 257
       onfinish: function () {
+        song.update({plays: song.get("plays") + 1});
+        
         if(Player.nowPlaying.sound === this)
           Player.playbackFinished();
       }
hunk ./contrib/musicplayer/src/controllers/Player.js 270
     if(!this._visible) {
       this._visible = true;
       this._el.style.visibility = "visible";
+      this.elements.position.position({
+        relativeTo: $("track_progress"),
+        position:   "centerBottom",
+        edge:       "centerTop",
+        offset:     {y: 2}
+      });
     }
   },
   
hunk ./contrib/musicplayer/src/controllers/Player.js 327
       delete els;
     });
     
+    if(song.get("duration"))
+      this.progress_bar.ticks = Math.round(song.get("duration") / (60*1000));
+    
     da.controller.Player.fireEvent("play", [song]);
     song = null;
     
hunk ./contrib/musicplayer/src/controllers/Player.js 479
   },
   
   /**
+   *  Player.switchPlayMode(mode) -> undefined
+   *  - mode (String): `normal` or `shuffle`.
+   **/
+  switchPlayMode: function (mode) {
+    var old = this.play_mode;
+    this.play_mode = mode;
+    
+    if(old === "shuffle" || mode === "shuffle") {
+      var np = this.nowPlaying.song;
+      if(old === "shuffle") {
+        this.playlist = this._normalised_playlist || [];
+        if(np)
+          this._playlist_pos = this.playlist.indexOf(np.id);
+        else
+          this._playlist_pos = 0;
+
+        delete this._normalised_playlist;
+      } else if(mode === "shuffle") {
+        this._normalised_playlist = this.playlist;
+        // .shuffle() modifies the array itself
+        this.playlist = $A(this.playlist).shuffle();
+        
+        // moving now playing song to the beginning of the playlist
+        if(np)
+          this.playlist.erase(np.id).unshift(np.id);
+        
+        this._playlist_pos = 0;
+      }
+      
+      delete np;
+    }
+    
+    
+    $("player_toggle_shuffle_menu_item").set("text",
+      mode === "shuffle" ? "Turn shuffle off" : "Turn shuffle on"
+    );
+    
+    this.updateNextPrev();
+  },
+  
+  /**
    *  Player#free() -> undefined
    *
    *  Frees memory taken by loaded songs. This method is ran about every 
hunk ./contrib/musicplayer/src/controllers/Player.js 526
    *  eight minutes and it destroys all SMSound objects which were played
    *  over eight minutes ago, ie. we're caching only about two songs in memory.
    *
-   *  #### Links
+   *  #### External resources
    *  * (The Universality of Song Length?)[http://a-candle-in-the-dark.blogspot.com/2010/02/song-length.html]
    *
    **/
hunk ./contrib/musicplayer/src/controllers/Player.js 537
     for(var id in this.sounds) {
       sound = this.sounds[id];
       if(this.sounds.hasOwnProperty(id)
-        && this.nowPlaying.song.id !== id
-        && (sound._last_played >= eight_mins_ago || !sound.loaded))
-      {
-        console.log("Freed sound ", id, sound._last_played);
+      && (this.nowPlaying.song.id !== id)
+      && (sound._last_played >= eight_mins_ago || !sound.loaded)) {
+        console.log("Freed sound", id, sound._last_played);
         sound.destruct();
         delete this.sounds[id];
       }
hunk ./contrib/musicplayer/src/controllers/Player.js 545
     }
     
-    delete sound;
+    sound = null;
   }
 };
 
hunk ./contrib/musicplayer/src/controllers/Player.js 551
 Player.initialize();
 
-// Check is performed every four minutes
-setTimeout(function () {
+setInterval(function () {
   Player.free();
 }, 8*60*1000);
 
hunk ./contrib/musicplayer/src/controllers/Player.js 649
     if(!playlist || $type(playlist) !== "array")
       return false;
     
+    if(Player.play_mode === "shuffle") {
+      Player._normalised_playlist = $A(playlist);
+      playlist.shuffle();
+    }
+    
     Player.playlist = playlist;
hunk ./contrib/musicplayer/src/controllers/Player.js 655
-    Player._playlist_pos = 0;
+    if(Player.nowPlaying.song)
+      Player._playlist_pos = playlist.indexOf(Player.nowPlaying.song.id)
+    else
+      Player._playlist_pos = 0;
+    
+    Player.updateNextPrev();
+  },
+  
+  /**
+   *  da.controller.Player.getPlaylist() -> [String, ...]
+   *  Returns an array with ids of the songs belonging to the playlist.
+   **/
+  getPlaylist: function () {
+    return Player.playlist;
   },
   
   /**
hunk ./contrib/musicplayer/src/controllers/Player.js 676
    **/
   nowPlaying: function () {
     return Player.nowPlaying.song;
+  },
+  
+  /**
+   *  da.controller.Player#setPlayMode(mode) -> undefined
+   *  - mode (String): `normal`, `shuffle` or `repeat`. (all lowercase)
+   **/
+  setPlayMode: function (mode) {
+    var old = Player.play_mode;
+    if(!mode || mode === old)
+      return false;
+    
+    Player.switchPlayMode(mode);
+  },
+  
+  /**
+   *  da.controller.Player#toggleMute() -> Boolean
+   *  Returns `true` if the sound volume will be set to 0, `false` otherwise.
+   **/
+  toggleMute: function () {
+    var muted = Player.nowPlaying.sound.muted;
+    da.vendor.soundManager[muted ? "unmute" : "mute"]();
+    $("player_mute_menu_item").set("text", muted ? "Mute" : "Unmute");
+    
+    return !muted;
+  },
+  
+  _toggleShuffle: function () {
+    if(Player.play_mode === "shuffle")
+      this.setPlayMode("normal");
+    else
+      this.setPlayMode("shuffle");
   }
 };
 $extend(da.controller.Player, new Events());
addfile ./contrib/musicplayer/src/controllers/Playlist.js
hunk ./contrib/musicplayer/src/controllers/Playlist.js 1
+//#require "libs/ui/Dialog.js"
+//#require "libs/ui/Menu.js"
+//#require "libs/util/PlaylistExporters.js"
+//#require "doctemplates/Playlist.js"
+//#require "doctemplates/Song.js"
+
+(function () {
+var Playlist        = da.db.DocumentTemplate.Playlist,
+    Song            = da.db.DocumentTemplate.Song,
+    Dialog          = da.ui.Dialog,
+    Menu            = da.ui.Menu,
+    playlistExport  = da.util.playlistExporter,
+    SONG_PREFIX     = "playlist_song_";
+
+/** section: Controllers
+ *  class PlaylistEditor
+ **/
+var PlaylistEditor = new Class({
+  /**
+   *  new PlaylistEditor(playlist)
+   *  - playlist (da.db.DocumentTemplate.Playlist): playlist wich will be edited.
+   **/
+  initialize: function (playlist) {
+    this.playlist = playlist;
+    
+    var playlist_details = (new Element("div", {
+        id: "playlist_details"
+      })).adopt(
+        new Element("label", {html: "Name of the playlist:", "for": "playlist_title"}),
+        new Element("input", {type: "text", value: playlist.get("title"), id: "playlist_title"}),
+        
+        new Element("label", {html: "Description:", "for": "playlist_description"}),
+        (new Element("textarea", {id: "playlist_description", value: playlist.get("description")}))
+      ),
+      songs = (new Element("ol", {
+        id: "playlist_songs",
+        "class": "navigation_column"
+      })),
+      footer = (new Element("div", {
+        "class": "footer"
+      })).adopt(
+        new Element("button", {
+          id: "playlist_delete",
+          html: "Delete this playlist",
+          events: {
+            click: this.destroyPlaylist.bind(this)
+          }
+        }),
+        new Element("button", {
+          id: "playlist_add_more_songs",
+          html: "Add more songs",
+          events: {
+            click: this.showSearchDialog.bind(this)
+          }
+        }),
+        new Element("button", {
+          id: "playlist_export",
+          html: "Export &#x25BC;",
+          events: {
+            mousedown: function (event) {
+              this.export_menu.show(event);
+            }.bind(this)
+          }
+        }),
+        new Element("input", {
+          type: "submit",
+          id: "playlist_save",
+          value: "Save",
+          events: {
+            click: this.save.bind(this)
+          }
+        })
+      ),
+      song_ids  = $A(playlist.get("song_ids")),
+      n         = song_ids.length;
+    
+    while(n--)
+      song_ids[n] = this.renderItem(Song.findById(song_ids[n]));
+    
+    songs.adopt(song_ids);
+    songs.addEvent("click:relay(.action)", this.removeSong.bind(this));
+    
+    this._sortable = new Sortables(songs, {
+      opacity:    0,
+      revert:     false,
+      clone:      true,
+      constrain:  true
+    });
+    
+    this._el = (new Element("div", {
+      id: "playlist_editor_" + playlist.id,
+      "class": "playlist_editor"
+    })).adopt(playlist_details, songs, footer);
+    
+    this.dialog = new Dialog({
+      title: "Edit playlist",
+      html: (new Element("div", {
+        "class": "playlist_editor_wrapper no_selection"
+      })).grab(this._el),
+      show:               true,
+      closeButton:        true,
+      hideOnOutsideClick: false,
+      destroyOnHide:      true,
+      onHide:             this.destroy.bind(this)
+    });
+    
+    var export_formats = {};
+    for(var format in playlistExport)
+      export_formats[format] = {html: "." + format, href: "#"};
+    
+    this.export_menu = new Menu({
+      items: export_formats,
+      position: {
+        position:   "center",
+        edge:       "center",
+        relativeTo: "playlist_export"
+      },
+      onClick: this.exportPlaylist.bind(this)
+    });
+  },
+  
+  /**
+   *  PlaylistEditor#removeSong(event, element) -> undefined
+   **/
+  removeSong: function (event, element) {
+    var el = element.parentNode;
+    this._sortable.removeItems(el);
+    el.set("slide", {duration: 360, mode: "horizontal"});
+    el.slide("out").fade("out").get("slide").chain(function () {
+      el.destroy();
+      delete el;
+    }.bind(this));
+  },
+  
+  /**
+   *  PlaylistEditor#destroyPlaylist(event, element) -> undefined
+   **/
+  destroyPlaylist: function (event, element) {
+    if(!confirm("Are you sure?"))
+      return;
+    
+    this.playlist.destroy();
+    this.destroy();
+  },
+  
+  /**
+   *  PlaylistEditor#save() -> undefined
+   **/
+  save: function () {
+    var ids = this._sortable.serialize(),
+         _pref_l = SONG_PREFIX.length,
+         n = ids.length;
+    
+    while(n--)
+      if(ids[n])
+        ids[n] = ids[n].slice(_pref_l);
+    
+    this.playlist.update({
+      title:       $("playlist_title").value,
+      description: $("playlist_description").value,
+      song_ids:    ids.clean()
+    });
+  },
+  
+  exportPlaylist: function (format) {
+    var exporter = playlistExport[format];
+    if(!exporter)
+      return false;
+    
+    exporter(this.playlist);
+  },
+  
+  renderItem: function (song) {
+    return new Element("li", {
+      id:   SONG_PREFIX + song.id,
+      "class": "column_item"
+    }).adopt(
+      new Element("a", {
+        title:    "Remove this song from the playlist",
+        href:     "#",
+        "class":  "action"
+      }),
+      new Element("span", {html: song.get("title")})
+    );
+  },
+  
+  showSearchDialog: function () {
+    var addSearchResult = this.addSearchResult.bind(this);
+    
+    da.controller.Search.search("/.*?/", ["Song"], {
+      onComplete: function (results, column) {
+        console.log("Hacking search results");
+
+        column.removeEvents("click");
+        column.addEvent("click", addSearchResult);
+        
+      }.bind(this)
+    });
+  },
+  
+  addSearchResult: function (item) {
+    if($("playlist_song_" + item.id))
+      return false;
+    
+    item = this.renderItem(Song.findById(item.id));
+    $("playlist_songs").grab(item);
+    this._sortable.addItems(item);
+  },
+  
+  destroy: function () {
+    this.export_menu.destroy();
+    this.playlist = null;
+    delete this.dialog;
+    delete this.export_menu;
+    delete this._el;
+  }
+});
+
+/** section: Controllers
+ *  class AddToPlaylistDialog
+ **/
+var AddToPlaylistDialog = new Class({
+  /**
+   *  new AddToPlaylistDialog(song)
+   *  - song (da.db.DocumentTemplate.Song): song which will be added to selected playlist.
+   **/
+  /**
+   *  AddToPlaylistDialog#song -> da.db.DocumentTemplate.Song
+   **/
+  initialize: function (song) {
+    this.song = song;
+    
+    var playlist_selector = new Element("select", {id: "playlist_selector"}),
+        playlists = Playlist.view().rows,
+        n = playlists.length;
+    
+    
+    while(n--)
+      playlist_selector.grab(new Element("option", {
+        value: playlists[n].id,
+        html: playlists[n].value.title
+      }));
+    
+    playlist_selector.grab(new Element("option", {
+      value: "_new_playlist",
+      html: "New playlist"
+    }));
+    
+    playlist_selector.addEvent("change", this.selectionChange.bind(this));
+    
+    this._new_playlist_form = (new Element("div", {id: "add_to_new_pl"})).adopt(
+      new Element("label",    {html: "Title:", "for": "add_to_new_pl_title"}),
+      new Element("input",    {id:   "add_to_new_pl_title", type: "text"}),
+      new Element("label",    {html: "Description:", "for": "add_to_new_pl_description"}),
+      new Element("textarea", {id:   "add_to_new_pl_description"})
+    );
+    
+    this._el = (new Element("form", {
+      id: "add_to_pl_dialog"
+    }).adopt(
+      new Element("div",    {id: "add_to_pl_playlists"}).adopt(
+        new Element("label",  {html: "Choose an playlist:", "for": "playlist_selector"}),
+        playlist_selector,
+        this._new_playlist_form
+      ),
+      (new Element("div", {"class": "footer"})).grab(
+        new Element("input", {
+          type: "submit",
+          value: "Okay",
+          events: {
+            click: this.save.bind(this)
+          }
+        })
+      )
+    ));
+    
+    this._el.addEvent("submit", this.save.bind(this));
+    
+    var title = (new Element("div", {"class": "dialog_title no_selection"})).adopt(
+      new Element("img",  {
+        src: "resources/images/album_cover_1.png",
+        id: "add_to_pl_album_cover"
+      }),
+      new Element("span", {html: song.get("title"), "class": "title"})
+    );
+    
+    this.dialog = new Dialog({
+      title: title,
+      html: (new Element("div", {"class": "add_to_pl_wrapper"})).grab(this._el),
+      closeButton:    true,
+      show:           true,
+      destroyOnHide:  true
+    });
+    
+    this.song.get("album", function (album) {
+      title.appendText("from ").grab(
+        new Element("span", {html: album.get("title")})
+      );
+      
+      var album_covers = album.get("album_cover_urls");
+      if(album_covers && album_covers[1])
+        $("add_to_pl_album_cover").src = album_covers[1];
+    });
+    
+    this.song.get("artist", function (artist) {
+      title.appendText(" by ").adopt(
+        new Element("span", {html: artist.get("title")}),
+        new Element("div", {"class": "clear"})
+      );
+    });
+    
+    this._playlist_selector = playlist_selector;
+    playlist_selector = null;
+  },
+  
+  /**
+   *  AddToPlaylistDialog#save([event]) -> undefined
+   **/
+  save: function (event) {
+    if(event)
+      Event.stop(event);
+    
+    var playlist_id = this._playlist_selector.value;
+    if(playlist_id === "_new_playlist") {
+      var title = $("add_to_new_pl_title");
+      if(!title.value.length)
+        return title.focus();
+        
+      Playlist.create({
+        title:        title.value,
+        description:  $("add_to_new_pl_description").value,
+        song_ids:     [this.song.id]
+      });
+    } else {
+      var playlist = Playlist.findById(playlist_id);
+      playlist.get("song_ids").include(this.song.id);
+      playlist.save();
+      playlist = null;
+    }
+    
+    this.destroy();
+  },
+  
+  /**
+   *  AddToPlaylistDialog#selectionChange() -> undefined
+   *  Called on `change` event by playlist selector.
+   **/
+  selectionChange: function () {
+    if(this._playlist_selector.value === "_new_playlist")
+      this._new_playlist_form.show();
+    else
+      this._new_playlist_form.hide();
+  },
+  
+  /**
+   *  AddToPlaylistDialog#destroy() -> undefined
+   **/
+  destroy: function () {
+    this.song = null;
+    this.dialog.destroy();
+    delete this.dialog;
+    delete this._el;
+    delete this._playlist_selector;
+    delete this._new_playlist_form;
+  }
+});
+
+/**
+ * da.controller.Playlist
+ **/
+da.controller.Playlist = {
+  /**
+   *  da.controller.Playlist.edit(playlist) -> undefined
+   *  - playlist (da.db.DocumentTemplate.Playlist): playlist which will be edited.
+   **/
+  edit: function (playlist) {
+    new PlaylistEditor(playlist);
+  },
+  
+  /**
+   *  da.controller.Playlist.addSong([song]) -> undefined
+   *  - song (da.db.DocumentTemplate.Song): song which will be added to an playlist.
+   *    If not provided, [[da.controller.Player.nowPlaying]] will be used.
+   **/
+  addSong: function (song) {
+    if(!song)
+      song = da.controller.Player.nowPlaying();
+    if(!song)
+      return false;
+   
+    new AddToPlaylistDialog(song);
+  }
+};
+
+da.app.fireEvent("ready.controller.Playlist", [], 1);
+})();
addfile ./contrib/musicplayer/src/controllers/Search.js
hunk ./contrib/musicplayer/src/controllers/Search.js 1
+//#require "libs/ui/Dialog.js"
+//#require "controllers/default_columns.js"
+
+(function () {
+var Dialog      = da.ui.Dialog,
+    SongsColumn = da.controller.Navigation.columns.Songs,
+    Playlist    = da.db.DocumentTemplate.Search,
+    ACTIVE      = null;
+
+/** section: Controllers
+ *  class SearchResults < da.controller.Navigation.columns.Songs
+ **/
+var SearchResults = new Class({
+  Extends: SongsColumn,
+  
+  options: {
+    id:         "search_results",
+    rowHeight:  50
+  },
+  
+  view: {
+    id:        null,
+    temporary: true,
+    
+    map: function (doc, emit) {
+      var type = doc.type,
+          filters = this.options.filters,
+          query = this.options.query;
+      
+      // we have to emit every document because the filters
+      // represent OR operation, ie. if user selected ["Title", "Album"]
+      // it means that only one of those filters have to be satisfied
+      // in order fot the song to show up in the search results.
+      
+      emit(type, type === "Song" ? {
+        id:         doc.id,
+        title:      doc.title,
+        artist_id:  doc.artist_id,
+        album_id:   doc.album_id,
+        track:      doc.track,
+        match:      query.test(doc.title)
+      } : {
+        id:     doc.id,
+        title:  doc.title,
+        match:  query.test(doc.title)
+      });
+    },
+    
+    reduce: function (key, values, rereduce) {
+      var query = this.options.query;
+      
+      if(key !== "Song") {
+        var _values = {},
+            n = values.length,
+            val;
+        
+        while(n--) {
+          val = values[n];
+          _values[val.id] = val;
+        }
+        
+        return _values;
+      } else {
+        var n = values.length,
+            val;
+        
+        while(n--) {
+          val = values[n];
+          values[n] = {
+            id:   val.id,
+            key:  val.title,
+            value: val
+          };
+        }
+          
+        return values;
+      }
+    }
+  },
+  
+  mapReduceFinished: function (view) {
+    var songs = view.getRow("Song");
+    if(!songs)
+      return this.parent({rows: []});
+    
+    var n = songs.length,
+        filters = this.options.filters,
+        query  = this.options.query,
+        matches;
+    
+    this._albums = view.getRow("Album");
+    this._artists = view.getRow("Artist");
+    
+    
+    while(n--) {
+      song = songs[n].value;
+      matches = [];
+      if(filters.contains("Song"))
+        matches.push(song.match);
+      if(filters.contains("Album"))
+        matches.push(this._albums[song.album_id].match);
+      if(filters.contains("Artist"))
+        matches.push(this._artists[song.artist_id].match);
+      
+      var m = matches.length, false_count = 0;
+      while(m--)
+        if(!matches[m])
+          false_count++;
+            
+      if(false_count === matches.length)
+        delete songs[n];
+    }
+ 
+    songs = songs.clean();
+    this.parent({
+      rows: songs
+    });
+    
+    this._finished = true;
+    Search.search_field.disabled = false;
+    
+    this.fireEvent("complete", [songs, this], 1);
+  },
+
+  renderItem: function (index) {
+    var item    = this.getItem(index),
+        data    = item.value,
+        query   = this.options.query,
+        artist  = this._artists[data.artist_id].title,
+        album   = this._albums[data.album_id].title;
+    
+    return (new Element("a", {
+      id:       "search_results_column_item_" + item.id,
+      href:     "#",
+      title:    "{0} by {1}".interpolate([data.title, artist]),
+      "class":  index % 2 ? "even" : "odd"
+    }).adopt([
+      new Element("span", {html: index + 1,   "class": "result_number"}),
+      new Element("span", {
+        html: data.title.replace(query, underline),
+        "class": "title"
+      }),
+      new Element("span", {
+        html: "{0}from <i>{1}</i> by <i>{2}</i>".interpolate([
+          data.track ? "track no." + data.track + " " : "",
+          album.replace(query, underline), artist.replace(query, underline)
+        ]),
+        "class": "subtitle"
+      })
+    ]));
+  },
+  
+  compareFunction: function (a, b) {
+    a = a.key + a.id;
+    b = b.key + b.id;
+    
+    if(a < b) return -1;
+    if(a > b) return 1;
+    return 0;
+  }
+});
+
+function underline (str) {
+  return "<u>" + str + "</u>";
+}
+
+
+/** section: Controllers
+ * class Search
+ **/
+var Search = ({
+  /**
+   *  Search.query -> String
+   *  Current search query
+   **/
+  query: "",
+  
+  /**
+   *  Search.active_filters -> [String, ]
+   *  List of active filters, possible values are:
+   *  * `Song`,
+   *  * `Album` or
+   *  * `Artist`
+   *
+   **/
+  active_filters: ["Song"],
+  
+  /**
+   *  Search.results_column -> SearchResults
+   **/
+  results_column: null,
+  
+  initialize: function () {
+    this._el = new Element("div", {id: "search_dialog"});
+    this.search_field = new Element("input", {
+      type:         "text",
+      id:           "search_field",
+      placeholder:  "Search..."
+    });
+    var header = (new Element("form", {
+      id:       "search_header",
+      action:   "#",
+      "class":  "dialog_title"
+    })).adopt([
+      this.search_field,
+      (new Element("div", {
+        id: "search_by_filters",
+        "class": "button_group"
+      })).adopt([
+        new Element("button", {id: "search_filter_Song",       html: "Song title", "class": "active"}),
+        new Element("button", {id: "search_filter_Album",      html: "Album"}),
+        new Element("button", {id: "search_filter_Artist",     html: "Artist"})
+      ])
+    ]);
+
+    function searchFromField (event) {
+      if(event)
+        Event.stop(event);
+      
+      Search.search(Search.search_field.value, Search.active_filters);
+    }
+
+    header.addEvent("submit", searchFromField);
+    
+    var _search_buffer;
+    this.search_field.addEvent("keyup", function (event) {
+      clearTimeout(_search_buffer);
+      _search_buffer = setTimeout(searchFromField, 360);
+    });
+    this.search_field.addEvent("mousedown", function (event) {
+      // since the title is draggable, the text field would never
+      // get focus.
+      event.stopPropagation();
+    });
+    
+    this._el.grab(header);
+    var _sf_l = "search_filter_".length;
+    header.addEvent("click:relay(button)", function (event, button) {
+      var filter = button.id.slice(_sf_l);
+      if(Search.active_filters.contains(filter))
+        Search.deactivateFilter(filter);
+      else
+        Search.activateFilter(filter);
+      
+      Search.query = null;
+      Search.search_field.focus();
+      Search.search(Search.search_field.value);
+    });
+    
+    this.dialog = new Dialog({
+      title:              header,
+      html:               (new Element("div", {id: "search_dialog_wrapper"})).grab(this._el),
+      closeButton:        true,
+      draggable:          true,
+      hideOnOutsideClick: false,
+      
+      onShow: function () {
+        Search.search_field.focus();
+      },
+      
+      onHide: function () {
+        if(this.results_column)
+          this.results_column.destroy();
+        
+        delete this.results_column;
+      }
+    });
+    
+    this.initialized = true;
+    delete header;
+  },
+  
+  /**
+   *  Search.show() -> undefined
+   **/
+  show: function () {
+    this.dialog.show();
+  },
+  
+  /**
+   *  Search.search(query[, filters, options]) -> undefined | false
+   *  - query (String | RegExp): search query.
+   *  - filter (String): one of the filters. See [[Search.active_filter]] for 
+   *    possible values, this also the default value.
+   *  - options (Function): passed to the [[SearchResults]] class.
+   *
+   *  `false` will be returned in cases when search won't be started:
+   *  * if the last query was the same as the new one,
+   *  * if the last search hasn't finished,
+   *  * there are no active filters.
+   *  
+   *  #### Notes
+   *  If the `query` is a [[String]], modifications to it will be applied
+   *  in order to get semi-fuzzy search.
+   *  
+   *  #### See also
+   *  * [Autocomplete fuzzy matching](http://www.dustindiaz.com/autocomplete-fuzzy-matching/)
+   *
+   **/
+  search: function (query, filters, options) {
+    if(this.query === query || query.length < 3)
+      return false;
+    if(!filters || !filters.length)
+      filters = this.active_filters;
+    if(!filters.length)
+      return false;
+    
+    this.query = query;
+    if(this.results_column) {
+      if(!this.results_column._finished)
+        return false;
+      
+      this.results_column.destroy();
+      delete this.results_column;
+    }
+    
+    if(!(query instanceof RegExp))
+      if(query[0] === "/" && query.slice(-1) === "/")
+        query = new RegExp(query.slice(1,-1), "ig")
+      else if(query.contains(" "))
+        query = new RegExp("(" + query.escapeRegExp() + ")", "ig");
+      else
+        query = new RegExp(query.replace(/\W/g, "").split("").join("\\w*"), "ig");
+  
+    console.log("searching for", query, filters);
+    this.search_field.disabled = true;
+    
+    // This is a small hack which allows playlist editor 
+    // add drag&drop controls, as the options persist between
+    // calls.
+    if(options)
+      this.column_options = options;
+    else
+      options = this.column_options;
+    
+    if(!options.parentElement)
+      options.parentElement = this._el;
+    this.results_column = new SearchResults($extend(options, {
+      query:          query,
+      filters:        filters
+    }));
+  },
+  
+  /**
+   *  Search.saveAsPlaylist() -> undefined
+   *  Saves search results as a new playlist and opens [[PlaylistEditor#edit]] dialog.
+   **/
+  saveAsPlaylist: function () {
+    if(!this.results_column || !this.results_column.finished)
+      return;
+    
+    var songs   = this.results_column._rows,
+        n       = songs.length,
+        song_ids = new Array(n);
+    
+    while(n--)
+      song_ids[n] = songs[n].id;
+    
+    Playlist.create({
+      title: "Search results",
+      song_ids: song_ids
+    }, function (playlist) {
+      da.controller.Playlist.edit(playlist);
+    });
+  },
+  
+  /**
+   *  Search.activateFilter(filter) -> false | undefined
+   *  - filter (String): filter to activate. See [[Search.active_filter]] for
+   *    possible values.
+   **/
+  activateFilter: function (filter) {
+    if(this.active_filters.contains(filter))
+      return false;
+    
+    $("search_filter_" + filter).addClass("active");
+    this.active_filters.push(filter);
+  },
+  
+  /**
+   *  Search.deactivateFilter(filter) -> false | undefined
+   *  - filter (String): filter to deactivate.
+   **/
+  deactivateFilter: function (filter) {
+    if(!this.active_filters.contains(filter))
+      return false;
+   
+   $("search_filter_" + filter).removeClass("active");
+   this.active_filters.erase(filter);
+  },
+  
+  /**
+   *  Search.destroy() -> undefined
+   **/
+  destroy: function () {
+    this.dialog.destroy();
+    delete this.dialog;
+    
+    if(this.results_column)
+      this.results_column.destroy();
+    delete this.results_column;
+    delete this._el;
+    delete this.search_field;
+  }
+});
+
+/**
+ * da.controller.Search
+ **/
+da.controller.Search = {
+  /**
+   *  da.controller.Search.show() -> undefined
+   *  
+   *  Shows search overlay.
+   *
+   **/
+  show: function () {
+    if(!Search.initialized)
+      Search.initialize();
+    
+    Search.column_options = {};
+    Search.show();
+  },
+  /**
+   *  da.controller.Search.search(searchTerm[, filters][, options]) -> undefined
+   *  - searchTerm (String): the query.
+   *  - filters (Array): filters to use, [[Search.active_filters]].
+   *  - options (Object): options passed to [[SearchResults]] class.
+   *  - options.onComplete (Function): function called with search results as first
+   *    argument and instance of the class as the second argument.
+   **/
+  search: function (term, filters, options) {
+    this.show();
+    Search.search_field.value = term;
+    Search.search(term, filters, options || {});
+  }
+};
+
+})();
hunk ./contrib/musicplayer/src/controllers/Settings.js 14
  *  This is private class.
  *  Public interface is accessible via [[da.controller.Settings]].
  **/
-    
-var Dialog = da.ui.Dialog,
-    Setting = da.db.DocumentTemplate.Setting;
+
+var Dialog            = da.ui.Dialog,
+    NavigationColumn  = da.ui.NavigationColumn,
+    Setting           = da.db.DocumentTemplate.Setting;
 
 var GROUPS = [{
hunk ./contrib/musicplayer/src/controllers/Settings.js 20
-    id: "caps",
-    title: "Caps",
-    description: "Tahoe caps for your music and configuration files."
-  }, {
-    id: "lastfm",
-    title: "Last.fm",
-    description: 'Share the music your are listening to with the world via <a href="http://last.fm" target="_blank">Last.fm</a>.'
-  }
-];
+  id: "caps",
+  title: "Caps",
+  description: "Tahoe caps for your music and configuration files."
+}];
 
 // Renderers are used to render the interface elements for each setting (ie. the input boxes, checkboxes etc.)
 // Settings and renderers are bound together via "representAs" property which
hunk ./contrib/musicplayer/src/controllers/Settings.js 99
     this.dialog = new Dialog({
       title: "Settings",
       html:  new Element("div", {id: "settings"}),
-      hideOnOutsideClick: false
+      hideOnOutsideClick: false,
+      closeButton: true
     });
     this._el = $("settings");
     this.column = new GroupsColumn({
hunk ./contrib/musicplayer/src/controllers/Settings.js 263
 }
 
 var GroupsColumn = new Class({
-  Extends: da.ui.NavigationColumn,
+  Extends: NavigationColumn,
 
   view: null,
 
hunk ./contrib/musicplayer/src/controllers/SongContext.js 27
     });
     this.tabs = new Element("div", {
       id: "context_tabs",
-      "class": "no_selection"
+      "class": "button_group no_selection"
     });
     
     for(var id in CONTEXTS)
hunk ./contrib/musicplayer/src/controllers/SongContext.js 31
-      this.tabs.grab(new Element("a", {
-        id:       id + TAB_SUFFIX,
-        "class":  "tab",
-        href:     "#",
-        html:     CONTEXTS[id].title
+      this.tabs.grab(new Element("button", {
+        id:   id + TAB_SUFFIX,
+        html: CONTEXTS[id].title
       }));
hunk ./contrib/musicplayer/src/controllers/SongContext.js 35
-    this.tabs.addEvent("click:relay(.tab)", function () {
+    this.tabs.addEvent("click:relay(button)", function () {
       SongContext.show(this.id.slice(0, _TS_L));
     });
     
hunk ./contrib/musicplayer/src/controllers/SongContext.js 48
     
     $("player_pane").adopt(this.tabs, this.loading_screen, this.el);
     
+    function adjustDimensions () {
+      SongContext.el.style.height = (
+        window.getHeight() - $("song_info_block").getHeight() - SongContext.tabs.getHeight()
+      ) + "px";
+    }
+    
     Player.addEvent("play", function (song) {
hunk ./contrib/musicplayer/src/controllers/SongContext.js 55
+      adjustDimensions();
+      
       if(SongContext.active)
         SongContext.active.update(song);
     });
hunk ./contrib/musicplayer/src/controllers/SongContext.js 61
      
-    window.addEvent("resize", function () {
-      SongContext.el.style.height = (
-        window.getHeight() - $("song_info_block").getHeight() - SongContext.tabs.getHeight()
-      ) + "px";
-    });
+    window.addEvent("resize", adjustDimensions);
     window.fireEvent("resize");
hunk ./contrib/musicplayer/src/controllers/SongContext.js 63
+    
     this.initialized = true;
   },
   
hunk ./contrib/musicplayer/src/controllers/SongContext.js 115
    *
    **/
   addTab: function (id) {
-    this.tabs.grab(new Element("a", {
-      id:       id + TAB_SUFFIX,
-      "class":  "tab",
-      href:     "#",
-      html:     CONTEXTS[id].title
+    this.tabs.grab(new Element("button", {
+      id:   id + TAB_SUFFIX,
+      html: CONTEXTS[id].title
     }));
   }
 };
hunk ./contrib/musicplayer/src/controllers/controllers.js 17
 //#require "controllers/Navigation.js"
 //#require "controllers/Player.js"
 //#require "controllers/SongContext.js"
+//#require "controllers/Search.js"
+//#require "controllers/Playlist.js"
 //#require "controllers/CollectionScanner.js"
hunk ./contrib/musicplayer/src/controllers/default_columns.js 1
+//#require "controllers/Player.js"
 //#require "libs/ui/NavigationColumn.js"
 //#require "services/albumCover.js"
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 7
 (function () {
 var Navigation        = da.controller.Navigation,
+    Player            = da.controller.Player,
     NavigationColumn  = da.ui.NavigationColumn,
     Album             = da.db.DocumentTemplate.Album,
     Song              = da.db.DocumentTemplate.Song,
hunk ./contrib/musicplayer/src/controllers/default_columns.js 11
+    Playlist          = da.db.DocumentTemplate.Playlist,
     fetchAlbumCover   = da.service.albumCover;
 
 /** section: Controller
hunk ./contrib/musicplayer/src/controllers/default_columns.js 49
  *  
  *  Displays artists.
  **/
-var the_regex = /^the\s*/i;
+var THE_REGEX = /^the\s*/i;
 Navigation.registerColumn("Artists", ["Albums", "Songs"], new Class({
   Extends: NavigationColumn,
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 58
     map: function (doc, emit) {
       // If there are no documents in the DB this function
       // will be called with "undefined" as first argument
-      if(!doc) return;
+      if(!doc || doc.type !== "Artist") return;
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 60
-      if(doc.type === "Artist")
-        emit(doc.id, {
-          title: doc.title
-        });
+      emit(doc.id, {
+        title: doc.title
+      });
     }
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 71
   },
   
   compareFunction: function (a, b) {
-    a = a && a.value.title ? a.value.title.split(the_regex).slice(-1) : a;
-    b = b && b.value.title ? b.value.title.split(the_regex).slice(-1) : b;
+    a = a && a.value.title ? a.value.title.split(THE_REGEX).slice(-1) : a;
+    b = b && b.value.title ? b.value.title.split(THE_REGEX).slice(-1) : b;
     
     if(a < b) return -1;
     if(a > b) return 1;
hunk ./contrib/musicplayer/src/controllers/default_columns.js 90
   Extends: NavigationColumn,
 
   options: {
-    rowHeight: 72/3,
-    iconSize: 1,
-    renderImmediately: false
+    rowHeight: 50
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 93
-  // We can't reuse "Album" view because of #_passesFilter().
   view: {
     id: "albums_column",
     
hunk ./contrib/musicplayer/src/controllers/default_columns.js 97
     map: function (doc, emit) {
-      if(!doc || !this._passesFilter(doc)) return;
+      if(!doc || doc.type !== "Album" || !this._passesFilter(doc)) return;
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 99
-      if(doc.type === "Album")
-        emit(doc.id, {
-          title: doc.title,
-          icons: doc.album_cover_urls || []
-        });
+      emit(doc.id, {
+        title: doc.title,
+        icon: doc.album_cover_urls ? doc.album_cover_urls[1] : null
+      });
     }
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 106
-  initialize: function (options) {
-    this.parent(options);
-    
-    // TODO: select icon size depending on the column's width
-    //       also, adjust margins between the elements accordingly
-    this.options.iconSize = this.options.totalCount <= (this.getVisibleIndexes()[1] + 1) ? 2 : 1;
-    this._row_dim = this.options.iconSize === 1 ? 64 : 174;
+  renderItem: function (index) {
+    var item = this.getItem(index);
+    if(!item.value.icon) {
+      item.value.icon = "resources/images/album_cover_1.png";
+      fetchAlbumCover(Album.findById(item.id), function (urls) {
+        item.value.icon = urls[1];
+      });
+    }
     
hunk ./contrib/musicplayer/src/controllers/default_columns.js 115
-    this._el.addEvent("resize", function () {
-      var width = this._el.getWidth();
-      // 4 + 4 being padding on the element
-      this.options.rowHeight = width / (4 + this._row_dim + 4);
-    }.bind(this));
-    this._el.fireEvent("resize");
     
hunk ./contrib/musicplayer/src/controllers/default_columns.js 116
-    this.render();
+    return this.parent(index);
   },
   
   createFilter: function (item) {
hunk ./contrib/musicplayer/src/controllers/default_columns.js 121
     return {album_id: item.id};
+  }
+}));
+
+/**
+ *  class da.controller.Navigation.columns.Genres < da.ui.NavigationColumn
+ *  filters: [[da.controller.Navigation.columns.Songs]]
+ *  
+ *  Displays song genres.
+ **/
+var GENRES = da.util.GENRES;
+Navigation.registerColumn("Genres", ["Songs"], new Class({
+  Extends: NavigationColumn,
+  
+  view: {
+    id: "genres_column",
+    map: function (doc, emit) {
+      // If there are no documents in the DB this function
+      // will be called with "undefined" as first argument
+      if(!doc || doc.type !== "Song") return;
+
+      emit(doc.genre || -1, 1);
+    },
+    reduce: function (key, values, rereduce) {
+      //console.log("reduce", key, values);
+      
+      if(key !== null) {
+        var key_n = isNaN(+key) ? key : + key;
+        
+        return {
+          title:    typeof key_n === "number" ? GENRES[key_n] || "Unknown" : key_n,
+          subtitle: values.length,
+          genre:    key_n
+        }
+      } else {
+        var n = values.length, count = 0;
+        while(n--)
+          count += values[n].subtitle;
+        
+        return {
+          title:    values[0].title,
+          subtitle: count,
+          genre:    values[0].genre
+        }
+      }
+    }
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 168
-  renderItem: function (index) {
-    var item = this.getItem(index),
-        data = item.value,
-        el = new Element("a", {
-          id:     this.options.id + "_column_item_" + item.id,
-          href:   "#",
-          title:  data.title
-        }),
-        cover = data.icons[this.options.iconSize];
+  mapReduceFinished: function (view) {
+    this._addIdsToReducedView(view);
+    this.parent(view);
+  },
+  
+  mapReduceUpdated: function (view) {
+    this._addIdsToReducedView(view);
+    this.parent(view);
+  },
+  
+  _addIdsToReducedView: function (view) {
+    var n = view.rows.length;
+    while(n--)
+      view.rows[n].id = view.rows[n].value.genre;
+    return view;
+  },
+  
+  createFilter: function (item) {
+    return {genre: item.value.genre};
+  },
+  
+  compareFunction: function (a, b) {
+    a = a && a.value.title ? a.value.title.split(THE_REGEX).slice(-1) : a;
+    b = b && b.value.title ? b.value.title.split(THE_REGEX).slice(-1) : b;
     
hunk ./contrib/musicplayer/src/controllers/default_columns.js 193
-    el.style.width = this._row_dim + "px";
-    el.style.height = this._row_dim + "px";
-    if(!cover || !cover.length) {
-      cover = "resources/images/album_cover_" + this.options.iconSize + ".png";
-      fetchAlbumCover(Album.findById(item.id));
+    if(a < b) return -1;
+    if(a > b) return 1;
+    return 0;
+  }
+}));
+
+
+/**
+ *  class da.controller.Navigation.columns.Playlists < da.ui.NavigationColumn
+ *  filters: [[da.controller.Navigation.columns.Songs]]
+ *  
+ *  Displays songs.
+ **/
+Navigation.registerColumn("Playlists", ["_PlaylistSongs"], new Class({
+  Extends: NavigationColumn,
+  
+  view: {
+    id: "playlists_column",
+    map: function (doc, emit) {
+      if(!doc || doc.type !== "Playlist" || !this._passesFilter(doc)) return;
+
+      emit(doc.id, {
+        title:    doc.title,
+        song_ids: doc.song_ids
+      });
     }
hunk ./contrib/musicplayer/src/controllers/default_columns.js 219
+  },
+  
+  initialize: function (options) {
+    this.parent(options);
     
hunk ./contrib/musicplayer/src/controllers/default_columns.js 224
-    el.grab(new Element("img",  {src: cover}));    
-    return el;
+    this._el.addEvent("click:relay(.action)", function (event, el) {
+      var item = this.getItem(el.parentNode.retrieve("column_index"));
+      da.controller.Playlist.edit(Playlist.findById(item.id));
+    }.bind(this));
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 230
-  getBoxCoords: function(index) {
-    return [0, (this.options.rowHeight * index)/3];
+  mapReduceUpdated: function (view) {
+    this.parent(view);
+    if(this._active_el)
+      this._el.fireEvent("click:relay(.column_item)", [null, this._active_el], 1);
+  },
+  
+  createFilter: function (item) {
+    var   id = item.id,
+          songs = item.value.song_ids;
+    
+    return function (song) {
+      return song.type === "Song" ? songs.contains(song.id) : song.id === id;
+    }
+  },
+  
+  renderItem: function (index) {
+    var item = this.getItem(index),
+         data = item.value;
+    
+    return (new Element("a", {
+      id:       this.options.id + "_column_item_" + item.id,
+      href:     "#",
+      "class":  index % 2 ? "even" : "odd"
+    })).adopt([
+      new Element("a", {
+        href:     "#",
+        html:     "Edit",
+        title:    "Edit the playlist",
+        "class":  "action"
+      }),
+      new Element("span", {
+        html:     data.title,
+        title:    data.title,
+        "class":  "title"
+      })
+    ]);
   }
 }));
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 269
+
 /**
  *  class da.controller.Navigation.columns.Songs < da.ui.NavigationColumn
  *  filters: none
hunk ./contrib/musicplayer/src/controllers/default_columns.js 283
     this.parent(options);
     
     this.addEvent("click", function (item, event, el) {
-      da.controller.Player.setPlaylist(this._playlist);
-      da.controller.Player.play(Song.findById(item.id));
-    }.bind(this), true);
+      el.removeClass("active_column_item");
+    }, true);
+    
+    this.addEvent("click", function (item, event, el) {
+      Player.play(Song.findById(item.id));
+      Player.setPlaylist(this._playlist);
+    }.bind(this));
+    
+    this._onSongChange = this._updateSelectedItem.bind(this);
+    da.controller.Player.addEvent("play", this._onSongChange);
   },
   
   view: {
hunk ./contrib/musicplayer/src/controllers/default_columns.js 298
     id: "songs_column",
     map: function (doc, emit) {
-      if(!doc || !this._passesFilter(doc)) return;
+      if(!doc || doc.type !== "Song" || !this._passesFilter(doc))
+        return;
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 301
-      if(doc.type === "Song" && doc.title)
+      if(doc.title && doc.title.length)
         emit(doc.title, {
           title: doc.title,
           track: doc.track
hunk ./contrib/musicplayer/src/controllers/default_columns.js 312
   mapReduceFinished: function (values) {
     this.parent(values);
     this.createPlaylist();
+    this._updateSelectedItem(da.controller.Player.nowPlaying());
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 315
-  mapReduceUpdated: function (values) {
-    this.parent(values);
+  mapReduceUpdated: function (values, rerender) {
+    this.parent(values, rerender);
     this.createPlaylist();
   },
   
hunk ./contrib/musicplayer/src/controllers/default_columns.js 328
       playlist[n] = this._rows[n].id;
     
     this._playlist = playlist;
-    delete playlist;
+    playlist = null;
   },
   
   compareFunction: function (a, b) {
hunk ./contrib/musicplayer/src/controllers/default_columns.js 337
     
     if(a < b) return -1;
     if(a > b) return 1;
-    return 0;
+              return 0;
+  },
+  
+  _updateSelectedItem: function (song) {
+    if(!song)
+      return false;
+    
+    var new_active_el = $(this.options.id + "_column_item_" + song.id);
+    if(!new_active_el)
+      return false;
+    
+    if(this._active_el)
+      this._active_el.removeClass("active_column_item");
+    
+    this._active_el = new_active_el;
+    this._active_el.addClass("active_column_item");
+    new_active_el = null;
+  },
+  
+  destroy: function () {
+    da.controller.Player.removeEvent("play", this._onSongChange);
+    this.parent()
+  }
+}));
+
+
+/**
+ *  class da.controller.Navigation.columns.PlaylistSongs < da.controller.Navigation.columns.Songs
+ *  filters: none
+ *  
+ *  Displays songs from a playlist - adds drag&drop functionality.
+ **/
+Navigation.registerColumn("_PlaylistSongs", "Songs", [], new Class({
+  Extends: Navigation.columns.Songs,
+  
+  view: {
+    id: "playlist_songs_column",
+    map: function (doc, emit) {
+      var type = doc.type;
+      if(!doc || (type !== "Song" && type !== "Playlist") || !this._passesFilter(doc))
+        return;
+      
+      if(type === "Song")
+        emit(doc.title, {
+          title:  doc.title
+        });
+      else
+        emit("_playlist", {
+          id:       doc.id,
+          title:    doc.title + " (playlist)",
+          song_ids: doc.song_ids
+        });
+    }
+  },
+  
+  mapReduceFinished: function (view) {
+    var playlist_pos = view.findRow("_playlist");
+    this.addPositions(view.rows[playlist_pos], view.rows);
+    return this.parent(view);
+  },
+  
+  mapReduceUpdated: function (view) {
+    var full_view = da.db.DEFAULT.views[this.view.id].view,
+        new_rows = $A(full_view.rows);
+    // this is why we can't use this.parent(view, true),
+    // we need to add positions to the all elements, before
+    // the sorting occurs (remember that `view` contains only the playlist)
+    this.addPositions(new_rows[full_view.findRow("_playlist")], new_rows);
+    new_rows.sort(this.compareFunction);
+    
+    this.options.totalCount = new_rows.length;
+    this._rows = new_rows;
+    
+    var active = this.getActiveItem();
+    this.rerender();
+    
+    if(active) {
+      console.log("has_active_item");
+      this._active_el = $(this.options.id + "_column_item_" + active.id);
+      this._active_el.addClass("active_column_item");
+    }
+    
+    full_view = null;
+    new_rows = null;
+    active = null;
+  },
+  
+  compareFunction: function (a, b) {
+    a = a && a.value ? a.value.playlist_pos : 0;
+    b = b && b.value ? b.value.playlist_pos : 0;
+    
+    if(a < b) return -1;
+    if(a > b) return 1;
+              return 0;
+  },
+  
+  addPositions: function (playlist, rows) {
+    if(playlist) {
+      rows.erase(playlist);
+      this._playlist = playlist.value.song_ids;
+    }
+    var n = rows.length,
+        playlist = this._playlist;
+    
+    while(n--)
+      rows[n].value.playlist_pos = playlist.indexOf(rows[n].id);
+  },
+  
+  createPlaylist: function () {}
+  
+  /*
+  mapReduceUpdated: function (view) {
+    this._rows = $A(da.db.DEFAULT.views[this.view.id].view.rows);
+    this._rows.sort(this.compareFunction);
+    this.options.totalCount = this._rows.length;
+    this.rerender();
+    
+    var active = this.getActiveItem();
+    if(active) {
+      this._active_el = $(this.options.id + "_column_item_" + active.id);
+      this._active_el.addClass("active_column_item");
+    }
   }
hunk ./contrib/musicplayer/src/controllers/default_columns.js 460
+  */
 }));
 
hunk ./contrib/musicplayer/src/controllers/default_columns.js 463
+
 })();
hunk ./contrib/musicplayer/src/controllers/default_contexts.js 315
       },
       onHide: function () {
         this.video.src = "about:blank";
-        setTimeout(function () {
-          Player.play();
-        }, 1000);
       }.bind(this)
     });
     
hunk ./contrib/musicplayer/src/doctemplates/Artist.js 10
  *  - title (String): name of the artist
  *
  **/
+ 
 (function () {
 var DocumentTemplate = da.db.DocumentTemplate;
 
addfile ./contrib/musicplayer/src/doctemplates/Playlist.js
hunk ./contrib/musicplayer/src/doctemplates/Playlist.js 1
+//#require "libs/db/DocumentTemplate.js"
+
+/**
+ *  class da.db.DocumentTemplate.Playlist < da.db.DocumentTemplate
+ *
+ *  Class representing playlists
+ *
+ *  #### Standard properties
+ *  - `title` (String): name of the playlist.
+ *  - `description` (String): a few words about the playlist.
+ *  - `song_ids` (Array): list of ID's of songs belonging to the playlist.
+ **/
+
+(function () {
+var DocumentTemplate = da.db.DocumentTemplate;
+
+DocumentTemplate.registerType("Playlist", new Class({
+  Extends: DocumentTemplate
+}));
+
+/*
+DocumentTemplate.Playlist.findOrCreate({
+  properties: {id: "offline", },
+  onSuccess: function (offline_playlist, was_created) {
+    if(was_created)
+      offline_playlist.update({
+        title:        "Offline",
+        description:  "Songs on this playlist will be available even after you go offline."
+      });
+  }
+});
+*/
+
+})();
hunk ./contrib/musicplayer/src/doctemplates/Setting.js 17
  *        id:           "volume",
  *        group_id:     "general",
  *        representAs:  "Number",
- *
+ *        
  *        title:        "Volume",
  *        help:         "Configure the volume",
  *        value:        64
hunk ./contrib/musicplayer/src/doctemplates/Setting.js 107
   value:        ""
 });
 
+/*
 Setting.register({
   id:           "lastfm_enabled",
   group_id:     "lastfm",
hunk ./contrib/musicplayer/src/doctemplates/Setting.js 137
   value:        "",
   position:     2
 });
+*/
 
 })();
hunk ./contrib/musicplayer/src/doctemplates/Song.js 2
 //#require "libs/db/DocumentTemplate.js"
+//#require "libs/util/genres.js"
 
 (function () {
hunk ./contrib/musicplayer/src/doctemplates/Song.js 5
-var DocumentTemplate = da.db.DocumentTemplate;
-
+var DocumentTemplate = da.db.DocumentTemplate,
+    GENRES = da.util.GENRES;
 /**
  *  class da.db.DocumentTemplate.Song < da.db.DocumentTemplate
  *  belongsTo: [[da.db.DocumentTemplate.Artist]], [[da.db.DocumentTemplate.Album]]
hunk ./contrib/musicplayer/src/doctemplates/Song.js 12
  *  
  *  #### Standard properties
- *  * `id` - Read-only cap of the file
- *  * `title` - name of the song
- *  * `track` - track number
- *  * `year` - year in which track was published
- *  * `lyrics` - lyrics of the song
- *  * `artist_id` - id of an [[da.db.DocumentTemplate.Artist]]
- *  * `album_id` - id of an [[da.db.DocumentTemplate.Album]]
+ *  - `id` ([[String]]): Read-only cap of the file.
+ *  - `title` ([[String]]): name of the song.
+ *  - `track` ([[Numner]]): track number.
+ *  - `year` ([[Number]]): year in which the track was published, `0` if the year
+ *    is unkown.
+ *  - `duration` ([[Number]]): length of the song in milliseconds.
+ *  - `artist_id` ([[String]]): id of an [[da.db.DocumentTemplate.Artist]]
+ *  - `album_id` ([[String]]): id of an [[da.db.DocumentTemplate.Album]]
+ *  - `plays` ([[Number]]): number of full plays
+ *  - `genre` ([[String]] | [[Number]]): id of the genre or name of the genre
+ *    itself. If it's a number, it's a index of an [[da.util.GENRES]].
+ *    `-1` if the genre isn't specified.
+ *  - `mbid` ([[String]]): Musicbrainz ID
+ *  - `lastfm_id` ([[String]]): Last.fm ID
  *
  **/
 
hunk ./contrib/musicplayer/src/doctemplates/Song.js 29
-// Defined by ID3 specs:
-// http://www.id3.org/id3v2.3.0#head-129376727ebe5309c1de1888987d070288d7c7e7
-var GENRES = [
-  "Blues","Classic Rock","Country","Dance","Disco","Funk","Grunge","Hip-Hop","Jazz",
-  "Metal","New Age","Oldies","Other","Pop","R&B","Rap","Reggae","Rock","Techno",
-  "Industrial","Alternative","Ska","Death Metal","Pranks","Soundtrack","Euro-Techno",
-  "Ambient","Trip-Hop","Vocal","Jazz+Funk","Fusion","Trance","Classical","Instrumental",
-  "Acid","House","Game","Sound Clip","Gospel","Noise","AlternRock","Bass","Soul","Punk",
-  "Space","Meditative","Instrumental Pop","Instrumental Rock","Ethnic","Gothic",
-  "Darkwave","Techno-Industrial","Electronic","Pop-Folk","Eurodance","Dream",
-  "Southern Rock","Comedy","Cult","Gangsta","Top 40","Christian Rap","Pop/Funk",
-  "Jungle","Native American","Cabaret","New Wave","Psychadelic","Rave","Showtunes",
-  "Trailer","Lo-Fi","Tribal","Acid Punk","Acid Jazz","Polka","Retro","Musical",
-  "Rock & Roll","Hard Rock","Folk","Folk-Rock","National Folk","Swing","Fast Fusion",
-  "Bebob","Latin","Revival","Celtic","Bluegrass","Avantgarde","Gothic Rock",
-  "Progressive Rock","Psychedelic Rock","Symphonic Rock","Slow Rock","Big Band",
-  "Chorus","Easy Listening","Acoustic","Humour","Speech","Chanson","Opera","Chamber Music",
-  "Sonata","Symphony","Booty Bass","Primus","Porn Groove","Satire","Slow Jam","Club","Tango",
-  "Samba","Folklore","Ballad","Power Ballad","Rhythmic Soul","Freestyle","Duet","Punk Rock",
-  "Drum Solo","A capella","Euro-House","Dance Hall"
-];
-
 DocumentTemplate.registerType("Song", new Class({
   Extends: DocumentTemplate,
   
hunk ./contrib/musicplayer/src/doctemplates/doctemplates.js 12
 //#require "doctemplates/Artist.js"
 //#require "doctemplates/Album.js"
 //#require "doctemplates/Song.js"
-
+//#require "doctemplates/Playlist.js"
hunk ./contrib/musicplayer/src/index.html 3
 <!DOCTYPE html>
 <html>
+<!-- html manifest="cache.manifest" -->
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
hunk ./contrib/musicplayer/src/index.html 6
+    
     <title>Music Player for Tahoe-LAFS</title>
     <link rel="stylesheet" href="resources/css/reset.css" type="text/css" media="screen" charset="utf-8"/>
hunk ./contrib/musicplayer/src/index.html 9
-    <link rel="stylesheet" href="resources/css/text.css" type="text/css" media="screen" charset="utf-8"/>
-    <link rel="stylesheet" href="resources/css/app.css" type="text/css" media="screen" charset="utf-8"/>
+    <link rel="stylesheet" href="resources/css/text.css"  type="text/css" media="screen" charset="utf-8"/>
+    <link rel="stylesheet" href="resources/css/app.css"   type="text/css" media="screen" charset="utf-8"/>
     
     <script src="js/app.js" type="text/javascript" charset="utf-8"></script>
   </head>
hunk ./contrib/musicplayer/src/index_devel.html 43
     <script src="libs/util/ID3.js" type="text/javascript" charset="utf-8"></script>
     <script src="libs/util/ID3v2.js" type="text/javascript" charset="utf-8"></script>
     <script src="libs/util/ID3v1.js" type="text/javascript" charset="utf-8"></script>
-
-    <script src="Application.js" type="text/javascript" charset="utf-8"></script>
-
-    <script src="doctemplates/Setting.js" type="text/javascript" charset="utf-8"></script>
-    <script src="doctemplates/Artist.js" type="text/javascript" charset="utf-8"></script>
-    <script src="doctemplates/Album.js" type="text/javascript" charset="utf-8"></script>
-    <script src="doctemplates/Song.js" type="text/javascript" charset="utf-8"></script>
-    <script src="doctemplates/Playlist.js" type="text/javascript" charset="utf-8"></script>
+    <script src="libs/util/ID3v1.js" type="text/javascript" charset="utf-8"></script>
+    <script src="libs/util/PlaylistExporters.js" type="text/javascript" charset="utf-8"></script>
 
     <script src="libs/ui/ui.js" type="text/javascript" charset="utf-8"></script>
     <script src="libs/ui/Column.js" type="text/javascript" charset="utf-8"></script>
hunk ./contrib/musicplayer/src/index_devel.html 55
     <script src="libs/ui/SegmentedProgressBar.js" type="text/javascript" charset="utf-8"></script>
     <script src="libs/vendor/Roar.js" type="text/javascript" charset="utf-8"></script>
     
+    <script src="Application.js" type="text/javascript" charset="utf-8"></script>
+
+    <script src="doctemplates/Setting.js" type="text/javascript" charset="utf-8"></script>
+    <script src="doctemplates/Artist.js" type="text/javascript" charset="utf-8"></script>
+    <script src="doctemplates/Album.js" type="text/javascript" charset="utf-8"></script>
+    <script src="doctemplates/Song.js" type="text/javascript" charset="utf-8"></script>
+    <script src="doctemplates/Playlist.js" type="text/javascript" charset="utf-8"></script>
+
     <script src="services/services.js" type="text/javascript" charset="utf-8"></script>
     <script src="libs/vendor/LastFM.js" type="text/javascript" charset="utf-8"></script>
     <script src="services/lastfm.js" type="text/javascript" charset="utf-8"></script>
hunk ./contrib/musicplayer/src/index_devel.html 78
     <script src="controllers/Settings.js" type="text/javascript" charset="utf-8"></script>
     <script src="controllers/CollectionScanner.js" type="text/javascript" charset="utf-8"></script>
     <script src="controllers/SongContext.js" type="text/javascript" charset="utf-8"></script>
+    <script src="controllers/Search.js" type="text/javascript" charset="utf-8"></script>
     <script src="controllers/default_contexts.js" type="text/javascript" charset="utf-8"></script>
hunk ./contrib/musicplayer/src/index_devel.html 80
+    <script src="controllers/Playlist.js" type="text/javascript" charset="utf-8"></script>
   </head>
   <body>
     <div id="loader">Loading...</div>
hunk ./contrib/musicplayer/src/libs/TahoeObject.js 75
     }
     this._fetched = true;
 
-    new Request.JSON({
+    var req = new Request.JSON({
       url: "/uri/" + encodeURIComponent(this.uri),
       
       onSuccess: function (data) {
hunk ./contrib/musicplayer/src/libs/TahoeObject.js 81
         this.applyMeta(data);
         (success||$empty)(this);
+        
+        delete req;
       }.bind(this),
       
       onFailure: failure || $empty
hunk ./contrib/musicplayer/src/libs/TahoeObject.js 86
-    }).get({t: "json"});
+    });
+    req.get({t: "json"});
     
     return this;
   },
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 258
       
       for(var view_name in views)
         this.view(views[view_name].options, dict);
-      }.bind(this), true);
+    }.bind(this), true);
   },
   
   /**
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 309
   put: function (doc, cb) {
     if ($type(doc) === "array") {
       this.dict.setDocs(doc);
-      //var n = doc.length, _doc;
-      //while(n--) {
-      //  _doc = doc[n];
-      //  this.dict.set(_doc.id, _doc);
-      //}
     } else
       this.dict.set(doc.id, doc);
 
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 397
         var full_view = this.views[id].view.rows.concat(view.rows),
             rereduce = {},
             reduce = options.reduce,
-            n = full_view.length;
+            n = full_view.length,
+            row, key;
         
         while(n--) {
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 401
-          var row = full_view[n],
-              key = row.key;
+          row = full_view[n];
+          key = row.key;
+          
           if(!rereduce[key])
             rereduce[key] = [row.value];
           else
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 430
    *  - id (String): name of the view.
    **/
   killView: function (id) {
-    delete this.views[id].view;
+    this.removeEvents("updated." + id);
     delete this.views[id];
     return this;
   }
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 438
 
 // Maximum number of items to process before giving the UI a chance
 // to breathe.
-var DEFAULT_CHUNK_SIZE = 1000;
-
+var DEFAULT_CHUNK_SIZE = 1000,
 // If no progress callback is given, we'll automatically give the
 // UI a chance to breathe for this many milliseconds before continuing
 // processing.
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 442
-var DEFAULT_UI_BREATHE_TIME = 50;
+  DEFAULT_UI_BREATHE_TIME = 50;
 
 function defaultProgress(phase, percent, resume) {
   window.setTimeout(resume, DEFAULT_UI_BREATHE_TIME);
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 513
 
 function findRowInReducedView (key, rows) {
   if(rows.length > 1) {
-    var midpoint = Math.floor(rows.length / 2);
-    var row = rows[midpoint];
-    if(key < row.key)
+    var midpoint = Math.floor(rows.length / 2),
+        row = rows[midpoint],
+        row_key = row.key;
+    
+    if(key < row_key)
       return findRowInReducedView(key, rows.slice(0, midpoint));
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 519
-    if(key > row.key)
-      return midpoint + findRowInReducedView(key, rows.slice(midpoint));
-    return row.key === key ? midpoint : -1;
-  }
-  
-  return rows[0].key === key ? 0 : -1;
+    if(key > row_key) {
+      var p = findRowInReducedView(key, rows.slice(midpoint))
+      return p === -1 ? -1 : midpoint + p;
+    }
+    return midpoint;
+  } else
+    return rows[0] && rows[0].key === key ? 0 : -1;
 }
 
 /**
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 544
   this.rows = [];
   var keyRows = [];
   
-  this._include = function (mapResult) {
+  this._include = function (mapResult) {    
     var mapKeys = mapResult.keys,
         mapDict = mapResult.dict;
     
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 570
           value: item.values[j]
         };
       
-      if(has_key)
+      if(has_key && this.rows[ki])
         newRows.shift();
       this.rows = this.rows.concat(newRows);
     }
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 575
     
-    this.rows.sort(idSort);
+    this.rows.sort(keySort);
     
     var keys = [];
     keyRows = [];
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 587
           pos: keys.push(key) - 1
         });
     }
-    
-    //delete keys;
   };
   
   /**
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 616
   return this;
 }
 
-function idSort (a, b) {
-  a = a.id;
-  b = b.id;
-  
-  if(a < b) return -1;
-  if(a > b) return  1;
-            return  0;
-}
-
 function findRowInMappedView (key, keyRows) {
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 617
-  if (keyRows.length > 1) {
+  if(keyRows.length > 1) {
     var midpoint = Math.floor(keyRows.length / 2);
     var keyRow = keyRows[midpoint];
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 620
-    if (key < keyRow.key)
+    if(key < keyRow.key)
       return findRowInMappedView(key, keyRows.slice(0, midpoint));
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 622
-    if (key > keyRow.key)
+    if(key > keyRow.key)
       return findRowInMappedView(key, keyRows.slice(midpoint));
     return keyRow ? keyRow.pos : -1;
   } else
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 646
  *  - worker (Object): reference to Web worker implementation. Defaults to `window.Worker`.
  **/
 function WebWorkerMapReducer(numWorkers, Worker) {
-  if (!Worker)
+  if(!Worker)
     Worker = window.Worker;
 
   var pool = [];
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 666
     };
   }
 
-  for (var i = 0; i < numWorkers; i++)
+  for(var i = 0; i < numWorkers; i++)
     pool.push(new MapWorker(i));
 
   this.map = function WWMR_map(map, dict, progress, chunkSize, finished) {
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 676
         mapDict = {};
 
     function getNextChunk() {
-      if (keys.length) {
+      if(keys.length) {
         var chunkKeys = keys.slice(0, chunkSize),
             chunk = {},
             n = chunkKeys.length;
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 697
 
     function nextJob(mapWorker) {
       var chunk = getNextChunk();
-      if (chunk) {
-        mapWorker.map(
-          map,
-          chunk,
-          function jobDone(aMapDict) {
-            for (var name in aMapDict)
-              if (name in mapDict) {
-                var item = mapDict[name];
-                item.keys = item.keys.concat(aMapDict[name].keys);
-                item.values = item.values.concat(aMapDict[name].values);
-              } else
-                mapDict[name] = aMapDict[name];
+      if(chunk) {
+        mapWorker.map(map, chunk, function jobDone(aMapDict) {
+          for(var name in aMapDict)
+            if(name in mapDict) {
+              var item = mapDict[name];
+              item.keys = item.keys.concat(aMapDict[name].keys);
+              item.values = item.values.concat(aMapDict[name].values);
+            } else
+              mapDict[name] = aMapDict[name];
 
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 707
-            if (keys.length)
-              progress("map",
-                       (size - keys.length) / size,
-                       function() { nextJob(mapWorker); });
-            else
-              workerDone();
-          });
+          if(keys.length)
+            progress("map",
+              (size - keys.length) / size,
+              function() { nextJob(mapWorker); }
+            );
+          else
+            workerDone();
+        });
       } else
         workerDone();
     }
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 727
 
     function allWorkersDone() {
       var mapKeys = [];
-      for (var name in mapDict)
+      for(var name in mapDict)
         mapKeys.push(name);
       mapKeys.sort();
       finished({dict: mapDict, keys: mapKeys});
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 733
     }
 
-    for (var i = 0; i < numWorkers; i++)
+    for(var i = 0; i < numWorkers; i++)
       nextJob(pool[i]);
   };
 
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 823
 
       do {
         var key   = mapKeys[i],
-            item  = mapDict[key]
+            item  = mapDict[key];
         
         rows.push({
           key: key,
hunk ./contrib/musicplayer/src/libs/db/BrowserCouch.js 844
   }
 };
 
-da.db.BrowserCouch = BrowserCouch;
-da.db.BrowserCouch.Dictionary = Dictionary;
-da.db.SingleThreadedMapReducer = SingleThreadedMapReducer;
-da.db.WebWorkerMapReducer = WebWorkerMapReducer;
+da.db.BrowserCouch              = BrowserCouch;
+da.db.BrowserCouch.Dictionary   = Dictionary;
+da.db.SingleThreadedMapReducer  = SingleThreadedMapReducer;
+da.db.WebWorkerMapReducer       = WebWorkerMapReducer;
 
 })();
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 137
         this[cache_key] = owner;
       
       callback(owner);
-      
-      /*
-      DocumentTemplate.find({
-        properties: {
-          id:   this.doc[key + "_id"],
-          type: this.belongsTo[key]
-        },
-        
-        onSuccess: function (doc) {
-          this[cache_key] = doc;
-          callback(doc);
-        }.bind(this),
-        
-        onFailure: callback
-      }, this.constructor.db());
-      */
     } else if(key in this.hasMany) {
       var relation = this.hasMany[key],
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 139
-          props = {type: relation[0]};
+          props    = {type: relation[0]};
       
       props[relation[1]] = this.id;
       
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 159
    *  - properties (Object): updated properties.
    *  fires propertyChange
    **/
-  set: function (properties) {
-    if(arguments.length == 2) {
+  set: function (properties, value) {
+    if(typeof value !== "undefined") {
       var key = properties;
       properties = {};
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 163
-      properties[key] = arguments[1];
+      properties[key] = value;
     }
     
     $extend(this.doc, properties);
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 178
    *  fires propertyRemove
    **/
   remove: function (property) {
-    if(property !== "_id")
+    if(property !== "id")
       delete this.doc[property];
     
     this.fireEvent("propertyRemove", [property, this]);
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 217
    *  da.db.DocumentTemplate#destroy([callback]) -> this
    *  - callback (Function): function called after `destroy` event.
    *  
-   *  Removes all document's properties except for `id` and adds `_deleted` property.
+   *  Destroys the document.
+   *
+   *  #### Notes
+   *  The document won't be completely destroyed from the db, all of its properties
+   *  will be deleted, but it will get a `_deleted` property set to `true`. 
    **/
   destroy: function (callback) {
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 224
-    for(var property in this.doc)
-      delete this.doc[property];
+    for(var prop in this.doc)
+      delete this.doc[prop];
     
     this.doc.id = this.id;
     this.doc._deleted = true;
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 234
       this.fireEvent("destroy", [this]);
       if(callback)
         callback(this);
-    });
+    }.bind(this));
     
     return this;
   }
hunk ./contrib/musicplayer/src/libs/db/DocumentTemplate.js 352
     
     template.find = function (options) {
       options.properties.type = type;
-      if(options.id)
+      if(options.properties.id)
         template.findById(options.id, function (doc) {
           if(doc)
             options.onSuccess([doc]);
hunk ./contrib/musicplayer/src/libs/ui/Column.js 42
    **/
   initialize: function (options) {
     this.setOptions(options);
-    if(!this.options.id)
+    if(!this.options.id || !this.options.id.length)
       this.options.id = "duC_" + (IDS++);
     
     this._populated = false;
hunk ./contrib/musicplayer/src/libs/ui/Column.js 51
     this._rendered = [];
     
     this._el = new Element("div", {
-      id: options.id + "_column",
+      id: this.options.id + "_column",
       "class": "column",
       styles: {
         overflowX: "hidden",
hunk ./contrib/musicplayer/src/libs/ui/Column.js 91
     // ask for it in every #render() - which can be quite expensive.
     this._el.addEvent("resize", function () {
       this._el_height = this._el.getHeight();
+      this.render();
     }.bind(this));
   },
   
hunk ./contrib/musicplayer/src/libs/ui/Column.js 111
   render: function () {
     if(!this._populated)
       this.populate();
-    if(this._rendered.length === this.options.totalCount + 1)
+    if(this._rendered.length === this.options.totalCount)
       return false;
     
     // We're pre-fetching previous 5 and next 10 items 
hunk ./contrib/musicplayer/src/libs/ui/Column.js 119
     var total_count = this.options.totalCount,
         ids = this.getVisibleIndexes(),
         n = Math.max(0, ids[0] - 6),
-        m = Math.max(Math.min(ids[1] + 10, total_count), total_count),
+        m = Math.min(ids[1] + 10, total_count),
         first_rendered = -1,
         box;
 
hunk ./contrib/musicplayer/src/libs/ui/Column.js 144
     
     if(first_rendered !== -1) {
       var coords = this.getBoxCoords(first_rendered);
+      console.log("rendering box at", this.options.id, [first_rendered, m], coords);
       box.setStyles({
         position: "absolute",        
         top:      coords[1],
hunk ./contrib/musicplayer/src/libs/ui/Column.js 164
   populate: function () {
     var o = this.options;
     this._populated = true;
-    this._weight.setStyle("top", o.rowHeight * o.totalCount /*+ o.rowHeight*/);
+    this._weight.setStyle("top", o.rowHeight * o.totalCount);
     this._el.fireEvent("resize");
     
     return this;
hunk ./contrib/musicplayer/src/libs/ui/Column.js 171
   },
   
   /**
-   *  da.ui.Column#rerender() -> this
+   *  da.ui.Column#rerender() -> this | false
    **/
   rerender: function () {
     if(!this._el)
hunk ./contrib/musicplayer/src/libs/ui/Column.js 177
       return false;
     
-    console.log("rerender", this.options.id, this._deleted);
     var weight = this._weight;
     this._el.empty();
     this._el.grab(weight);
hunk ./contrib/musicplayer/src/libs/ui/Column.js 219
   },
 
   /**
-   *  da.ui.Column#getVisibleIndexes() -> Array
+   *  da.ui.Column#getVisibleIndexes() -> [first_visible_index, last_visible_index]
    *  
    *  Returns an array with indexes of first and last item in visible portion of list.
    **/
hunk ./contrib/musicplayer/src/libs/ui/Column.js 226
   getVisibleIndexes: function () {
     // Math.round() and Math.ceil() are used in such combination
     // to include items which could be only partially in viewport
-    var rh = this.options.rowHeight,
-        per_viewport = Math.round(this._el_height / rh),
-        first = Math.ceil(this._el.getScroll().y / rh);
+    var rh           = this.options.rowHeight,
+        first         = Math.ceil(this._el.getScroll().y / rh),
+        per_viewport  = Math.round(this._el_height / rh);
     if(first > 0) first--;
     
     return [first, first + per_viewport];
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 12
   Implements: [Events, Options],
 
   options: {
-    title: null,
+    title:              null,
+    closeButton:        false,
+    show:               false,
+    draggable:          false,
     hideOnOutsideClick: true,
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 17
-    show: false
+    destroyOnHide:      false
   },
 
   /**
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 26
    *  - options.hideOnOutsideClick (Boolean): if `true`, the dialog will be
    *    hidden when the click outside the dialog element occurs (ie. on the dimmed
    *    portion of screen)
+   *  - options.closeButton (Boolean): toggle the close button. If `true`, the button
+   *    will be injected at the top of `options.html`, before the title (if any).
    *  - options.show (Boolean): if `true` the dialog will be shown immediately as it's created.
    *    Defaults to `false`.
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 30
+   *  - options.draggable (Boolean): when set to `true`, the dialog will be draggable.
+   *    There won't be a dialog wrapper, ie. the users will be able to interact with
+   *    the content around the dialog. Defaults to `false`.
+   *  - options.destroyOnHide (Boolean): destroy the dialog after the dialog has been hidden
+   *    for the first time.
    *  - options.html (Element): contents of the.
    *
    *  To the `options.html` element `dialog` CSS class name will be added and
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 38
-   *  the element will be wrapped into a `div` with `dialog_wrapper` CSS class name.
+   *  the element will be wrapped into a `div` with `dialog_wrapper` (or `draggable_dialog_wrapper`) CSS class name.
    *
    *  If `options.title` is provided, the title element will be injected at the top of
    *  `options.html` and will be given `dialog_title` CSS class name.
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 44
    *
    *  #### Notes
-   *  All dialogs are hidden by default, use [[Dialog.show]] to show them immediately
-   *  after they are created method.
+   *  * All dialogs are hidden by default, use [[Dialog.show]] to show them immediately
+   *    after they are created.
+   *  * When the close button is clicked, before `hide` event is fired, a `dismiss`
+   *    event will be fired. To cancel hiding of the dialog just throw an error from
+   *    an listener.
+   *  * If the dialog will be draggable, you're expected to privide a `options.title`,
+   *    as that will be the handle.
    *
    *  #### Example
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 53
-   *      new da.ui.Dialog({
-   *        title: "What's your name?"
+   *      var hai = new da.ui.Dialog({
+   *        title: "Bonjur tout le monde!"
    *        html: new Element("div", {
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 56
-   *          html: "Hello!"
+   *          html: "Hai World!"
    *        }),
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 58
-   *        show: true
+   *        show: true,
+   *
+   *        onHide: function () {
+   *          hai.destroy();
+   *          delete hai;
+   *        }
    *      });
    *
    **/
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 71
     this.setOptions(options);
     if(!this.options.html)
      throw "options.html must be provided when creating an Dialog";
-
+    
     this._el = new Element("div", {
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 73
-      "class": "dialog_wrapper"
+      "class": this.options.draggable ? "draggable_dialog_wrapper" : "dialog_wrapper"
     });
     if(!this.options.show)
       this._el.style.display = "none";
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 78
     
-    if(this.options.title)
+    if(this.options.title) {
+      var title;
+      
       if(typeof this.options.title === "string")
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 82
-        (new Element("h2", {
+        title = new Element("h2", {
           html: this.options.title,
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 84
+          href: "#",
           "class": "dialog_title no_selection"
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 86
-        })).inject(this.options.html, "top");
+        });
       else if($type(this.options.title) === "element")
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 88
-        this.options.title.inject(this.options.html, "top");
+        title = this.options.title;
+      
+      title.inject(this.options.html, "top");
+      delete title;
+    }
+    
+    if(this.options.closeButton)
+      (new Element("a", {
+        "class": "dialog_close no_selection",
+        html: "Close",
+        title: "Close",
+        events: {
+          click: function () {
+            this.fireEvent("dismiss");
+            this.hide();
+          }.bind(this)
+        }
+      })).inject(this.options.html, "top");
     
     if(this.options.hideOnOutsideClick)
       this._el.addEvent("click", this.hide.bind(this));
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 112
     
     this._el.grab(options.html.addClass("dialog"));
     document.body.grab(this._el);
+    
+    if(this.options.draggable)
+      this._el.makeDraggable({
+        handle: this.options.html.getElement(".dialog_title")
+      });
   },
 
   /**
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 143
     
     this._el.hide();
     this.fireEvent("hide", [this]);
+    
+    if(this.options.destroyOnHide)
+      this.destroy();
+    
     return this;
   },
 
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 159
 
   /**
    *  da.ui.Dialog#destroy() -> this
-   *  fires hide
    **/
   destroy: function () {
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 161
-    this.hide();
-    
     this._el.destroy();
     delete this._el;
     delete this.options;
hunk ./contrib/musicplayer/src/libs/ui/Dialog.js 168
     return this;
   }
 });
-
hunk ./contrib/musicplayer/src/libs/ui/Menu.js 90
     this._el = (new Element("ul")).addClass("menu").addClass("no_selection");
     this._el.style.display = "none";
     this._el.addEvent("click:relay(.menu_item a)", this.click.bind(this));
+    this._el.addEvent("dragend:relay(.menu_item a)", this.click.bind(this));
     this._id = "_menu_" + (ID++) + "_";
     
     this.render();
hunk ./contrib/musicplayer/src/libs/ui/Menu.js 245
     if(event)
       event.stop();
     
-    if(event && event.target)
+    if(event && event.target) {
       this._el.position($extend({
         relativeTo: event.target
       }, this.options.position));
hunk ./contrib/musicplayer/src/libs/ui/Menu.js 249
+    }
     
     this._el.style.zIndex = 5;
     this._el.style.display = "block";
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 25
       if(!this._passesFilter(doc))
         return false;
 
-      emit(doc.id, {
+      emit(doc.title, {
         title: doc.title || doc.id
       });
     },
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 73
         this.view.finished = this.view.finished.bind(this);
       
       if(this.view.reduce)
-        this.view.reduce = this.view.reduced.bind(this);
+        this.view.reduce = this.view.reduce.bind(this);
       if(!this.view.updated && !this.view.temporary)
         this.view.updated = this.mapReduceUpdated;
       if(this.view.updated)
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 103
     this.injectBottom(this.options.parentElement || document.body);
     if(this.options.renderImmediately !== false)
       this.render();
+    
     return this;
   },
   
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 108
   /**
-   *  da.ui.NavigationColumn#mapReduceUpdated(values) -> this
+   *  da.ui.NavigationColumn#mapReduceUpdated(values[, forceRerender = false]) -> this
    *  - values (Object): rows returned by map/reduce process.
    *  
    *  Note that this will have to re-render the whole column, as it's possible
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 115
    *  that one of the new documents should be rendered in the middle of already
    *  rendered ones (due to sorting).
    **/
-  mapReduceUpdated: function (values) {
-    var new_rows = $A(da.db.DEFAULT.views[this.view.id].view.rows);
+  mapReduceUpdated: function (values, rerender) {
+    var new_rows = $A(da.db.DEFAULT.views[this.view.id].view.rows),
+        active = this.getActiveItem();
     new_rows.sort(this.compareFunction);
     
     // Noting new was added, so we can simply re-render those elements
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 121
-    if(this.options.totalCount === new_rows.length) {
+    if(!rerender && this.options.totalCount === new_rows.length) {
       values = values.rows;
       var n = values.length,
           id_prefix = this.options.id + "_column_item_",
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 132
         el = $(id_prefix + item.id);
         if(el) {
           index = el.retrieve("column_index");
+          console.log("Rerendering item", id_prefix, index); 
           
           this.renderItem(index)
             .addClass("column_item")
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 143
       
       this._rows = new_rows;
     } else {
+      console.log("total count was changed, rerendering whole column", this.options.id);
       this.options.totalCount = new_rows.length;
       this._rows = new_rows;
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 146
-      return this.rerender();
+      this.rerender();
+    }
+    
+    if(active) {
+      this._active_el = $(this.options.id + "_column_item_" + active.id);
+      this._active_el.addClass("active_column_item");
     }
   },
   
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 164
   },
   
   /**
+   *  da.ui.NavigationColumn#getActiveItem() -> Object | undefined
+   **/
+  getActiveItem: function () {
+    if(!this._active_el)
+      return;
+    
+    return this.getItem(this._active_el.retrieve("column_index"));
+  },
+  
+  /**
    *  da.ui.NavigationColumn#renderItem(index) -> Element
    *  - index (Number): position of the item that needs to be rendered.
    *  
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 227
    *  #### Examples
    *  
    *      function createFilter (item) {
-   *        return {artist_id: item.id};
+   *        return {artist_id: item.id}
+   *      }
+   *
+   *      function createFilter(item) {
+   *        var id = item.id;
+   *        return function (doc) {
+   *          return doc.chocolates.contains(id)
+   *        }
    *      }
    *  
    **/
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 239
   createFilter: function (item) {
-   return {};
+    return {};
   },
   
   click: function (event, el) {
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 248
       this._active_el.removeClass("active_column_item");
 
     this._active_el = el.addClass("active_column_item");
-    this.fireEvent("click", [item, event, el]);
+    this.fireEvent("click", [item, event, el], 1);
     
     return item;
   },
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 263
    *  [See meanings of return values](https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/sort#Description).
    **/
   compareFunction: function (a, b) {
-    a = a.value.title;
-    b = b.value.title;
+    a = a && a.value ? a.value.title : -1;
+    b = b && b.value ? b.value.title : -1;
     
     if(a < b) return -1;
     if(a > b) return 1;
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 274
   destroy: function () {
     this.parent();
     delete this._rows;
+    delete this._active_el;
     
hunk ./contrib/musicplayer/src/libs/ui/NavigationColumn.js 276
-    if(this.view)
+    if(this.view && !this.view.temporary)
       if(this.options.killView)
         (this.options.db || da.db.DEFAULT).killView(this.view.id);
       else
hunk ./contrib/musicplayer/src/libs/ui/ProgressBar.js 33
    *
    *      progress_bar.toElement().setStyle("width", 100);
    *
+   *  If you want your progress bar as a lovely gradient, just put a `LinearGradient`
+   *  object to `options.foreground`.
+   *
+   *      var pb = new da.ui.ProgressBar({width: 100, height: 5, foreground: "#ffa"});
+   *      var gradient = pb.ctx.createLinearGradient(0, 0, 0, 5);
+   *      gradient.addColorStop(0, "#ffa");
+   *      gradient.addColorStop(1, "#ffe");
+   *      pb.options.foregound = gradient;
+   *      gradient = null;
+   *
    **/
   initialize: function (canvas, options) {
     this.setOptions(options);
hunk ./contrib/musicplayer/src/libs/ui/ProgressBar.js 125
     this.ctx.fillRect(0, 0, this.progress * opts.width, opts.height);
     
     delete opts;
-    return this; 
+    return this;
   },
   
   /**
hunk ./contrib/musicplayer/src/libs/ui/SegmentedProgressBar.js 14
 var SegmentedProgressBar = new Class({
   
   /**
-   *  new da.ui.SegmentedProgressBar(width, height, segments)
+   *  new da.ui.SegmentedProgressBar(width, height, segments[, ticks = 0])
+   *  - width (Number): width of the progressbar in pixels.
+   *  - height (Number): height of the progressbar in pixels.
+   *  - segments (Object): names of individual progress bars and their forground
+   *    color, see example below.
+   *  - ticks (Number): number of 1px marks along the progress bar.
    *
    *  #### Example
    *      var mb = new da.ui.SegmentedProgressBar(100, 15, {
hunk ./contrib/musicplayer/src/libs/ui/SegmentedProgressBar.js 32
    *
    *  The first define progress bar will be in foreground, while
    *  the last defined will be in background;
+   *
+   **/
+  /**
+   *  da.ui.SegmentedProgressBar.segments -> {segment1: da.ui.ProgressBar, ...}
    **/
hunk ./contrib/musicplayer/src/libs/ui/SegmentedProgressBar.js 37
-  initialize: function (width, height, segments) {
+  initialize: function (width, height, segments, ticks) {
     this._index = [];
     this.segments = {};
hunk ./contrib/musicplayer/src/libs/ui/SegmentedProgressBar.js 40
+    this.ticks = ticks;
     
     this._el = new Element("canvas");
     this._el.width = width;
hunk ./contrib/musicplayer/src/libs/ui/SegmentedProgressBar.js 85
     while(n--)
       this.segments[idx[n]].rerender(); 
     
+    if(this.ticks) {
+      var inc = Math.round(this._el.width/this.ticks),
+          h = this._el.height;
+      
+      this.ctx.fillStyle = "rgba(255, 255, 255, 0.3)";
+      //this.ctx.fillStyle = "#ddd";
+      for(var n = 0, m = this._el.width; n < m; n += inc) {
+        if(n > 5)
+          this.ctx.fillRect(n, 0, 1, h);
+      }
+      this.ctx.fillStyle = "rgba(0, 0, 0, 1)";
+    }
+    
     return this;
   },
   
hunk ./contrib/musicplayer/src/libs/util/ID3.js 54
   
   _getFile: function (parser) {
     if(!parser)
-      return this.options.onFailure("fromID3");
+      return this.options.onFailure("noParserFound");
     
     this.request = new Request.Binary({
       url:        this.options.url,
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 22
  *  * TYER
  *  * TIME
  *  * TCON
- *  * USLT
  *  * WOAR
  *  * WXXX
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 24
+ *  * USLT - not parsed by default but frame decoder is present
  *  
  *  As well as their equivalents in ID3 v2.2 specification.
  *  
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 46
  **/
 var BinaryFile    = da.util.BinaryFile,
     CACHE         = [],
-    GENRE_REGEXP  = /^\(\d+\)/,
-    BE_BOM        = "\xFE\xFF",
-    LE_BOM        = "\xFF\xFE",
+    GENRE_REGEXP  = /^\(?(\d+)\)?|(.+)/,
+    //BE_BOM        = "\xFE\xFF",
+    //LE_BOM        = "\xFF\xFE",
     UNSYNC_PAIR   = /(\uF7FF\0)/g,
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 50
-FFLAGS = {
-  ALTER_TAG_23:   0x8000,
-  ALTER_FILE_23:  0x4000,
-  READONLY_23:    0x2000,
-  COMPRESS_23:    0x0080,
-  ENCRYPT_23:     0x0040,
-  GROUP_23:       0x0020,
+    FFLAGS = {
+      ALTER_TAG_23:   0x8000,
+      ALTER_FILE_23:  0x4000,
+      READONLY_23:    0x2000,
+      COMPRESS_23:    0x0080,
+      ENCRYPT_23:     0x0040,
+      GROUP_23:       0x0020,
 
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 58
-  ALTER_TAG_24:   0x4000,
-  ALTER_FILE_24:  0x2000,
-  READONLY_24:    0x1000,
-  GROUPID_24:     0x0040,
-  COMPRESS_24:    0x0008,
-  ENCRYPT_24:     0x0004,
-  UNSYNC_24:      0x0002,
-  DATALEN_24:     0x0001
-},
+      ALTER_TAG_24:   0x4000,
+      ALTER_FILE_24:  0x2000,
+      READONLY_24:    0x1000,
+      GROUPID_24:     0x0040,
+      COMPRESS_24:    0x0008,
+      ENCRYPT_24:     0x0004,
+      UNSYNC_24:      0x0002,
+      DATALEN_24:     0x0001
+    },
 
 FrameType = {
   /**
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 78
     if(d.getByteAt(offset) === 1) {
       // Unicode is being used, and we're trying to detect Unicode BOM.
       // (we don't actually care if it's little or big endian)
-      var test_string = d.getStringAt(offset, 5),
-          bom_pos = test_string.indexOf(LE_BOM);
-      if(bom_pos === -1)
-        bom_pos = test_string.indexOf(BE_BOM);
-      if(bom_pos === -1)
-        window._ts = test_string;
+      //var test_string = d.getStringAt(offset, 5),
+      //    bom_pos = test_string.indexOf(LE_BOM);
+      //if(bom_pos === -1)
+      //  bom_pos = test_string.indexOf(BE_BOM);
         
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 83
-      offset += bom_pos + 1;
-      size -= bom_pos + 1;
-      
-      console.log("Unicode BOM detected", [bom_pos, d.getStringAt(offset, size)]);
+      //offset += bom_pos + 1;
+      //size -= bom_pos + 1;
       
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 86
-      //if(d.getByteAt(offset + 1) + d.getByteAt(offset + 2) === 255 + 254) {
-      //  offset += 2;
-      //  size -= 2;
-      //}
+      if(d.getByteAt(offset + 1) + d.getByteAt(offset + 2) === 255 + 254) {
+        console.log("Unicode BOM detected");
+        offset += 2;
+        size -= 2;
+      }
     }
     
     return d.getStringAt(offset + 1, size - 1).strip();
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 150
   //TIME: $empty,
   TCON: function (offset, size) {
     // Genre, can be either "(123)Genre", "(123)" or "Genre".
-    var data = FrameType.text.call(this, offset, size);
-    return +((data.match(GENRE_REGEXP) || " ")[0].slice(1, -1));
+    var data = FrameType.text.call(this, offset, size),
+        match = data.match(GENRE_REGEXP);
+   
+    if(!match)
+      return -1;
+    if(match[1])
+      return +match[1];
+    if(match[2])
+      return match[2].strip();
+    return -1;
   },
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 161
-  USLT: FrameType.unsyncedLyrics,
+  //USLT: FrameType.unsyncedLyrics,
   WOAR: FrameType.link,
   WXXX: FrameType.userLink
 };
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 415
    *
    **/
   unsync: function (n, m) {
-    console.log("unsyncing file", this.options.url);
-    
     if(arguments.length) {
       var data = this.data.data,
           part = data
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 451
       artist: f.TPE2 || f.TPE1 || f.TP2 || f.TP1 || "Unknown",
       track:  f.TRCK || f.TRK || 0,
       year:   f.TYER || f.TYE || 0,
-      genre:  f.TCON || f.TCO || 0,
-      lyrics: f.USLT || f.ULT || "",
+      genre:  f.TCON || f.TCO || -1,
       links: {
         official: f.WOAR || f.WXXX || f.WAR || f.WXX || ""
       }
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 495
    *  Use this method to add your own ID3v2 frame parsers. You can access this as `da.util.ID3v2Parser.addFrameParser`.
    *  
    *  `fn` will be called with following arguments:
-   *  * offset - position at frame appears in data
-   *  * size - size of the frame, including header
-   *  
+   *  * offset: position at frame appears in data
+   *  * size: size of the frame, including header
    *  
hunk ./contrib/musicplayer/src/libs/util/ID3v2.js 498
-   *  `this` keyword inside `fn` will refer to instance of ID3v2.
+   *  `this` keyword inside `fn` will refer to an instance of [[da.util.ID3v2Parser]].
    **/
   addFrameParser: function (name, fn) {
     FRAMES[name] = fn;
addfile ./contrib/musicplayer/src/libs/util/PlaylistExporters.js
hunk ./contrib/musicplayer/src/libs/util/PlaylistExporters.js 1
+//#require <libs/util/util.js>
+//#require <doctemplates/Song.js>
+
+(function () {
+var Song              = da.db.DocumentTemplate.Song,
+    SERVER            = location.protocol + "//" + location.host,
+    XML_HEADER        = '<?xml version="1.0" encoding="UTF-8"?>\n',
+    TRACKLIST_REGEXP  = /tracklist/gi,
+    TRACKNUM_REGEXP   = /tracknum/gi;
+
+/**
+ *  da.util.playlistExporter.XSPF(playlist) -> String
+ *  - playlist (da.util.Playlist
+ *  
+ *  #### External resources
+ *  * [XSPF v1 specification](http://xspf.org/xspf-v1.html)
+ *  * [XSPF Quickstart](http://xspf.org/quickstart/)
+ *  * [XSPF Validator](http://validator.xspf.org/) - we're generating valid XSPF!
+ *  
+ **/
+function XSPFExporter (playlist) {
+  var ids = playlist.get("song_ids"),
+      file = new Element("root"),
+      track_list = new Array(ids.length),
+      //track_list = new Element("trackList"),
+      song, artist, album, track, duration;
+  
+  for(var n = 0, m = ids.length; n < m; n++) {
+    song = Song.findById(ids[n]);
+    // getting a 'belongs to' relationship is always synchronous
+    song.get("artist",  function (_a) { artist = _a });
+    song.get("album",   function (_a) { album = _a  });
+    // XSPF specification requires positive intergers,
+    // whereas we're using negative ones indicate that the value isn't present.
+    track = song.get("track");
+    duration = song.get("duration");
+    
+    track_list[n] = tag("track", [
+      tag("location", makeURL(song)),
+      tag("title",    song.get("title").stripTags()),
+      tag("creator",  artist.get("title").stripTags()),
+      tag("album",    album.get("title").stripTags()),
+      track     < 1 ? "" : tag("trackNum", track),
+      duration  < 1 ? "" : tag("duration", duration)
+    ].join(""));
+  }
+  
+  file.grab(new Element("playlist", {
+    version: 1,
+    xmlns: "http://xspf.org/ns/0/",
+    
+    html: [
+      tag("title",      playlist.get("title").stripTags()),
+      tag("annotation", playlist.get("description").stripTags()),
+      tag("trackList",  track_list.join(""))
+    ].join("")
+  }));
+  
+  // As per some specification `document.createElement(tagName)`, lowercases
+  // tagName if the `document` is an (X)HTML document.
+  var output = file.innerHTML
+    .replace(TRACKLIST_REGEXP, "trackList")
+    .replace(TRACKNUM_REGEXP,  "trackNum");
+  
+  openDownloadWindow(makeDataURI("application/xspf+xml", XML_HEADER + output));
+}
+
+/**
+ *  da.util.playlistExporter.M3U(playlist) -> undefined
+ *  - playlist (da.db.DocumentTemplate.Playlist): playlist which will be exported
+ *
+ *  #### Resources
+ *  * [Wikipedia article on M3U](http://en.wikipedia.org/wiki/M3U)
+ *  * [M3U specification](http://schworak.com/programming/music/playlist_m3u.asp)
+ *
+ **/
+function M3UExporter (playlist) {
+  var ids    = playlist.get("song_ids"),
+      file = ["#EXTM3U"],
+      song;
+  
+  for(var n = 0, m = ids.length; n < m; n++) {
+    song = Song.findById(ids[n]);
+    song.get("artist", function (artist) {
+      file.push(
+        "#EXTINFO:-1,{0} - {1}".interpolate([artist.get("title"), song.get("title")]),
+        makeURL(song)
+      );
+    });
+  }
+  
+  openDownloadWindow(makeDataURI("audio/x-mpegurl", file.join("\n")));
+}
+
+/**
+ *  da.util.playlistExporter.PLS(playlist) -> String
+ *
+ *  #### Resources
+ *  * [PLS article on Wikipedia](http://en.wikipedia.org/wiki/PLS_(file_format))
+ **/
+function PLSExporter(playlist) {
+  var ids = playlist.get("song_ids"),
+      file = ["[playlist]", "NumberOfEntries=" + ids.length],
+      song;
+  
+  for(var n = 0, m = ids.length; n < m; n++) {
+    song = Song.findById(ids[n]);
+    file.push(
+      "File"   + (n + 1) + "=" + makeURL(song),
+      "Title"  + (n + 1) + "=" + song.get("title"),
+      "Length" + (n + 1) + "=" + song.get("duration")
+    )
+  }
+  
+  file.push("Version=2");
+  openDownloadWindow(makeDataURI("audio/x-scpls", file.join("\n")));
+}
+
+function makeURL(song) {
+  var named = "?@@named=" + encodeURIComponent(song.get("title")) + ".mp3";
+  return [SERVER, "uri", encodeURIComponent(song.id)].join("/") + named;
+}
+
+function makeDataURI(mime_type, data) {
+  var x = "data:" + mime_type + ";charset=utf-8," + encodeURIComponent(data);
+  return x;
+}
+
+function openDownloadWindow(dataURI) {
+  var download_window = window.open(dataURI, "_blank", "width=400,height=200");
+  window.wdx = download_window;
+  
+  // This allows Firefox to open the download dialog,
+  // while Chrome will show the blank page.
+  setTimeout(function () {
+    download_window.location = "playlist_download.html";
+    download_window.onload = function () {
+      var dl = download_window.document.getElementById("download_link");
+      dl.href = dataURI;
+    };
+  }, 2*1000);
+}
+
+function tag(tagName, text) {
+  return "<" + tagName + ">" + text + "</" + tagName + ">";
+}
+
+
+/**
+ * da.util.playlistExporter
+ * Methods for exporting playlists to other formats.
+ *
+ * #### External resources
+ * * [A survey of playlist formats](http://gonze.com/playlists/playlist-format-survey.html)
+ **/
+da.util.playlistExporter = {
+  XSPF:   XSPFExporter,
+  M3U:    M3UExporter,
+  PLS:    PLSExporter
+};
+
+})();
addfile ./contrib/musicplayer/src/libs/util/genres.js
hunk ./contrib/musicplayer/src/libs/util/genres.js 1
+//#require <libs/util/util.js>
+
+(function () {
+/**
+ *  da.util.GENRES -> [String, ...]
+ *  List of genres defined by ID3 spec.
+ *
+ *  #### Links
+ *  * [List of genres](http://www.id3.org/id3v2.3.0#head-129376727ebe5309c1de1888987d070288d7c7e7)
+ **/
+da.util.GENRES = [
+  "Blues","Classic Rock","Country","Dance","Disco","Funk","Grunge","Hip-Hop","Jazz",
+  "Metal","New Age","Oldies","Other","Pop","R&B","Rap","Reggae","Rock","Techno",
+  "Industrial","Alternative","Ska","Death Metal","Pranks","Soundtrack","Euro-Techno",
+  "Ambient","Trip-Hop","Vocal","Jazz+Funk","Fusion","Trance","Classical","Instrumental",
+  "Acid","House","Game","Sound Clip","Gospel","Noise","AlternRock","Bass","Soul","Punk",
+  "Space","Meditative","Instrumental Pop","Instrumental Rock","Ethnic","Gothic",
+  "Darkwave","Techno-Industrial","Electronic","Pop-Folk","Eurodance","Dream",
+  "Southern Rock","Comedy","Cult","Gangsta","Top 40","Christian Rap","Pop/Funk",
+  "Jungle","Native American","Cabaret","New Wave","Psychadelic","Rave","Showtunes",
+  "Trailer","Lo-Fi","Tribal","Acid Punk","Acid Jazz","Polka","Retro","Musical",
+  "Rock & Roll","Hard Rock","Folk","Folk-Rock","National Folk","Swing","Fast Fusion",
+  "Bebob","Latin","Revival","Celtic","Bluegrass","Avantgarde","Gothic Rock",
+  "Progressive Rock","Psychedelic Rock","Symphonic Rock","Slow Rock","Big Band",
+  "Chorus","Easy Listening","Acoustic","Humour","Speech","Chanson","Opera","Chamber Music",
+  "Sonata","Symphony","Booty Bass","Primus","Porn Groove","Satire","Slow Jam","Club","Tango",
+  "Samba","Folklore","Ballad","Power Ballad","Rhythmic Soul","Freestyle","Duet","Punk Rock",
+  "Drum Solo","A capella","Euro-House","Dance Hall"
+];
+da.util.GENRES[-1] = "Unknown";
+
+})();
addfile ./contrib/musicplayer/src/playlist_download.html
hunk ./contrib/musicplayer/src/playlist_download.html 1
-
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    
+    <title>Playlist download</title>
+    <link rel="stylesheet" href="resources/css/reset.css" type="text/css" media="screen" charset="utf-8"/>
+    <link rel="stylesheet" href="resources/css/text.css"  type="text/css" media="screen" charset="utf-8"/>
+    
+    <style type="text/css">
+      body {
+        text-align: center;
+        width: 300px;
+        margin: auto;
+        background: #f3f3f3;
+      }
+      
+      #download_link {
+        padding: 10px;
+        background: #339D4C;
+        color: #fff;
+        font-size: 1.2em;
+        display: block;
+        margin: 10px auto;
+        text-decoration: none;
+        width: 100px;
+        font-weight: bold;
+        text-shadow: #326732 0 1px 0;
+        
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        border-radius: 4px;
+        
+        -webkit-box-shadow: #ffa 0 0 10px;
+        -moz-box-shadow: #ffa 0 0 10px;
+        box-shadow: #ffa 0 0 10px;
+      }
+      
+      #download_link:active {  
+        background: #326732;
+        padding: 11px 10px 9px 10px;
+        text-shadow: #000 0 -1px 0;
+      }
+    </style>
+  </head>
+  <body>
+    <a id="download_link" href="#download">Download</a>
+    <small>
+      Right-click on the button above and select <em>Save Link As...</em>
+      from the context menu.
+    </small>
+  </body>
+</html>
hunk ./contrib/musicplayer/src/resources/css/app.css 2
 /*** Global styles ***/
-@font-face {
-  font-family: Junction;
-  font-style: normal;
-  font-weight: normal;
-  src: local('Junction'), url('resources/fonts/Junction.ttf') format('truetype');
-}
-
 body {
   font-family: 'Droid Sans', 'Lucida Grande', 'Lucida Sans', 'Bitstream Vera', sans-serif;
   overflow: hidden;
hunk ./contrib/musicplayer/src/resources/css/app.css 5
-  background: #c0c0c0;
+  background: #c0c0c0 url(../images/radio_pattern.png) 0 0 repeat;
 }
 
 a {
hunk ./contrib/musicplayer/src/resources/css/app.css 13
   color: inherit;
 }
 
-input[type="text"], input[type="password"] {
+input[type="text"], input[type="password"], textarea {
   border: 1px solid #ddd;
   border-top: 1px solid #c0c0c0;
   background: #fff;
hunk ./contrib/musicplayer/src/resources/css/app.css 20
   padding: 2px;
 }
 
-input:focus, input:active {
+input:focus, input:active, textarea:focus, input[type="button"]:focus, input[type="submit"]:focus, button:focus {
   border-color: #33519d;
   -webkit-box-shadow: #33519d 0 0 5px;
   -moz-box-shadow: #33519d 0 0 5px;
hunk ./contrib/musicplayer/src/resources/css/app.css 24
-  -o-box-shadow: #33519d 0 0 5px;
   box-shadow: #33519d 0 0 5px;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 28
 input[type="button"], input[type="submit"], button {
-  background: #ddd;
-  border: 1px transparent;
+  background: #ddd url(../images/selection_background.png) 0 50% repeat-x;
+  border: 0;
   border-bottom: 1px solid #c0c0c0;
hunk ./contrib/musicplayer/src/resources/css/app.css 31
+  border-top: 1px solid rgba(0,0,0,0);
   padding: 2px 7px;
   color: #000;
   text-shadow: #fff 0 1px 0;
hunk ./contrib/musicplayer/src/resources/css/app.css 35
+  outline: 0;
   
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
hunk ./contrib/musicplayer/src/resources/css/app.css 39
-  -o-border-radius: 4px;
   border-radius: 4px;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 42
-input[type="button"]:active, input[type="submit"]:active, button:active {
-  border-top: 1px solid #1e2128;
-  border-bottom: 0;
-  background: #33519d !important;
+input[type="button"]:active, input[type="submit"]:active, button:active, button.active {
+  border-top: 1px solid #1e2128 !important;
+  border-bottom: 1px solid rgba(0,0,0,0) !important;
+  background: #33519d url(../images/selection_background_inverted.png) 0 100% repeat-x !important;
   color: #fff;
   text-shadow: #000 0 1px 1px;
 }
hunk ./contrib/musicplayer/src/resources/css/app.css 50
 
+input[type="submit"] {
+  font-weight: bold;
+  font-size: 1.1em;
+}
+
+.button_group button {
+  margin: 0;
+  border-left: 1px solid #c0c0c0;
+  border-top: 1px solid #ddd;
+  
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0;
+}
+
+.button_group button:first-child {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+
+.button_group button:last-child {
+  border-right: 1px solid #ddd;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.button_group button:active:first-child, .button_group button.active:first-child {
+  border-left-color: #33519D;
+}
+
+.button_group button:active:last-child, .button_group button.active:last-child {
+  border-right-color: #33519D;
+}
+
 .no_selection {
   -webkit-user-select: none;
   -moz-user-select: none;
hunk ./contrib/musicplayer/src/resources/css/app.css 160
   z-index: 2;
 }
 
+.draggable_dialog_wrapper {
+  position: fixed;
+  top: 50px;
+  left: 100px;
+  z-index: 3;
+}
+
 .dialog {
   display: block;
   margin: 50px auto 0 auto;
hunk ./contrib/musicplayer/src/resources/css/app.css 170
-  background: #fff;
-  border: 1px solid #ddd;
+  border: 5px solid rgba(255, 255, 255, 0.3);
+  
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
   
   -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 10px 40px;
   -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 10px 40px;
hunk ./contrib/musicplayer/src/resources/css/app.css 178
-  -o-box-shadow: rgba(0, 0, 0, 0.4) 0 10px 40px;
   box-shadow: rgba(0, 0, 0, 0.4) 0 10px 40px;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 181
+.draggable_dialog_wrapper .dialog {
+  margin: 0;
+}
+
+iframe.dialog {
+  background: #000;
+  border: 0;
+}
+
 .dialog_title {
   margin: 0;
   padding: 5px;
hunk ./contrib/musicplayer/src/resources/css/app.css 201
   text-shadow: #1e2128 0 1px 0;
 }
 
+.draggable_dialog_wrapper .dialog_title {
+  cursor: move;
+}
+
+.dialog_close {
+  display: block;
+  float: right;
+  width: 16px;
+  height: 16px;
+  background: transparent url(../images/close.png) 0 100% no-repeat;
+  cursor: default;
+  margin: 10px;
+  text-indent: -4444px;
+  opacity: 0.3;
+}
+
+.dialog_close:active {
+  opacity: 0.1;
+}
+
 #loader {
   font-size: 2em;
   width: 100%;
hunk ./contrib/musicplayer/src/resources/css/app.css 308
 	background: url(bubble.png) bottom right;
 }
 
+/** Drag&drop **/
+.drag_clone {
+  background: transparent !important;
+  z-index: 10 !important;
+}
+
 /*** Navigation columns ***/
 .column_container {
   float: left;
hunk ./contrib/musicplayer/src/resources/css/app.css 344
   width: 100%;
 }
 
-.column_container .column_header:active, .column_container .column_header:focus, .column_header.active {
+.column_container .column_header:active, .column_container .column_header:focus, .column_header.active_menu {
   background-color: #1e2128;
   padding: 3px 0 1px 0;
   outline: 0;
hunk ./contrib/musicplayer/src/resources/css/app.css 348
+  -webkit-box-shadow: #000 0 3px 7px inset;
 }
 
 .column_header.active {
hunk ./contrib/musicplayer/src/resources/css/app.css 363
 .navigation_column {
   width: 100%;
   background: #fff url(../images/column_background.png) 0 0 repeat;
-/*  background-attachment: fixed; */
+  background-attachment: scroll;
   z-index: 1;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 388
   background-color: #fff;
 }
 
+.column_item .action {
+  display: block;
+  float: right;
+  margin-top: -1px;
+  cursor: default;
+}
+
 .navigation_column a.column_item {
   display: block;
   cursor: default;
hunk ./contrib/musicplayer/src/resources/css/app.css 426
 .navigation_column .active_column_item, .menu_item:hover, #next_song:hover, #prev_song:hover,
 #video_search_results a:active, #video_search_results a:focus {
   background-color: #33519d !important;
+  background-image: url(../images/selection_background.png);
+  background-position: bottom left;
+  background-repeat: repeat-x;
   text-shadow: #000 0 1px 0;
   color: #fff !important;
   outline: 0 !important;
hunk ./contrib/musicplayer/src/resources/css/app.css 441
 
 /** Albums column **/
 #Albums_column {
-  background: #fff;
+  background-image: url(../images/column_background_tall.png);
 }
 
 #Albums_column .column_item {
hunk ./contrib/musicplayer/src/resources/css/app.css 445
+  height: 40px;
+}
+
+#Albums_column .column_item img {
+  display: block;
+  float: left;
+  margin: -12px 0 0 0;
   width: 64px;
   height: 64px;
hunk ./contrib/musicplayer/src/resources/css/app.css 454
-  padding: 4px;
-  text-indent: 0;
-  border-radius: 2px;
-  display: inline-block;
-  margin: 0;
+  
+  -webkit-box-shadow: rgba(0, 0, 0, 0.5) 1px 0 5px;
+  -moz-box-shadow: rgba(0, 0, 0, 0.5) 1px 0 5px;
+  box-shadow: rgba(0, 0, 0, 0.5) 1px 0 5px;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 460
-#Albums_column .column_item.even, #Albums_column .column_item.odd {
-  background: transparent;
+#Albums_column .column_item span {
+  vertical-align: top;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 464
-#Albums_column .column_item img {
-  display: block;
-  
-  -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 3px;
-  -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 3px;
-  -o-box-shadow: rgba(0, 0, 0, 0.5) 0 1px 3px;
-  box-shadow: rgba(0, 0, 0, 0.5) 0 1px 3px;
+/** Songs column **/
+
+/** Genres column **/
+#Genres_column .column_item span {
+  display: inline;
+}
+
+#Genres_column .subtitle {
+  float: right;
+  margin-right: 5px;
+}
+
+/** Playlists column **/
+#Playlists_column .action {
+  display: none;
+  width: 16px;
+  height: 16px;
+  background: url(../images/cog.png) 50% 50% no-repeat;
+  text-indent: -4444px;
+  margin: 1px 4px 0 0;
+  opacity: 0.4;
+  cursor: default;
+  outline: 0;
+}
+
+#Playlists_column .action:active {
+  opacity: 0.3 !important;
+}
+
+#Playlists_column .column_item:hover .action, #Playlists_column .active_column_item .action {
+  display: block !important;
+}
+
+#Playlists_column .active_column_item .action {
+  background-image: url(../images/cog_inverted.png);
+  opacity: 1;
 }
 
 /*** Menus ***/
hunk ./contrib/musicplayer/src/resources/css/app.css 507
   display: block;
   text-indent: 0;
   margin: 0 0 0 -1px;
-  padding: 3px 0;
+  padding: 4px 0;
   position: fixed;
   background: #fff;
   color: #000;
hunk ./contrib/musicplayer/src/resources/css/app.css 511
-  min-width: 100px;
+  min-width: 170px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
hunk ./contrib/musicplayer/src/resources/css/app.css 518
   list-style: none;
   cursor: default;
   z-index: 5;
-  border: 1px solid #ddd;
   
   -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
   -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
hunk ./contrib/musicplayer/src/resources/css/app.css 524
   -o-box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
   box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
   
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  -o-border-radius: 3px;
-  border-radius: 3px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
 }
 
 .menu_item {
hunk ./contrib/musicplayer/src/resources/css/app.css 541
   color: inherit;
   text-decoration: none;
   cursor: default;
+  margin: 0 20px 0 0;
 }
 
 .menu_item .menu_separator {
hunk ./contrib/musicplayer/src/resources/css/app.css 563
   content: " ✔ ";
 }
 
+.menu_item a.title {
+  background: #fff !important;
+  font-weight: bold;
+}
+
+.menu_item:hover a.title {
+  color: #000 !important;
+  text-shadow: none !important;
+}
+
+.menu_item.disabled {
+  color: #c0c0c0;
+  background: #fff !important;
+}
+
 .navigation_menu {
   border-top: 0;
   -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
hunk ./contrib/musicplayer/src/resources/css/app.css 586
   box-shadow: rgba(0, 0, 0, 0.3) 0 10px 30px;
 }
 
+.menu .button_group button {
+  background-color: #fff;
+}
+
+#main_menu {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  color: #000;
+  cursor: default;
+  text-shadow: #fff 0 1px 0;
+  display: block;
+  padding: 3px;
+  z-index: 7;
+  width: 20px;
+  height: 20px;
+  text-indent: -4444px;
+  background: url(../images/cog.png) 50% 50% no-repeat;
+  
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+}
+
+#main_menu:hover {
+  background-color: #ddd;
+  
+  -webkit-box-shadow: #fff 0 0 4px;
+  -moz-box-shadow: #fff 0 0 4px;
+  -o-box-shadow: #fff 0 0 4px;
+  box-shadow: #fff 0 0 4px;
+}
+
+#main_menu:active, #main_menu.active_menu {
+  background-color: #fff;
+  -webkit-box-shadow: #fff 0 0 6px;
+}
+
+#main_menu.active_menu {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
 /*** Settings ***/
 #settings {
   width: 600px;
hunk ./contrib/musicplayer/src/resources/css/app.css 710
 #revert_settings {
   float: left;
   background: transparent;
-  border-bottom: 1px transparent;
+  border-bottom: 1px solid rgba(0, 0, 0, 0);
 }
 
 /** Navigation columns **/
hunk ./contrib/musicplayer/src/resources/css/app.css 735
   position: fixed;
   top: 0;
   right: 0;
+  background: #f3f3f3 url(../images/song_details_background.png) 0 0 repeat;
 }
 
 #song_info_block {
hunk ./contrib/musicplayer/src/resources/css/app.css 740
   width: 100%;
-  background: #f3f3f3;
+/*  background: #f3f3f3 url(../images/radio_pattern.png) 0 0 repeat;
+  -webkit-box-shadow: rgba(0, 0, 0, 0.6) 0 1px 15px inset; */
 }
 
 #song_details {
hunk ./contrib/musicplayer/src/resources/css/app.css 748
   font-size: 0.9em;
   color: #585858;
   float: left;
-  width: 300px;
-  padding: 10px;
-  margin-top: 20px;
+  width: 315px;
+  padding: 0 0 0 10px;
+  margin: 27px 0 0 0;
   cursor: default;
hunk ./contrib/musicplayer/src/resources/css/app.css 752
+  text-shadow: #fff 0 1px 0;
 }
 
 #song_details h2, #song_details span {
hunk ./contrib/musicplayer/src/resources/css/app.css 775
   width: 160px;
   max-width: 160px;
   overflow: hidden;
-  padding: 10px;
+  padding: 0;
   float: left;
   display: block;
hunk ./contrib/musicplayer/src/resources/css/app.css 778
+  margin: 12px 0 10px 5px;
 }
 
 #song_album_cover {
hunk ./contrib/musicplayer/src/resources/css/app.css 782
-  /*float: left;
-  display: block; 
-  margin: 10px;*/
-  max-width: 150px;
-  border: 1px solid #fff;
+  max-width: 140px;
   
hunk ./contrib/musicplayer/src/resources/css/app.css 784
-  -webkit-box-shadow: #c0c0c0 0 3px 5px;
-  -moz-box-shadow: #c0c0c0 0 3px 5px;
-  -o-box-shadow: #c0c0c0 0 3px 5px;
-  box-shadow: #c0c0c0 0 3px 5px;
+  -webkit-box-shadow: #000 0 1px 3px;
+  -moz-box-shadow: #000 0 1px 3px;
+  -o-box-shadow: #000 0 1px 3px;
+  box-shadow: #000 0 1px 3px;
   
hunk ./contrib/musicplayer/src/resources/css/app.css 789
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  -o-border-radius: 3px;
-  border-radius: 3px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
 }
 
 #song_title {
hunk ./contrib/musicplayer/src/resources/css/app.css 816
 
 #play_button_wrapper {
   display: inline-block;
-  width: 40px;
-  height: 40px;
+  width: 41px;
+  height: 41px;
   vertical-align: middle;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 833
 }
 
 #play_button:active, #play_button:focus, #play_button.active {
-  background-position: 0 -40px;
+  background-position: 0 -41px;
 }
 
 #play_button.active:active, #play_button.active:focus {
hunk ./contrib/musicplayer/src/resources/css/app.css 837
-  background-position: 0 -80px;
+  background-position: 0 -82px;
 }
 
 #next_song, #prev_song {
hunk ./contrib/musicplayer/src/resources/css/app.css 888
 
 #next_song:hover {
   background-image: url(../images/next_active.png);
+  background-position: 0% 50%;
+  background-repeat: no-repeat;
 }
 
 #prev_song {
hunk ./contrib/musicplayer/src/resources/css/app.css 902
 
 #prev_song:hover {
   background-image: url(../images/previous_active.png);
+  background-position: 100% 50%;
+  background-repeat: no-repeat;
+}
+
+#song_position {
+  font-size: 0.8em;
+  text-align: center;
+  width: 100px;
+  position: relative;
+  top: 10px;
+  left: -100px;
 }
 
 /*** Song Context ***/
hunk ./contrib/musicplayer/src/resources/css/app.css 917
 #context_tabs {
-  background: #ddd;
+/*
+  background: #ddd url(../images/song_details_background.png) 0 0 repeat;
   border: 1px solid #c0c0c0;
   border-left: 0;
   border-right: 0;
hunk ./contrib/musicplayer/src/resources/css/app.css 922
+  -webkit-box-shadow: #c0c0c0 0px -1px 7px inset;
+*/
+  background: #fff;
+  border-top: 1px solid #c0c0c0;
   width: 100%;
   text-align: center;
   padding: 0;
hunk ./contrib/musicplayer/src/resources/css/app.css 930
   text-shadow: #fff 0 1px 0;
-  
-  -webkit-box-shadow: #c0c0c0 0px -1px 7px inset;
+  margin-top: 5px;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 933
-#context_tabs a.tab {
-  text-decoration: none;
-  display: inline-block;
-  cursor: default;
-  padding: 2px 7px;
-  margin: 0 0 -1px 0;
-  outline: 0;
-  border-left: 1px solid #c0c0c0;
-}
 
hunk ./contrib/musicplayer/src/resources/css/app.css 934
-#context_tabs a.tab:last-child {
-  border-right: 1px solid #c0c0c0;
+#context_tabs button {
+  position: relative;
+  top: -10px;
+  z-index: 2;
+  border-top: 1px solid #c0c0c0;
+  background-color: #f3f3f3;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 942
-#context_tabs a.tab:active, #context_tabs a.tab:focus, #context_tabs a.tab.active {
-  -webkit-box-shadow: #c0c0c0 0px 1px 5px inset;
-  -moz-box-shadow: #c0c0c0 0px 1px 5px inset;
-  -o-box-shadow: #c0c0c0 0px 1px 5px inset;
-  box-shadow: #c0c0c0 0px 1px 5px inset;
+#context_tabs button:first-child {
+  border-left-color: #c0c0c0;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 946
-#context_tabs a.tab.active {
-  background: #fff;
+#context_tabs button:last-child {
+  border-right-color: #c0c0c0;
 }
 
 #song_context {
hunk ./contrib/musicplayer/src/resources/css/app.css 952
   overflow: auto;
+  background: #fff;
 }
 
 #song_context_loading {
hunk ./contrib/musicplayer/src/resources/css/app.css 961
   text-align: center;
   padding-top: 20px;
   font-size: 1.5em;
+  z-index: 1 !important;
 }
 
 /** Artist context **/
hunk ./contrib/musicplayer/src/resources/css/app.css 1101
   margin: auto;
 }
 
-#recommended_songs li:nth-child(2n+1), #video_search_results li:nth-child(2n+1) {
+#recommended_songs li:nth-child(odd), #video_search_results li:nth-child(odd) {
   background: #f3f3f3;
 }
 
hunk ./contrib/musicplayer/src/resources/css/app.css 1152
   float: left;
   width: 360px;
 }
+
+#youtube_music_video {
+  /* fun fact: Chromium won't play <video>s if there's a border-radius set */
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+
+/*** Search ***/
+#search_dialog_wrapper {
+  width: 500px;
+}
+
+#search_dialog {
+  background: #fff;
+}
+
+#search_header {
+  padding: 5px;
+  text-indent: 0;
+}
+
+#search_field {
+  margin: 0;
+}
+
+#search_by_filters {
+  display: inline;
+}
+
+#search_by_filters.button_group button:first-child {
+  border-left: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+#search_results_column {
+  height: 200px;
+  max-height: 350px;
+  background-image: url(../images/column_background_tall.png);
+}
+
+
+#search_results_column .column_item {
+  height: 40px;
+}
+
+#search_results_column .column_item u {
+  font-weight: bold;
+}
+
+#search_results_column .column_item .result_number {
+  display: block;
+  float: left;
+  width: 35px;
+  height: 50px;
+  margin: -4px 0 0 0;
+  padding: 0 5px 0 0;
+  border-right: 1px solid #ddd;
+  background: rgba(255, 255, 255, 0.1);
+  text-align: right;
+  vertical-align: middle;
+}
+
+/** Playlist editor **/
+.playlist_editor_wrapper {
+  width: 500px;
+}
+
+.playlist_editor {
+  background: #fff;
+}
+
+#playlist_details {
+  width: 200px;
+  padding: 5px 0 0 5px;
+}
+
+#playlist_details input, #playlist_details textarea {
+  width: 190px;
+}
+
+#playlist_details textarea {
+  height: 120px;
+}
+
+#playlist_details label {
+  font-size: 0.9em;
+  margin-top: 5px;
+  display: block;
+  color: #585858;
+}
+
+#playlist_songs {
+  width: 294px;
+  height: 300px;
+  margin: 0;
+  border-left: 1px solid #ddd;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+#playlists_songs li:nth-child(odd) {
+  background-color: #f0f6fd !important;
+}
+
+#playlist_songs .column_item {
+  margin: 0;
+/*
+  text-indent: 16px;
+  background: #fff url(../images/move_vertical.png) 5px 50% no-repeat;
+*/
+  cursor: move;
+}
+
+#playlist_songs .column_item .action {
+  width: 16px;
+  height: 16px;
+  margin: 1px 5px 0 0;
+  opacity: 0.2;
+  outline: 0;
+  background: url(../images/close.png) 0 0 no-repeat;
+  display: none;
+}
+
+#playlist_songs .column_item .action:active {
+  opacity: 0.3;
+}
+
+#playlist_songs .column_item:hover .action {
+  display: block;
+}
+
+#playlist_details, #playlist_songs {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.dialog .footer {
+  text-align: right;
+  border-top: 1px solid #ddd;
+  background: #f3f3f3;
+  padding: 5px;
+}
+
+.dialog .footer button {
+  background: transparent;
+  border-bottom: 1px transparent;
+  float: left;
+}
+
+#playlist_delete:active {
+  background-color: #f00 !important;
+}
+
+/** 'Add to playlist' dialog **/
+.add_to_pl_wrapper {
+  width: 300px;
+}
+
+.add_to_pl_wrapper .dialog_title {
+  font-size: 0.9em;
+  text-indent: 0;
+}
+
+.add_to_pl_wrapper .dialog_title span {
+  display: inline-block;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.add_to_pl_wrapper .dialog_title .title {
+  display: block;
+  font-size: 1.3em;
+  font-weight: bold;
+}
+
+.add_to_pl_wrapper .dialog_title img {
+  float: left;
+  margin-right: 10px;
+  
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+#add_to_pl_dialog {
+  background: #fff;
+}
+
+#add_to_pl_playlists {
+  padding: 10px 5px;
+}
+
+#add_to_pl_playlists label {
+  display: block;
+  margin-top: 5px;
+}
+
+#add_to_new_pl {
+  display: none;
+  margin: 10px 0 0 0;
+}
+
+#add_to_pl_dialog input[type="text"], #add_to_pl_dialog textarea, #add_to_pl_dialog select {
+  width: 98%;
+}
addfile ./contrib/musicplayer/src/resources/images/close.png
binary ./contrib/musicplayer/src/resources/images/close.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000100000002008060000001b89f8cc000000047342
*4954080808087c0864880000000970485973000006ec000006ec011e7538350000001974455874
*536f667477617265007777772e696e6b73636170652e6f72679bee3c1a0000012a494441544889
*ad94c16d853010449fa3d4c201714b13d4902ae8e0534d1a4094910672e284ec06b84e0e597f99
*0dfce8c7ac3497d1ccc86baf3748a2ac104203bc036f06804fc387a4af9d411216128001d8009d
*60334db8fb0af3fcc0e831e7901c303c61ce1872fb8d3bf602f4402cb868dce2da69004697dc5b
*720b24436b5cefb43780c991b1307440570446a79d00d683fe52361641e940b7be704155b73052
*798975cf583d48978c72cd670ab5dff915573ef0cfca479114240d92369dd7669afd3e30627e60
*f435e7901c303c61ce757fc646fb632f927a49b1e0a2714bc16d921a248d2eb9b753b59292a135
*ae77da1b922647c6c2d019726074da0949eb417fa930e6a074a0bb601f5cd142f525563f63f520
*5d32cafffe4cbff6013f3bf2741f00bb7df00d1714f4b762e44b340000000049454e44ae426082
*
addfile ./contrib/musicplayer/src/resources/images/cog.png
binary ./contrib/musicplayer/src/resources/images/cog.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000000047342
*4954080808087c0864880000000970485973000006540000065401c4f08d9d0000001974455874
*536f667477617265007777772e696e6b73636170652e6f72679bee3c1a0000011749444154388d
*95d3312f844110c6f1df5ea320e4140a112d22e10b50899e4629514aa85444f0159412a528a8f0
*157444145a8942e322512824b8ace64ee6deec917b934d76669ef9efecec3b29e7acf4a594fab0
*8f8c839cf3575198732e2eacb6923356823f75e842601a8f38c602ee03e0068b38c113264b808b
*90f0df3a2f01967b002c9500836806d129e6308fb3e06f6220e419c20e9e83e8bad0d4db107fc6
*1eeab0542871ad00582f5da586577c545e77aaf0e255df3b5edaf43ab603b981b170fa38de427c
*0b83d5268e569af88d4b5c55fccd0e7800ecf6f08c07edbc5ab8d370d83fe033d85fb80b76ffef
*2e5450c326665af66138f128fcee1bc23cfc354c130130db4d97ba8d33a494465a5536ba697e00
*6077360dd40f77970000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/cog_inverted.png
binary ./contrib/musicplayer/src/resources/images/cog_inverted.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000000017352
*474200aece1ce900000006624b474400ff00ff00ffa0bda7930000000970485973000006540000
*065401c4f08d9d0000000774494d4507da080b131e05224b8f500000011a4944415438cb9593b1
*4a03611084e7aeb1500cb1b010b1d520c417d04aec53590a9642ac5229a27985948285855a68a5
*be829d2216b682459a04c1c242301e9fcd05c7632fc485e3fedd7ffe5966d84d0095c484a42349
*486a4b1a8428a0ecdbe23736ad9e38ce1f2c032fc009b00e3c19c13db0019c01afc0524470cdf8
*71357c979a9a538d1fe79107d340665d2e8055600db8b47a064cb9840ab00f740d741798fa60f7
*5de010a80a68041ab703829d00d74825bd49fa2c68ac05ba8bb50f49bd217b15d833e63e306fdd
*178077bb6fe59efd3171ae60e2377003dc16ea99933bc1c13fe6a01dcdc18c9d9f257d593e90f4
*68f964340729b00bd4f3bc631d8f6ddc9bbe0fa39669d10856ca70c9887596a4d9fcdf2f03fc00
*e3bb727f8d61312a0000000049454e44ae426082
binary ./contrib/musicplayer/src/resources/images/column_background.png
oldhex
*89504e470d0a1a0a0000000d49484452000000010000003c0802000000289347ad0000033b6943
*43504943432050726f66696c650000780185944b68d4501486ff8c2982b482a8b51694e0428bb4
*253ed08a50db69b5d6917118fbd022c83473671a4d333199191f884841dcf95a8a1b1f888b2ae2
*42ba5070a50b9142eb6b510471a52288423752c6ff26ed4c2a562f24f972ce7fcfeb8600550f53
*8e63453460d8cebbc9aea876e8f080b6780255a84135b85286e7b42712fb7da6563ee7afe9b750
*a465b249c68af51d98f8b46df5fd4b8f62efeb9ef6fa9ef9fa796f352e13028a46eb8a6cc05b25
*0f06bc57f2c9bc93a7e68864632895263be446b727d941be415e9a0df16088d3c23380aa366a72
*86e3324e6405b9a5686465cc51b26ea74d9b3c25ed69cf18a686fd467ec859d0c6958f01ad6b80
*452f2bb6010f18bd0bac5a5fb135d4012bfb81b12d15dbcfa43f1fa576dccb6cd9ec8753aaa3ac
*e943a9f4733db0f81a3073b554fa75ab549ab9cd1cace3996514dca2af6561ca2b20a837d8cdf8
*c9395a88839e7c550b709373ec5f02c42e00d73f021b1e00cb1f03891aa0670722e7d96e70e5c5
*29ce05e8c839a75d333b94d736ebfa76ad9d472bb46edb686ed45296a5f92e4f738527dca24837
*63d82a70cefe5ac67bb5b07b0ff2c9fe22e784b77b96959174aa93b34433dbfa92169dbbc98de4
*7b19734f37b981d754c6ddd31bb0b2d1cc77f7041ce9b3ad38cf456a2275f660fc0099f115d5c9
*47e53c248f78c58332a66f3f96da9720d7d39e3c9e8b494d2df7b69d19eae1194956ac33431df1
*597eed169232ef3a6aee3896ffcdb3b6c8731c8605011336ef363424d185289ae0c0450e197a4c
*2a4c5aa55fd06ac2c3f1bf2a2d24cabb2c2abaf0997b3efb7b4ea0c0dd327e1fa2718c34962368
*fa3bfd9bfe46bfa9dfd1bf5ea92f34543c23ee51d318bffc9d716566598d8c1bd428e3cb9a82f8
*06ab6da7d74296d6615e414f5e59df14ae2e635fa92f7b3499435c8c4f87ba14a14c4d18643cd9
*b5ecbe48b6f826fc7c73d9169a1eb52fce3ea9abe47aa38e1d99ac7e71365c0d6bffb3ab60d2b2
*abf0e48d902e3c6ba1ae5537a9dd6a8bba039aba4b6d535bd54ebeed54f79777f47256264eb26e
*97d5a7d8838dd3f4564eba325b04ff167e31fc2f75095bb8a6a1c97f68c2cd654c4bf88ee0f61f
*7748f92ffc0d0185150d7c4b3b3b000000097048597300000b1300000b1301009a9c180000001a
*49444154081d63f8ffff3f13030303ddf1dbafffe86e27d09f0052e10654d7b720ec0000000049
*454e44ae426082
newhex
*89504e470d0a1a0a0000000d49484452000000010000003c0802000000289347ad000000017352
*474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b130000
*0b1301009a9c180000000774494d4507da08070e031b790051b4000000184944415408d763f8ff
*ff3f13030303ddf1c7efff06c25e0055a9065a60440f6e0000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/column_background_tall.png
binary ./contrib/musicplayer/src/resources/images/column_background_tall.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d4948445200000001000000640802000000c84ecd37000000017352
*474200aece1ce9000000097048597300000b1300000b1301009a9c180000000774494d4507da08
*070e041b3641c773000000194944415418d363f8ffff3f130303c390c71fbfff1b0efe00007fd6
*06aad7b111140000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/menu_selection_bg.png
binary ./contrib/musicplayer/src/resources/images/menu_selection_bg.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000010000001e0806000000ed9574c7000000017352
*474200aece1ce900000006624b4744000000000000f943bb7f000000097048597300000b130000
*0b1301009a9c180000000774494d4507da08050b3a0bc6f1c60a0000001974455874436f6d6d65
*6e74004372656174656420776974682047494d5057810e17000000364944415408d78d8dc10900
*2100c342177317f77434cd3d44455ff70981b694529b018876a2121cb75d4077f909ce4c22cb40
*e6c74f7c55bd325b7366d9130000000049454e44ae426082
binary ./contrib/musicplayer/src/resources/images/play.png
oldhex
*89504e470d0a1a0a0000000d49484452000000280000007808060000008070b09a000000047342
*4954080808087c086488000000097048597300000dd700000dd70142289b780000001974455874
*536f667477617265007777772e696e6b73636170652e6f72679bee3c1a000013cd49444154789c
*ad5b7b9015d599ff9dc7edee3b330e0c030e8f0b988cbb8802098b24881544a694adac60b4023e
*8810145722082aec4682c435d172b792182ba58b0fd06cb1a861acb5c4ec26d9dd02190bb59652
*b22b6aca9555c60b0c0cc3639899dbddb7fb9cfd63fab4e79edb7def9d49beaa53ddd3ddf79c5f
*ffbe73bef33d7ac8f9f3e7311c3977eedcc50016039805603c21640221643c0048298f49298f02
*3806e05d00bb478c18f1c970c621430178f6ecd9b100d612426ee49c4fe59c8331064208082125
*cf4a2921a544188608820041107c24a5fc17004f8e1c39b2eb4f0af0cc99331700d8c818db68db
*761de77cf0c71aa8248026d82008e0fbfe4018863f05f0d3a6a6a6aa83570578faf4e92594d2ad
*b66d37673299188879d4cf4d703a4805d4f3bc1e21c4f7468d1ad53e2c803d3d3d04c08f6ddbde
*6c5956ac46bd99004dd1c19920a594f03c0fbeef3f0a604b7373b34cea2311e0a953a7ea09212f
*398eb388730e4a6922b0a4b9970630ad158b45789ef7ba94f296d1a347f79b7d50f34277773721
*84bcec38ce22b500cadeaa02d83496d35e88730ec7711611425eeeeeee2e1bac0c2080476ddbbe
*4eb156099cd94ca6d31836af11426059d675001ea908f0c489134b2ccbda446912eee48e4d7069
*204db0665f94526432991f9c3871624922c0aeaeae0b38e74f33c6e29bfa6a343bafa4dea4395b
*8b30c6c0397fbaababeb8232808490ef673299512630536a9977d5d84a123526e77c1421e4fb25
*008f1d3b369631767f357069809398d3ef992fa68f93643329a5f71f3b766c6c0c90527a2f632c
*6b9a854a800f1e3c8842a15006b29a7d4c33e2fa35c6589610b25e0778a3092cad3325fbf6edc3
*0d37de88679f7bae0c4412b86afd9af69110722300d07c3e7f31a5f4cf86dae185175e88f3e7cf
*63c78e1d58b478313a3a3aaab25e4bffea0529a57f1e61fb82bda174aa240802747777e3079b37
*63c58a15f8fcf3cf13770cf5fb5ac78940de4029a5b3cd9b95e649d220524af8be8f3f7cfc316e
*bbed366cd9b2059ee7559dcb9558040042c8e514c0f8b41f24814beb0c00a410182814b077ef5e
*2cbefe7abcf8d24b15f7e14a20a3f3f114404bda83953aafa4aa200cd1dbdb8be79e7d164b6fba
*09efbdf75eea0b579906632980b1d5549ad659352906014e9c3c8907366dc2baf5ebd1dddd5d91
*c5040d8ee3e6e095409ae7b588140242084ccce54029ad49e5fa185c4ad925a56cd5ec4f458042
*889267aac955f3e661fdfaf5686e6e2e5938d534145d3fc6a594c700b49ae875104208a4793869
*d2fae52fe3fe0d1bf0951933502814e0791e841035b1a7b5e31cc0d16af32109641a838d8d8df8
*deead558bc78310a85020606065241a501d6fa3fcaa594ef4a296faec59428f5266d658c312cf9
*f6b771c71d77803186bebebeb2fe2a81d3ff1642a8dfbccb01bc26a5fc896268386a9d33670eee
*bbf75eb4b4b4c0755d846158115c2de62b3abec6274c98f0bf478f1efd08c054730525a9553128
*a5c4a4499370effaf5b8fcf2cbd1dfdf8f81818112e0b52c840a203fcce5729ff0a8af57a59453
*15bd3a285dadba2f376fde3cdc7aebad705d174991611ab85ad41db5578128eccce7f36309219f
*1042ea6b0980d47d7dc527c95019d480f603b83897cb755100c8e5725d001e371f4e6aea7e1886
*f1df959e359fa9654503f85984e98bc03d9fcf5f00e03021644c2d716ed23189bd4aea5553c8b8
*d60da03597cb9d07b4a029bab026eded2ab152893dd37c549a7b91ac51e04a004620db013c6a02
*4bfa3be97a2590d5541dc9a311865838ca650b806952caeb4d9529f3a29b1a5dcc88cd5477da8a
*8ee4b568ecd23e934c443e9faf07b013c0f5fac0fa792d71af390f938e1ab865b95cae7af20800
*a2076f00f0a8eaacd2aaabb6e22ba814d118372481036a4860e6f3f925009e0230a6ecc743c818
*244837061744c50466d5cd36eaa015c08f0094bc658d5b9629fd515fadd5c001434ca2e7f3f9b1
*00d66250fd97d6fcc341f910c0ab009e5446b8161912405df2f97c4919426bc060f941b57701ec
*cee572c32a432499999aa4b3b3b35e08318610d22ca51c01a04e08c100104a699d94720421c48b
*76a6fa5c2e37ac7186c4e05b6fbd75919472939472a194727252360bf8626118fbeb1142c8ef28
*a58fcd9d3bf7b33f29c077de79a74908f18810e27642884329856a00121ddb249324844018862e
*63ec05dff71fbcfaeaab4fffd100f7efdf7f9794f21f28a52328a5608c95a47b4d1695a4eddbca
*0b12429c638c3d3077eedca78705309fcf93cececead52cabb1863508d520abd3491c4a2527118
*8689e0c2308c1b21e4d9c99327afcee572b5d7490e1e3cd85828147603b84ad5e3a2fc71095013
*a42eba8a7540aa76a79f03e820842cbef2ca2bcf99fd94ade27c3e4f0a85c26e42c8559cf31854
*26932901a900aaa4bbae629d41210438e708820042080441004a697c24842008827952caddf97c
*7ebec96419c0cecece7f54e032990cf4a302c739af9aee9552c6ccea20f5978bd80300044130ef
*c891234fe772b9bbf47e4a54fcf6db6faf96526eb52c2b06a637a5de6a796813a83a4a3958fa52
*2a2e168b28168bf07d3fbece395f3d67ce9c67ca0046a6e4ff38e7232dcb826559c86432b02c2b
*56b15e7daae66e5572b5822088c1e9207ddf471004e73299cc97e6cc9973062855f18f1963234d
*d638e750d54e05a6160675a3ad3bba524aa87ab3fe029a511f21847804c09a98c103070e4c0ec3
*f00f9c73c7719c9839d5aa9519861a76aaf3a8c00ddff7e1799ecea4cb189b7ac515577c460120
*0cc30728a58ebe52d3c029b372f4e85184615866b44df3631ef54592a4ada83952ca077415ffa5
*5a00fac349c1bb62ecf5d75fc7ecaf7d0d19ce316bd6ac54f6f4bf5553aa9652c2b2ac446fbd58
*2c2e0400d6d6d63603c0265da5aa99ace8ecfce217bfc0cf1f7f1c4d4d4dc85816c230c4a851a3
*4a58ae56f9d45b42983bb2ababeb554a29bd39896653a5a69a0821f07d1f4f3df514d6ad5b87ff
*3a7000fbf7efc7f9f3e7535fccec47357d87d2370321c4cd9c1032d3bc99a4dea4bf95e9e93975
*0a3fd8b409b366cdc2da7bee8163dbf8fad7bf0ec658995a4d75ab7b994c2636e40a4710043339
*21a4459b9c65fbac0e4e37338c31f008208b9e3f74e810d6ae5983c58b17833286fafa7acc983e
*3d11a4298a49b547178b4510425ab8cac528d529f6aacd1fc61832ea59eda528a5f8b7dffc061d
*6fbe89952b57a2bfbf1f93274dc2f8f1e313d9532d93c9c4ce836251083186534a47eb5b581a38
*9d45f5324ac571d380168b456cdbb60d13274ec4aa55ab70e4f3cf3163fa74d4d7d59530a7b36a
*9a2400a3b9c94a926ad36c21d700324a13c19e3c79128f3df61866cf9e8d712d2d68f8d2974a80
*2970a633ac1aa7949e2284e4d218ab04b08c41a3314a315028005262de37be81d6d6d68a73d124
*87527a8a13426280fa22a8a662ce79ea1c54aed4a953a7b06ad52aac5dbb16d96cb66cbb4b1263
*43e8e194d293690f993b88ba0700445331d3d42aa5c4a9ee6ecc9f3f1f0f3ffc30264c98909630
*2a11fd9e06f004c760607dad7eb3961d80192a2684e0dcd9b3b8f0c20bf1e28b2fe28a2bae484b
*b3a50234934f8490f72821e465750128cfeaa7aa5cdbb7dd4201bde7cee1c1071f44474707e6ce
*9d5b114c922465c084102fd2a953a7fe0f21a4d3445f4d2821088200c78f1dc3b7bef52d1c3870
*00cb972f8fdd7c7d5ad4225a38aaa2c1cee9d3a7bfcf23f4bf1542fcb51e1aea5f2025c9c48913
*d1dbdb8bf65dbbd0dada3a6440bae8c0d4f88490df0291c37ae8d0a149b66d7f9ccd666dc771a0
*5aa5b9d8d7d787c6c6c632372c6dbfadd43ccf83ebbaf1b15028789ee74d993973e6110a00d3a6
*4deb0cc370bb0a5cd4d1147df0868686b23c6092e75c4d92e26500cfcf9c39f308a025303399cc
*e620087a4d90692074d0464c91c8629228b75f6fbeeff78661b8593d13036c6d6d3d5b2c1637a8
*1050b54a9da73197042ce99e8a47f43109217f337dfaf433650001e0d24b2fdd562c16b7eaa1a0
*ebbaa94970d30baef68c2e66d8592c161186e1d353a74e7d567fae2ca9327efcf8359ee775441f
*c0c611975e034e63aad24250f7c33084e779ea035b3d92eb983061c2dd269e32808d8d8df2dcb9
*738b060606de705d376651753894d569828b3ea82d01e8ba2e5cd7ddc7185bd4d8d858369f52d3
*6fbdbdbde4f8f1e34f5a967577369b8d43513389544d947d538b409f3e11d0adb95c6e4d12b88a
*00957cf4d147776432999f398e33c20cac92fc477dcb542a552ebc3a46e07a8510f75f72c925db
*2b8d5f530af8f0e1c3238bc5e2df5996b5dab66ddb4c24e9ae98ce9cbe332980aeeb7a41103c63
*59d643adadad67ab8d3da424fac71f7f3c514af9b794d2459cf3c92ab164eebffaca56f6340882
*cf8410bf0e82e027d3a64debac75cc61d7493ef8e083698cb1258490bfa0948e2384b400181ddd
*3e25a53c1104c17100ef0921da2fbbecb243c31967d87592f7df7fdff17dbf290882116118d609
*213261181200608c6528a5758cb1119cf326cbb29ccb2ebb6c58e30c89c15ffdea57adaeeb3eec
*baee0221c4383302d4455773f425c971c771f6388ef3d04d37dd74f84f0a70d7ae5dcdaeebfe6c
*6060e0164288a5672292c0e9119b5ac92a3f2da5f4ebeaea5e721c67c3d2a54b7bfe68803b77ee
*bcafafafef47849006ddb4e82646813217090881d4cc8d021901ed6b6868f8e1b265cb7e3e2c80
*bb76eda2aeebfed3c0c0c07794fda39482710e9a14b7500ac5a3b98be8056e95ed5706bbaeaeee
*9f1dc759b174e9d244373e11e0ae5dbb46f6f5f5fd7b1004b3952931eb2395f28709b145ecbaa9
*e28ee65e81737ea0a1a1e1daa54b9796d9c53280edededb4afafef9d2008669730c71818e7e009
*60930cb519a5e98ea902ac8e9ee7299073962c5952c264999929140abfd4c1e9b511fd3ca9e294
*0630a9c24408898f00e079de6cd7757f0960792a833b77eebcafbfbfff71bd4ea280e9451dc526
*ab854129213470dace525633f17d1f0d0d0df7dd72cb2d4f94016c6f6f6f3e7bf6ec678cb10633
*b9adb2feba27a3a7e92a89623108020461883002a67bd186a7d33772e4c88b962c59d253a262cf
*f37e4a296dd0d5a897239252c4b5489c48620c2c0810180b4b673c62bdc1f3bc9f00b81d881cd6
*f6f6f656d7756f8dd3af3a7b5ac549011d4e0c4c0829eb471df5f9cd1883ebbacb5e79e595d698
*41cff31e228458716252abd3595aa7ba3a3dcf43c6b250152a21f133849012f3a433a7e62ce71c
*524acbf3bc1f02584101c0f7fd365d157a09563735ba3a3ef8f043504ae1ba6ee53c4e048c68aa
*658c95943b32d151b7b74110b401006b6d6d9de579de0635e76cdb866559254773ce1142f0daee
*ddd8be7d3b265f7411c68d1b8762b19858bed081c68c2638b9a1e689034010048d9f7efae9afb9
*10e2b69839cd94e87344b1664eec8181013cf1c41398386912d6dd730f9aa3428efa4d25b55342
*60dbf620b8304426caf033c6e2125bb158fc0e0dc3f0ab3ab5ba19d11744996ba5cd9dce2347b0
*71e3463cb76d1b42213030305031534b0989992c2922191884105fa552cad1f1feaa81d3cd49da
*9e1b0641497bb3a303b7af5c89bd7bf7220843f4f5f7c740cadc322921012491a3762829e5182a
*84685613576f8abdc47430210885403108ca9ae7fb78fe8517b06ad52a7c72f8709cb1aab48074
*428c15decca5944d31f5caa0320692b243c481b810081332604ace9c3e8d87b66cc1942953b061
*e346148300f5757565c56c0550f733d50b08219a68d9fcd04a08496a55f755a6a05a3b74e81056
*7ef7bb78e1f9e7d1d3d35336964a279b5502f50c678c9da1948ed5e75a9203a027278141731044
*f99a4a22c210239b9a306dda348c1d3b367e495d28ca1761c4e669ce18eb01305677dd9326b632
*333ac04a2a1642c0b22c2c5fbe1ccb962d83e33825e18129a626010c02e49c7787061304286330
*0940b1584cbc4729455b5b1bd6ac5983969696448fa7acef84ad8f317692673299834110cc57ea
*d319531dcb0874124813d8942953b061c306cc983123be6eb29fd48ff9516e1886c866b3bfe7d9
*6c7647a150b84f75a43f18771a4568fa80261ba3468dc2dd77df8d6f7ef39b3565bdca006ae180
*aad55896b5832e5cb8f02063eca859a730d59e26b66d63c58a15686f6fc775d75d17aff0a14868
*808bb6bca3d75e7bed410e008ee3fca7ebba2bf49841455f69aa696969c1fcf9f3b16edd3ae472
*b9125043f117f5149d8a5b8410b06dfb3f80c81fcc66b30f7b9e77731004b6f24a941db32c2bb1
*e365cb96a1bebebe0454b5b9962409796a1042bc6c36fb2320f2a8afb9e69a4febebeb7724c407
*830bc118941052024ebf3e14d103f820622f0ae6775c73cd359fc60001c0b6edef33c67af56046
*25d1875fe4aa0cbca404119d534a7b6ddb2efd1f7700686b6b3b5d5f5fbf390c43785afd42b55a
*07ade539424859ffbeef430881fafafacd6d6d6df1c7b7251674e1c2854fd6d5d56d2f4609ee28
*031f7ff895387805a0959833fbf77d1fd96c76fbc2850b9fd49f2dcb2cd8b67da79472aaeffb73
*cdad4e4809cb88eac820925490bae8a508139ce3386fd9b67d67d94b26258ff6ecd933c2f7fd7f
*f57dff4a15a7388e3318e4d836ac2834188aa805a0d74794662ccbda6f59d65f2d58b0a0ec23db
*d4f4dbdebd7b491004cf140a853b1963b06d1bb66d7f112b1bb16c92e8b64d65b2f4624eb49d3d
*c739bfebeaabaf1e5e9d64cf9e3ddf735df7efa5948d2a5c8cbf698df23366a63529b3aa5b86c8
*d6f53a8ef3c082050bb6561abfa614f01b6fbc312a0cc3477cdf5f298470f4cf96f50c17b4bddb
*dc369511a694ba9665bdc0187b70fefcf97ffca7f2baecdbb7ef2221c4a62008160a2126ab4ddd
*4ca49b15d0e8058e70ce7f47297decaaabaefaacd631875d27e9e8e8f88a10e26629e55785102d
*52ca3142886600a094f61042ba29a5270821bfa794be3c6fdebcff1ece38ff0f8edc041b2aa64d
*f20000000049454e44ae426082
newhex
*89504e470d0a1a0a0000000d49484452000000290000007b0806000000e926a90a000000047342
*4954080808087c086488000000097048597300000dd700000dd70142289b780000001974455874
*536f667477617265007777772e696e6b73636170652e6f72679bee3c1a0000170349444154789c
*bd9c7b701cc59dc7bfd3f3d8d9d5eaad95654bd8c6369643b031c482606c12f3281e95405dce29
*1f2624e67825962dc7492ea0e4ca7155eace9c814b0a88cf4e418ebb54487c475d7c45151020e1
*2e9cb5367e617c211658b22d6c6957ab95f635bbf3eefb43dbe3d9d1ec6a65c3fdaaba667734d3
*fd995f77ffba7fbfdfac384a292e458e1e3dba9852bac2b6ed4edbb617504a5b398e1b25840c12
*42fa398e3b7cedb5d77e78296d70170379f8f0e1af98a6f928cff3cb64599e25cb322749120281
*004451846118d0340dbaae435555aaaa6adcb2acf70541d8b362c58afff85421df7df7dd1f504a
*b7d6d7d7b734353521100880e3b80b95153f7beba49442d3348c8f8f239d4e8f711cf793ebaebb
*eeef3f51c843870eadb72ceb1f9a9a9a3a5a5b5bc1719c03e486f413563f3bdab68d442281f1f1
*f1733ccf3fd6d5d5f5d225431e3870606f4d4dcdda3973e6109ee74be0aa01a5949680b2625916
*4646466c45515efefce73fbfeea2200f1f3e1cd2753ddadadabaaca9a9c981721737a01fa817ce
*0b4a29453299442291785f92a41b56ac5891af1ab208f8e165975dd61e0a85c0711c0821be8033
*812c571445c1b973e7ce4b92b4d80f94f891ebba7ea0a3a3a33d180c9605f0d36c256d7bcfb925
*180ca2a3a3a35dd7f5a81fcf14c86834ba3712892c6580170b5709caef9c2ccb68696959168d46
*f756843c70e0c0fa5028b4b6aeaeae2ca0df77379077589403f603adabab4330185c7be0c081f5
*65216ddb7e3212891060aaad2b075c0da09f94ab3f128910dbb677fa4246a3d11f363636ce99ce
*ee95032c07ebbedefbd90dcb8e1cc7a1a1a1a13d1a8dfe600a2480adac9bbd3756035dad89aa54
*27fb5b5d5d1d28a5df29818c46a35f0987c3cd5e7b56ee6999dcf7b5afe1c4891353402b01f89d
*f3b3a3e170b8391a8d7ec581b46d7b636d6d6dd91bca418f8c8ca067cb16747777637c7cbce47a
*3fb84a50decfe1701896657dcb81e4797e2921c4b7c2e93e6b9a8663c78fe32fbffa55ecdcb913
*96654d81bd989d1621043ccf2f0500128d46178ba218a9a652bf270600dbb2a0e472d8b76f1fee
*fad297f0ca2baf80520adbb6a7f4c44c14218a626b341a5d4c005c274992ef40f2ebee4a93cab4
*2ca42626b073e74edc7befbde8efef9fb20496abd7afce22571701b084e7795f6d953be737f6dc
*d7ea8681a1a1216ceceec6f7beff7de472b992fb2ad5e7ae97e779504a9710dbb617088250f1e6
*72a592d8944255551c3a7408ebd6adc3ee3d7bca6ad54f199452067939a194460821659fa81270
*35625b16b2b91cfefde597d1dbdb3b6d7deeef3ccfc3b6ed5681e3b8846559601bda4aa0c0e4ce
*9a3d54b53267ce1c6cd9b2052b6fb8018542c19950d3f590699a20848c0a1cc70d98a6095114cb
*c279c16cdb9ed66d0026b7600f3cf000fe6add3a98a65911d0db2ea593bb778ee306058ee3fa0d
*c3802ccba0943adaf46a7026b68ee338dc75e79dd8b871236a6a6aa0aaeab4e3dbaf1886018ee3
*fa0542c821c33028a594ab648499f6d806a21cf4d2a54bf1ddef7c070b162c80aaaad034ad443b
*ee325db71b8641011c12aebffefafebebebe38a5b4ad12a45bfcbabbb5b5159b376dc29a356b50
*28145028147c2703fb3e1d20a514a669c657ae5cf9a1506cf48465596d1cc7958cbf4a93843528
*4912be7efffd58bf7e3d2ccb42369b9d725db526cd5d2ccb82655927004000009ee7f7288a729b
*77abe6ed666fb9f5d65bf1e8238f201c0ea35028540c0e4c07cb34cb8ef97c1e3ccfef065cdee2
*fefdfb139148a4a51a1780c1d4d6d642511467c295d3f64c34c92013894462d5aa55ad806bd3cb
*71dc4f5983b66dfb8e19769efd2d93c99468c05bfc34540da0a228e038eea70e9bbb6bde79e79d
*8f5b5b5b3baa7553dd47f767bfee9e6e7cba1f2291487cbc7af5eab9ecfe92592108426f3a9db6
*2b3d69250d797ba09276fdce177bc71604e1076e2e6f048344a3d19783c1e05fb80303338d5c94
*d3a29f56dd455555140a85dfde70c30d6b01d8e5200140eeebeb3b5a5757f71941102a02560339
*1d20fb6e9a263299cc9f57ae5c792d00b544733e75aa9d9d9d77643299b8699abe26c2afeb2e66
*78b88c3632994cbcb3b3f30e2f60394d0200d2e9f4c293274fbe2ecbf2a2402050a2b59968d25d
*bf57a300a0691a54553db564c9923beaebeb07fcea982e3ed972ecd8b1976ddb5e5d535353a2f5
*7221173fb872e71445b10921ef5c73cd356b018c9583a826d21b1e1818f86132997c281008b430
*ad5e8a689a064dd3c69a9b9b9f5fb870e1df01c855ba7e2631f3f91f7ef8e113e974fa4e4992ea
*2449aa6ad230a19442d775e8ba9ea9afaf7f6df1e2c58f033853cdbd33cd3e70003e3b3434b421
*954a7dd9308c568ee3ea0541e0789e9fb231b62c0ba669524a695a14c5d186868657e6ce9dfb22
*803f01a8bae18b4a9114450470c5f8f8f81773b9dc325dd7e7198631db34cd5a4110b2a2288e48
*9274361c0ebfdfd4d4f45f003e02605c4c43c2c51232485114570702812b09216da228d699a619
*e0795e130461b6288a734451ac07701e935d7b519033d224a59407b02e91486ccd6432cb73b91c
*d5344db02c8bb32c0b8661c0344d0882005114511c02549665331c0e73757575ef4522919f00d8
*cb719cf589435a9675c7c8c8c82f46474723baae0b8aa2387b4d3616bd1b0cb7c1268420140a21
*100898adadad89d9b367ff35cff3af7f2290a669ce4f2412ff198bc53e5328144445514008714a
*b9905fa56d5e4d4d0d42a190316bd6ac3fb7b6b6de2308c2998b86340ce3c63367cebc36363616
*cee5721ccff38e7fee5dd7bda07e8096653947cbb2505b5b4b2391486efefcf9778aa2b87fc690
*8aa23c323030f04c269309689a0606e82eacab9946bde20e03b27d80699a0eac699a906519f5f5
*f5dac2850b7b6a6a6a7e5e3564369b7da8bfbf7f97a228a26559100401822080e779e7c8e058b0
*cbebb0793559b4990e1cfbce265a381c363a3b3b37d6d6d63e3f2d64a150b8bebfbfffed743a1d
*b46d1ba2283a90ac10429ce374216837a4179059836238058d8d8d6a6767e71783c1e0c1b290f9
*7cbee3cc9933c793c96413d3a0288a4e619a148449f35aedb2c8da606391011a860166ba0cc380
*288a686969199f3f7ffed5a150e81cbbbfc498c7e3f1df4c4c4c34fa01b2e23537d3c1527a2174
*e31d2a841018c605fbaeeb3ac6c7c71b83c1e0af2fbffcf2d5ecbc339072b9dcaa4422f1394dd3
*389ee7218a22d8db00ecc8bad77df47ef69a27bfa3f7c1dde3bd502870a3a3a32b72b9dcaa124d
*66b359323c3cbc5bd775d9ab414110c0763c33f5719806bd47008e09f30e09dbb6a1699a7cfefc
*f9dd73e6cc59565b5b6bb314dd2d1313138b0cc3f0ed666fb6cbab9d996a9215775b922439df0d
*c3c0f8f8f8224ae92d4e77c7e3f16f99a619709b1a76a37b0c7961f7f7f5211e8ffb463c987972
*1fbd85e7796738797bcf34cd403c1e9fcce34c4c4c04b2d9ec6ad3344b66afd7c4f835d2dbdb8b
*23478fa2afaf0fbaae97187abfebbd806e8d7a4b31f875d3c4c44440a0942e5755b5c60dc89ec6
*db4deef1c8711c060706f0e8238fe08b6bd660d3a64d902409d75f779def582be7ceb2f1e95edb
*99a952553544295d2e643299db2dcb92bd4fc29eb452b8855dd3d7d78723870fe36bf7df0f0068
*6a6cc492254ba685741706ca56a0a2d1973399cced423e9f5fca711cc7bac0bdf44d1713627693
*69f9a5975ec2ef7ef73b74777723393e8ecf2c5982e6e6e6123836c3fd2019204b34504ab97c3e
*bf54300ca38301ba35e937112a41b292cb66f1e4934fa2b3b313dfdab81135c120bababa2049d2
*946e7603b39d159b1b3ccfb3d5a843304d33c22e700f683f30f76e87e338082e48de037be6f469
*f43efe38d6ac59034110100804b07cf9f2299a748b77420180699a2d826559212f84775697eb6e
*81e7c1171fce77061382befdfb71f4c811ac5dbb163945c1ea55ab504ebcb6b4a8cd1a4208c9fa
*19eae90059778b8230597cd679a158345dc773cf3d87ff3d71a2ec03f999b922784620848c5896
*b578baf1e73746850bce566977bb7cf08989092c5bba142ffdea5758b468916ff8c5ad45aff922
*84c4049ee707755dff827b304f07e7d66439c39dcd64100a85f0dcb3cfe2b6db6e2b0be716773b
*0c92e7f9d34492a4c3966551f71fa6836315fa75b3699a488e8da1bbbb1bd16814b7df7efb140d
*95139f30239524e990400879cbb66d85521a761b5c2f2403731fdddd6ddb36e2b118eeb9e71e6c
*dbb60dcdcdcd5569cf0fd205ab1042de123299cc69dbb613966585d985b66d3bbe4b25613ba4e4
*d818162f5e8c7f79f1455c75d5554e83ee6335803ec1d9442693394dbababa0ccbb27eab288ab3
*665a5675c1857c3e8fbca2e0e9a79fc6abafbeea005e8c301f88adddf97c1e94d2df7675751904
*00d2e9f49e42a1907743dab63d5dbd78e8c10771f0e041dc7df7dd25e72fa69bdd6d173717f954
*2ab50728ee27d3e9f447aaaabe9e4aa54a9ca5e964f3e6cd9065b9a4b14abb9d72c2da64de6336
*9b85a669afa7d3e98f1cc80d1b36d0c1c1c12dd96c36cd5c4c56aad142b952cd35b66dc3300ce8
*baee28475194f4e0e0e0960d1b36500712007a7a7acea5d3e917e2f13875fbc4acdb2b814c77be
*92b85d5bd33431363646d3e9f40b3d3d3d8e4b5b12763872e4c8b6898989436363632c740c4dd3
*ca4ea44a1aaaf4105e40a694542a85743a7df8c89123dbdced4c89607cf39bdf6cb9ebaebb8eb5
*b7b77734343438eeacdba52d673ffd1ec2ab51d6c56e25e8ba8e4c2683e1e1e1f3afbdf6daf2dd
*bb77976422a6249b76efde3db67ffffedb46464652a954caa948d334678c56a3c1721ab52ccb01
*d3751d86612093c920168ba5fafafa6ef502fa6a92494f4fcfe29b6fbef9cdd6d6d6b9b366cd72
*fc6f77c865269a64ae81699a0e9caeeb4824124824121fbffdf6dbb73ef3cc33bebf91a8189f5c
*bd7a75c3e6cd9b5f696969b9b1a3a38373bb9c6e8fb2dceae436d0de0095aeeb181e1ea6c96472
*ffb3cf3efbe577de7927558e63da48efd5575f1de8eeeefe9bd9b3677fbbb1b1b1b9adadad242c
*c276f55e6dba97393673d9311e8f23954a8d0f0f0fff74d7ae5d3b8f1f3fae5562a83a663e7ffe
*fcfaeddbb73f118944ee0b87c3b5914804b22c4fd9cd33405698360b850292c9241445c9261289
*97b66fdffed8993367d2d5b43da3ec4353531307a07ec78e1df73737377f3d140a2d9265b93e10
*0870a228429665274ca2aa2a9b1cb45028a40b85c2a96432f9cbdedede7f05901e1f1ffff4934d
*822070006ab66ddb764d7b7bfb75c16070b12008f308218db66d4f98a679b650287c188bc5defd
*d18f7e740c80629ae64535762919b11080db52a9d4bd8542e1b3a669ce324db3ceb66d8910a20b
*82901104211e0c06ffd4d0d0f06b006f02f0fd01c6270a498bc9a6783cfedd6c36bb2c954a6162
*62822f140a9ca228c8e572c8e7f30885420887c3a8a9a9413018a48d8d8d56434303c2e1f0f1b6
*b6b67fc4a7996c3a7ffefc8bb158ac259148f067cf9e85aeeb533c4cd70395cc704992306fde3c
*442211abadad6dacbdbd7dc3279a6c8ac562afc462b1251f7ffcb170f6ecd92991b3723e8c1794
*6dc9e6cf9f8f8e8e0eb3adaded645b5bdb972f39d9343838f8fae0e0604d7f7f3fc7eca35f9403
*28f5816cdb9ecc15d3d2f72edca991cece4eba60c10265c18205775c54b22993c93c3a3030f0cc
*471f7d24c56231b801fd124deed020abd3ef6512b7460dc3405b5b1baeb8e20a7de1c2853d7575
*757bfc587c53c9e974faa193274f3ef7c1071f088aa238115fa641f772e8e7ee4e2ad03f6d6759
*56c9c38d8e8e229fcf4bbaae3fb764c912abbebebeba64d3071f7cf0dfefbfff7e405114277256
*2e2be68d637a21bd3945d33461d936ace232c9ce0583412c5bb64cbbf2ca2bbfe04d369568329f
*cf770c0c0cbc76ead4290790e77908c5980f8ba5bb3717c41305738b6ddba09e6c18cff39363d2
*b31f2d140a3875ea544092a4d7162e5cb8ac6cb269787878efd0d050c3e8e8a803e8972ee10501
*bc2be85a8d262ddb76e28fcc74b1eb59f0349148606868a821180cee5db468d18d532073b9dcaa
*783cbe62606080f3039424c9d128fb7ba500424960ab18bd2dbeed5c32d1dc228a224e9f3ecd35
*3434ac686b6b5b150e87ffc781cc66b3646868e8e7c3c3c3923b24cd82fc522000c9a3d199ca74
*b695699d1082919111a9a1a1e1e773e7cebdaa24d994482416c662319062654c7ba224412a7e66
*0921afd032c54fd89061bb7cf767a69c582c864422b190ba934de7ce9ddb3c3e3e2e1142207862
*e7a2abd2921f7200304c73f2156d4aa714effa5312212e86a76559be308c8a0157069a4aa5a473
*e7ce6d022e249b6e8cc7e393dde1e9ea293e0d9b91009e7efa69a89a06c3309c489cb73bbdddea
*1ea7ece12551747a8c0d8bb1b131e472b9551313130142295d9ecbe542ccc88a82e03c99288ace
*6fb639171c6bb8ffe449f4f4f4e0df5e7e19e0381454758ad6fc629c7069d4e96e4100efea41d3
*3491cbe54294d2e524994cde95cbe502ee258f75391b2b6e7be6a79d37df78030f3ffc308e1e3b
*06701c54559d0257a2ddc9ca2ec4dd99792b1ed922a1284a20994cde49144559aaeb3ac771dca4
*fd734d1ab6b2f80112424aa2609aa6e19f76edc2b7b76e452c168356745bcbc6df8ba06e4be2b5
*bbbaae738aa22c239aae77a8aaead07bd3775e406775e13878835ba66962647818df7fec313cf5
*d45328a82ab2d96cd9300d03f583e4791edae478ef20b665353b1956529afee57d326340d1e9a7
*c5d767ca9423870f63c337be817dfbf6b1d761fdbbbf6896bcbb2c420873839b89655935c59f94
*9454400899342565623f5c5193c634e5377bf762fd7df7e1bdf7de43626ccc7fe67353f3e31cc7
*b1685b0de1382ec3fec141c953fa9812782aafa44977c96632f8f18f7f8cdfbff596ffecc78594
*9d7bfb278a220064048e90782010b842d7f552503f9780d20b76b208395dd8dab66d74757561cb
*962d98376f1e339625c69ee3381057569849719b1813784206054158e5de99f89919eab2914ca6
*8bad5f76d965e8e9e9c10d2b57965d819cefaebad9b1b8880c0ab22c1f9224e9fe7c3eef6c80a9
*ab227725704317278e1792e338d4d4d4e0e1871fc6dab56bcbbee8e4fdee17a6164591cab27c58
*9065f98d402050a094869c8b8a0d4f99d11ef1466e4551c4dd77df8d471f7d140d0d0da5d7b207
*75ddebb70bf2b8c1f94020f08690c9644e1342121cc7cdf33a4cd50a2104d75e7b2db66edd8a45
*8b16f95fe41acf7e0feb7d6db158ef98936cb26d7b5f30182cb9a89aa413cff3686f6fc7134f3c
*819ffdec67e501a7116f9bb66da3c8b3afababcb10004055d55db22c3f9c4aa5426ebf986debcb
*49777737d6ae5d0b49921c8d0028abb172e26e8fb51f0e87f3aaaaee025cc926d334df64613b76
*03fb5c4ed6af5fef004eb2b9d6658f4c31672effc69d81606fff99a6f9e69464d3f9f3e737c9b2
*9c310c037a319ecd6ef293298dce50d8ddac0dd65ef1edd4ccf9f3e737f9269b1445f9452010b0
*cde24deeccc34cbbb09a076275bb33119224d98aa2fca26cb2e9c489137f6b59d631b6f5621568
*9a06d347a3d568d3f79ae2baecae5fd37536718f9d3871e26f4b2ef74b36dd7cf3cdc7755d9f23
*491282c12064599ef4470201045c63d02d53ec6899b109c001535595fde40abaae4392a4e13ffc
*e10f5757956c3a78f0e02d9224a58bffdec9299aaa42d5345f1beabba9f548f1ddc8923a596c5d
*92a4f4c183076f9951b269e3c68d8b6fbae9a6dfdbb6ddc1bc3b56045174fc703f27df0f8e4d10
*d6cdee2c1b21e4dc1ffff8c75b76edda7571c9a6871e7ae8d54020703d00c29c32e6fbf86df939
*8ef30db1989e595cfcb5b2ad69dac1e79f7ffeae4b4e363df8e0838fcf9a35ab8752dac4f679ee
*c015e7dada954016f7016ebb6b18c6e46f2608198fc762cfbcf0c20b4f7ca2c9a6dededea71a1b
*1bd701a805a6864edc5deff73e6451b21313137b77ecd8f1bd4f35d9b47dfbf6079a9b9bef9724
*e97200f55cd1ce300d7a764f14405ad7f5d3c964f297dbb76fff67fc7f279b7a7b7b3f377bf6ec
*eb6559be4214c579849066dbb69386619c5555f5a3919191833b76ec38824b4836fd1f68f9825c
*509cb2730000000049454e44ae426082
hunk ./contrib/musicplayer/src/resources/images/play.svg 13
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="120"
+   width="41"
+   height="123"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
hunk ./contrib/musicplayer/src/resources/images/play.svg 19
    sodipodi:docname="play.svg"
-   inkscape:export-filename="/home/josip/bin/tahoe-lafs/contrib/musicplayer/src/resources/images/play.png"
+   inkscape:export-filename="/home/josip/bin/tahoe/contrib/musicplayer/src/resources/images/play.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
hunk ./contrib/musicplayer/src/resources/images/play.svg 25
      id="defs4">
     <linearGradient
+       id="linearGradient8130">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8132" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.14503817;"
+         offset="1"
+         id="stop8136" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8103">
+      <stop
+         id="stop8105"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e2e2e2;stop-opacity:0.49803922;"
+         offset="0.60655737"
+         id="stop8109" />
+      <stop
+         id="stop8107"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.14503817;" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient8237">
       <stop
          id="stop8239"
hunk ./contrib/musicplayer/src/resources/images/play.svg 166
        y1="339.4957"
        x2="198.26703"
        y2="309.34891" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="radialGradient8043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <inkscape:perspective
+       id="perspective8191"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8045"
+       id="radialGradient8227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <filter
+       inkscape:collect="always"
+       id="filter8233"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.15"
+         id="feGaussianBlur8235" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8045"
+       id="radialGradient7253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="radialGradient7261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="radialGradient7269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="radialGradient8077"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8103"
+       id="linearGradient8087"
+       x1="198.5"
+       y1="207.78288"
+       x2="198.5"
+       y2="308.74759"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7977"
hunk ./contrib/musicplayer/src/resources/images/play.svg 260
-       id="linearGradient8027"
+       id="linearGradient8089"
        gradientUnits="userSpaceOnUse"
        x1="198.26703"
        y1="339.4957"
hunk ./contrib/musicplayer/src/resources/images/play.svg 266
        x2="198.26703"
        y2="309.34891" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="radialGradient8091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
+       cx="155"
+       cy="289.22653"
+       fx="155"
+       fy="289.22653"
+       r="43" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8103"
+       id="linearGradient8101"
+       x1="111.5"
+       y1="296.36218"
+       x2="198.5"
+       y2="296.36218"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7977"
hunk ./contrib/musicplayer/src/resources/images/play.svg 289
-       id="linearGradient8041"
+       id="linearGradient8111"
        gradientUnits="userSpaceOnUse"
        x1="160.67363"
        y1="287.52835"
hunk ./contrib/musicplayer/src/resources/images/play.svg 298
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7951"
-       id="radialGradient8043"
+       id="radialGradient8113"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
        cx="155"
hunk ./contrib/musicplayer/src/resources/images/play.svg 309
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8045"
-       id="linearGradient8051"
+       id="linearGradient8115"
+       gradientUnits="userSpaceOnUse"
        x1="143.63651"
        y1="299.68353"
        x2="160.13068"
hunk ./contrib/musicplayer/src/resources/images/play.svg 314
-       y2="306.98428"
-       gradientUnits="userSpaceOnUse" />
+       y2="306.98428" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8129"
hunk ./contrib/musicplayer/src/resources/images/play.svg 318
-       id="radialGradient8135"
+       id="radialGradient8117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4885599,0,0,1.4885599,-75.726792,-144.79069)"
        cx="155"
        cy="296.36218"
        fx="153.96471"
hunk ./contrib/musicplayer/src/resources/images/play.svg 325
        fy="292.49844"
-       r="43"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4885599,0,0,1.4885599,-75.726792,-144.79069)" />
-    <inkscape:perspective
-       id="perspective8191"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       r="43" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8130"
+       id="linearGradient8127"
+       x1="96.712578"
+       y1="296.36218"
+       x2="174.13466"
+       y2="296.36218"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient7977"
hunk ./contrib/musicplayer/src/resources/images/play.svg 338
-       id="linearGradient8225"
+       id="linearGradient8138"
        gradientUnits="userSpaceOnUse"
        x1="160.67363"
        y1="287.52835"
hunk ./contrib/musicplayer/src/resources/images/play.svg 347
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8045"
-       id="radialGradient8227"
+       id="radialGradient8140"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1891384,0,0,1.1891384,-29.316449,-56.053463)"
        cx="155"
hunk ./contrib/musicplayer/src/resources/images/play.svg 358
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8045"
-       id="linearGradient8229"
+       id="linearGradient8142"
        gradientUnits="userSpaceOnUse"
        x1="146.0701"
        y1="306.98428"
hunk ./contrib/musicplayer/src/resources/images/play.svg 367
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient8237"
-       id="radialGradient8231"
+       id="radialGradient8144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.4398708,0,0,1.4398707,-68.179991,-130.36105)"
        cx="155"
hunk ./contrib/musicplayer/src/resources/images/play.svg 375
        fx="155"
        fy="289.86111"
        r="43" />
-    <filter
+    <inkscape:perspective
+       id="perspective8154"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
        inkscape:collect="always"
hunk ./contrib/musicplayer/src/resources/images/play.svg 384
-       id="filter8233"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.15"
-         id="feGaussianBlur8235" />
-    </filter>
+       xlink:href="#linearGradient8103-0"
+       id="linearGradient8101-0"
+       x1="111.5"
+       y1="296.36218"
+       x2="198.5"
+       y2="296.36218"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient8103-0">
+      <stop
+         id="stop8105-5"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e2e2e2;stop-opacity:0.49803922;"
+         offset="0.60655737"
+         id="stop8109-8" />
+      <stop
+         id="stop8107-5"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.14503817;" />
+    </linearGradient>
+    <linearGradient
+       y2="296.36218"
+       x2="198.5"
+       y1="296.36218"
+       x1="111.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8164"
+       xlink:href="#linearGradient8103-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8103"
+       id="linearGradient8195"
+       gradientUnits="userSpaceOnUse"
+       x1="198.5"
+       y1="207.78288"
+       x2="198.5"
+       y2="308.74759"
+       gradientTransform="matrix(1,0,0,-1,-1.5578274,603.34646)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7977"
+       id="linearGradient8197"
+       gradientUnits="userSpaceOnUse"
+       x1="198.26703"
+       y1="339.4957"
+       x2="198.26703"
+       y2="309.34891"
+       gradientTransform="matrix(0.46511627,0,0,-0.46511627,-51.593022,158.34287)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7951"
+       id="linearGradient8200"
+       gradientUnits="userSpaceOnUse"
+       x1="198.5"
+       y1="356.6759"
+       x2="198.5"
+       y2="319.47015" />
+    <inkscape:perspective
+       id="perspective8210"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8210-4"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
   </defs>
   <sodipodi:namedview
      id="base"
hunk ./contrib/musicplayer/src/resources/images/play.svg 461
-     pagecolor="#f3f3f3"
+     pagecolor="#ffffff"
      bordercolor="#d7d7d7"
      borderopacity="1"
      inkscape:pageopacity="0"
hunk ./contrib/musicplayer/src/resources/images/play.svg 466
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="11.334097"
-     inkscape:cy="82.921351"
+     inkscape:zoom="8"
+     inkscape:cx="5.2312101"
+     inkscape:cy="73.776456"
      inkscape:document-units="px"
hunk ./contrib/musicplayer/src/resources/images/play.svg 470
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g8008"
      showgrid="false"
      inkscape:snap-global="false"
      inkscape:showpageshadow="false"
hunk ./contrib/musicplayer/src/resources/images/play.svg 476
      showborder="true"
      borderlayer="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="741"
+     inkscape:window-width="1278"
+     inkscape:window-height="798"
      inkscape:window-x="0"
hunk ./contrib/musicplayer/src/resources/images/play.svg 479
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
hunk ./contrib/musicplayer/src/resources/images/play.svg 497
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-331.68859,-262.98427)">
+     transform="translate(-331.68859,-256.98427)">
     <g
        id="g8211"
hunk ./contrib/musicplayer/src/resources/images/play.svg 500
-       transform="matrix(0.46511627,0,0,0.46511627,280.32014,220.20089)">
+       transform="matrix(0.46511627,0,0,0.46511627,280.82014,216.70089)">
       <path
          transform="matrix(1,0,0,-1,-1.5578274,603.34646)"
hunk ./contrib/musicplayer/src/resources/images/play.svg 503
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          sodipodi:ry="43"
          sodipodi:rx="43"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 509
          sodipodi:cx="155"
          id="path8213"
-         style="fill:url(#linearGradient8225);fill-opacity:1;stroke:none"
+         style="fill:url(#linearGradient8138);fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
          sodipodi:type="arc"
hunk ./contrib/musicplayer/src/resources/images/play.svg 513
-         style="opacity:0.1072797;fill:url(#radialGradient8227);fill-opacity:1;stroke:none;filter:url(#filter8233)"
+         style="opacity:0.1072797;fill:url(#radialGradient8140);fill-opacity:1;stroke:none;filter:url(#filter8233)"
          id="path8215"
          sodipodi:cx="155"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 519
          sodipodi:rx="43"
          sodipodi:ry="43"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          transform="matrix(0.99142262,0,0,-0.99142262,-0.79182653,607.2467)"
          clip-path="url(#clipPath8021)" />
       <path
hunk ./contrib/musicplayer/src/resources/images/play.svg 552
          sodipodi:cx="153.44217"
          sodipodi:sides="3"
          id="path8219"
-         style="opacity:0.60536397;fill:url(#linearGradient8229);fill-opacity:1;stroke:none"
+         style="opacity:0.60536397;fill:url(#linearGradient8142);fill-opacity:1;stroke:none"
          sodipodi:type="star" />
       <path
          id="path8221"
hunk ./contrib/musicplayer/src/resources/images/play.svg 560
          style="fill:#e0e1e1;fill-opacity:1;stroke:none" />
       <path
          sodipodi:type="arc"
-         style="fill:url(#radialGradient8231);fill-opacity:1;stroke:none"
+         style="fill:url(#radialGradient8144);fill-opacity:1;stroke:none"
          id="path8223"
          sodipodi:cx="155"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 566
          sodipodi:rx="43"
          sodipodi:ry="43"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
-         transform="matrix(1,0,0,-1,-1.5578274,603.34646)" />
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
+         transform="matrix(1,0,0,-1,-1.5578266,603.34646)" />
+      <path
+         transform="matrix(0,1,1,0,-142.92001,151.98428)"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
+         sodipodi:ry="43"
+         sodipodi:rx="43"
+         sodipodi:cy="296.36218"
+         sodipodi:cx="155"
+         id="path8093-7"
+         style="fill:none;stroke:url(#linearGradient8164);stroke-width:2.1500001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         style="fill:#b7b7b7;fill-opacity:1;stroke:none"
+         d="m 153.44217,263.98428 c -23.74824,0 -43,19.25176 -43,43 0,23.74824 19.25176,43 43,43 23.74825,0 43,-19.25176 43,-43 0,-23.74824 -19.25175,-43 -43,-43 z m 0,1.075 c 23.16727,0 41.925,18.75773 41.925,41.925 0,23.16727 -18.75773,41.925 -41.925,41.925 -23.16727,0 -41.925,-18.75773 -41.925,-41.925 0,-23.16727 18.75773,-41.925 41.925,-41.925 z"
+         id="path8187-9" />
     </g>
     <g
hunk ./contrib/musicplayer/src/resources/images/play.svg 584
-       transform="matrix(0.46511627,0,0,0.46511627,280.32014,180.20089)"
+       transform="matrix(0.46511627,0,0,0.46511627,280.82014,175.70089)"
        id="g8029">
       <path
          sodipodi:type="arc"
hunk ./contrib/musicplayer/src/resources/images/play.svg 588
-         style="fill:url(#linearGradient8041);fill-opacity:1;stroke:none"
+         style="fill:url(#linearGradient8111);fill-opacity:1;stroke:none"
          id="path8031"
          sodipodi:cx="155"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 594
          sodipodi:rx="43"
          sodipodi:ry="43"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          transform="matrix(1,0,0,-1,-1.5578274,603.34646)" />
       <path
          clip-path="url(#clipPath8021)"
hunk ./contrib/musicplayer/src/resources/images/play.svg 599
          transform="matrix(0.99142262,0,0,-0.99142262,-0.79182653,607.2467)"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          sodipodi:ry="43"
          sodipodi:rx="43"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 605
          sodipodi:cx="155"
          id="path8033"
-         style="opacity:0.9425287;fill:url(#radialGradient8043);fill-opacity:1;stroke:none;filter:url(#filter7971)"
+         style="opacity:0.9425287;fill:url(#radialGradient8113);fill-opacity:1;stroke:none;filter:url(#filter7971)"
          sodipodi:type="arc" />
       <path
          transform="matrix(0,-1.2147699,1.2147699,0,-217.35179,495.14899)"
hunk ./contrib/musicplayer/src/resources/images/play.svg 625
          sodipodi:type="star" />
       <path
          sodipodi:type="star"
-         style="fill:url(#linearGradient8051);fill-opacity:1;stroke:none"
+         style="fill:url(#linearGradient8115);fill-opacity:1;stroke:none"
          id="path8037"
          sodipodi:sides="3"
          sodipodi:cx="153.44217"
hunk ./contrib/musicplayer/src/resources/images/play.svg 645
          id="path8039" />
       <path
          transform="matrix(1,0,0,-1,-1.5578274,603.34646)"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          sodipodi:ry="43"
          sodipodi:rx="43"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 651
          sodipodi:cx="155"
          id="path8127"
-         style="opacity:0.83524906;fill:url(#radialGradient8135);fill-opacity:1;stroke:none"
+         style="opacity:0.83524906;fill:url(#radialGradient8117);fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0,1,1,0,-142.92001,151.98428)"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
+         sodipodi:ry="43"
+         sodipodi:rx="43"
+         sodipodi:cy="296.36218"
+         sodipodi:cx="155"
+         id="path8093"
+         style="fill:none;stroke:url(#linearGradient8101);stroke-width:2.1500001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
hunk ./contrib/musicplayer/src/resources/images/play.svg 663
+      <path
+         style="fill:#b7b7b7;fill-opacity:1;stroke:none"
+         d="m 153.44217,263.98428 c -23.74824,0 -43,19.25176 -43,43 0,23.74825 19.25176,43 43,43 23.74825,0 43,-19.25175 43,-43 0,-23.74824 -19.25175,-43 -43,-43 z m 0,1.075 c 23.16727,0 41.925,18.75773 41.925,41.925 0,23.16727 -18.75773,41.925 -41.925,41.925 -23.16727,0 -41.925,-18.75773 -41.925,-41.925 0,-23.16727 18.75773,-41.925 41.925,-41.925 z"
+         id="path8187-5" />
     </g>
     <g
        id="g8008"
hunk ./contrib/musicplayer/src/resources/images/play.svg 670
-       transform="matrix(0.46511627,0,0,0.46511627,280.32014,140.20089)">
+       transform="matrix(0.46511627,0,0,0.46511627,280.82014,134.70089)">
       <path
          transform="matrix(1,0,0,-1,-1.5578274,603.34646)"
hunk ./contrib/musicplayer/src/resources/images/play.svg 673
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          sodipodi:ry="43"
          sodipodi:rx="43"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 679
          sodipodi:cx="155"
          id="path7167"
-         style="fill:url(#linearGradient8027);fill-opacity:1;stroke:none"
+         style="fill:url(#linearGradient8089);fill-opacity:1;stroke:none"
          sodipodi:type="arc" />
       <path
          sodipodi:type="arc"
hunk ./contrib/musicplayer/src/resources/images/play.svg 683
-         style="fill:url(#radialGradient8017);fill-opacity:1;stroke:none;filter:url(#filter7971)"
+         style="fill:url(#radialGradient8091);fill-opacity:1;stroke:none;filter:url(#filter7971)"
          id="path7941"
          sodipodi:cx="155"
          sodipodi:cy="296.36218"
hunk ./contrib/musicplayer/src/resources/images/play.svg 689
          sodipodi:rx="43"
          sodipodi:ry="43"
-         d="m 198,296.36218 c 0,23.74825 -19.25176,43 -43,43 -23.74824,0 -43,-19.25175 -43,-43 0,-23.74824 19.25176,-43 43,-43 23.74824,0 43,19.25176 43,43 z"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
          transform="matrix(0.99142262,0,0,0.99142262,-0.79182653,7.0289736)"
          clip-path="url(#clipPath8021)" />
       <path
hunk ./contrib/musicplayer/src/resources/images/play.svg 728
          id="path8003"
          d="m 141.71875,291 0,1.75 26.15625,15.125 1.53125,-0.90625 L 141.71875,291 z"
          style="fill:#3a3b3b;fill-opacity:1;stroke:none" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient8200);stroke-width:2.15000010000000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path8079"
+         sodipodi:cx="155"
+         sodipodi:cy="296.36218"
+         sodipodi:rx="43"
+         sodipodi:ry="43"
+         d="m 198,296.36218 a 43,43 0 1 1 -86,0 43,43 0 1 1 86,0 z"
+         transform="translate(-1.5578274,10.622095)" />
+      <path
+         style="fill:#b7b7b7;fill-opacity:1;stroke:none"
+         d="M 20.5 0.5 C 9.4543052 0.5 0.5 9.4543052 0.5 20.5 C 0.5 31.545695 9.4543052 40.5 20.5 40.5 C 31.545695 40.5 40.5 31.545695 40.5 20.5 C 40.5 9.4543052 31.545695 0.5 20.5 0.5 z M 20.5 1 C 31.275474 1 40 9.7245258 40 20.5 C 40 31.275474 31.275474 40 20.5 40 C 9.7245258 40 1 31.275474 1 20.5 C 1 9.7245258 9.7245258 1 20.5 1 z "
+         transform="matrix(2.15,0,0,2.15,109.36717,262.90928)"
+         id="path8187" />
     </g>
     <path
        sodipodi:type="star"
addfile ./contrib/musicplayer/src/resources/images/radio_pattern.png
binary ./contrib/musicplayer/src/resources/images/radio_pattern.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d494844520000001200000014080600000080976d4a000000017352
*474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b130000
*0b1301009a9c180000000774494d4507da080600102d6577cfd00000001974455874436f6d6d65
*6e74004372656174656420776974682047494d5057810e17000002ee4944415438cb7594ddab54
*6514c67fefd77e67f6d139e746828ee82124eac0d14e7591f779a3f8b798fd1b452444d0859fa8
*7840bc90e8c62282149210ba313ae1a839158274e17166f67e3fbbd8337b66985a579b772d9efd
*ac673d6b89c7fda7b91a793aa56129b202110170ce5114054a29628c6d495dd7586b91009dd230
*1e8f9770b41138e7482951140500a361d5e68510586b011a20806eb7db2601aa51680192570dc1
*24b09d8679f490736e41e53c03a36d9bec949a941200e36a8cd61a219b9c520a35512284d000cd
*a33adfd00e6ef6561405fb573b7897dab7697b524ab4d6440f5208410c69a12d31e129a5a4aaaa
*099b19d0b4bd29636526ad292d79b537135b69b1505857016316a73adc6b588d871e63cc4ca35e
*6fdf42615dd7043fd1444355550bf94e69d05ad35d3178efd1648990906223bd5686e1e8553b56
*10b82af2f3839fb873e73b767777b1d6b2b1b1c189131f72fcf80793a98944ce0964842c09d163
*adc5684bf40dd4975f7dc1471f9f6530f893fe933ebffef69067cf069c397b86cfcf9d436b8d9e
*37572641d220033ed428033f7cff2337767628cb158e6d6df3f7f3e740e6e8d636bf3fdae5c6ce
*0eefbdfb3ea2ffe8498e3192a2a0b06ac9dd9f7ef219c1670e1e3c44b9b282924d4d8c91d168c8
*60f007ba1048630cde450abbb843294844368c4615f7eedfe5d6ed9b186db872fd2257ae5fc418
*c3addb37b977ff2ede256435ae29573aad635bcbebc4b81a71e0c06b28a55b8fcd871002a534eb
*afaf231ef79fb6369eee4f08a1bd06df7cfd2dde47a494fc57a494e8f5f62dee9a3280683c32f5
*cd5b6f1fe1f2b50b5cba7a1e804b57cf2f7c5fbe7681378e1c66e93753c1cbb204e0d8f616a74e
*9ee4ffe2f4e9536c6ebed9b426a522a5d8582067040a2120e5885292d5b5557e79f090c1e02f5e
*bcf807a5246b6bab1c3abcced1773679f972af0152d2e09c6b776c3e6280fdbd2e9d6e6749e89c
*33c3bd8ada8d1b43c6e45b90e9499d2d30781f08614851580adbdca918137555e39c03e05f159a
*546925140d0a0000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/selection_background.png
binary ./contrib/musicplayer/src/resources/images/selection_background.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000010000001e0806000000ed9574c7000000017352
*474200aece1ce900000006624b474400330051009dfc02d257000000097048597300000b130000
*0b1301009a9c180000000774494d4507da0801163b2206c4c8530000001974455874436f6d6d65
*6e74004372656174656420776974682047494d5057810e170000001c4944415408d76360c0008c
*4c308209170b8d604665612358486201001d48007c8267aa550000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/selection_background_inverted.png
binary ./contrib/musicplayer/src/resources/images/selection_background_inverted.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d49484452000000010000001e0806000000ed9574c7000000047342
*4954080808087c0864880000002a49444154089995c6b70d002010c0c0d3ff70ecbf0fa9448406
*17d64109b440fdd66b7dd7b1b19490ee26f64b183b722d44f40000000049454e44ae426082
addfile ./contrib/musicplayer/src/resources/images/song_details_background.png
binary ./contrib/musicplayer/src/resources/images/song_details_background.png
oldhex
*
newhex
*89504e470d0a1a0a0000000d494844520000006400000064080600000070e29554000000017352
*474200aece1ce900000006624b474400ff00ff00ffa0bda793000000097048597300000b130000
*0b1301009a9c180000000774494d4507da08060c390bfa262ca20000001974455874436f6d6d65
*6e74004372656174656420776974682047494d5057810e17000020004944415478da957d5b97e3
*bc72ddc695a4d4339f9d64e5ffffaa64c549ec75bce2e778a65b22896b1e8a550048f61c472f33
*dd2d512450d75dbb0aea5ffff67f6ace1900506b85520a356b2853504a81d61aff91572d40ce15
*d629a8e2b0871dd63acc0f8310c21f3e680095875fcdf38c6ddb0000ce4e886987d61aa594cbc7
*534a98a609c68cdf134280f77e78afb51629a5cb35c29ea00dfdfdbb578a155a032569d8a9a224
*858a0a6301e71c5eaf37bc77c367e2066897518b86750ac618e49c917386d61a4a29940c6803c4
*bdc24d0a3a1dcfa0a087cde00de29731e67293db1a916281520a4a03d629ba9114e1670d6db32c
*528ef79b116340c96abceeb6c1598fd7e78e987694529043130cbe2fa514acb5c83923ec11de4d
*b2f0aada8bc0f49b9142fbd95afbc7cd000063016d14ec747cb729f43b65106394cd5068eb643d
*6d02af0b0bbe3146d6531f6f7713bd475b6b506b85368a16d6946113d657944588a13dd0beef98
*1707400d1b473772f340ee66635586f306da54595896c698029e3f6881b5d6c8a57d77ce1961cb
*c3f72a0d84b88bd6b849e3ebf7766c864645914de47be44dd8c33adc2bdf87734de2f973acc1b5
*56acef805273a745055a1d1b5b1c94aea8a509523e1ec17b7fd15e7ee95c03945278bf36315980
*92857193420801a5142c8f593e384dc762294d6687d57fad8369c9693433fb461b7c96e094128c
*31a4ca9a3ed35fc7cf7af8eee5393e106f0edf57ce191f3fe763b39ae9adb522ee551638078565
*594833df518426e78c1847b54e01883162db36586bf1d73f7c8c82e8347225a128d8f1f96b85d2
*65b8ceb66d085b1693ccaff54d96446fdb06ad35acd3dd8355fa52a7e09c93dd6415dfd6382e44
*e703fca206bf632cfddf683f485d55493edf9b8b524a53e7ee3aa5142858596c9662ad35f6b599
*d87ddfa114998a5a34726a120f00259379a805d8de19c6372d9b1f4d23b4ba9a68eb016b1ce679
*46290521046ceb7eef1a6bc58fbf16acaf08e71c099c056dbe1e7da63106f3ec1142809ee71971
*af17e73dcf245dbcbb71a7dd4d29c13a8594127d89a387e49b2849c9c287bdd9cc9477e49c5191
*65734b21ff9352924d2f590d1b3e68d7de1e5ede5f8ad868a514b4b230da89dd377634937eb2f4
*b3aad0363713d8050429256c5bfbd9ea594c8ef316dbb689df9b97e9729f3955f9cee5e950b386
*b516a514bcdf6fba0f378d2638eef0de4393833aec713183daf3838710001d31cfb33840a3ddc5
*31bdbf02b4adb2917e324dba15f92896666bed2004efaf43654d3d7c1310c328497e32e4c7ea18
*5119ab0e5fa1506a42ca6110a6b369cc398bd96181a1c570f2f3f2f02d322b1bb67587e9ac6c8e
*f5306355dec72689ef87ad02fb65adb59847f677bc21b51c4e5d54546b40679452f0f5f91a4c85
*f71e8fc7033194ce89921ddeb72837c34e789096d8ecbbd61ad3a2c53ff537643d2dc4beb64d98
*667775b4de8a895cd715d65a7cfe5ee59ece9161c9a481252be49cb1bed2f1e06ef02b64f723f9
*b8ece47ed94cfff8f93108895f94445239676c2b0981b78b38ef5c02e25ec5e1e7747c4fbaa612
*f3e2db86f4365c6b4d0f7d98085ea018239c1f2fa46030cd641f6b1d9d39eff81e76b2dbce619a
*26b971a08a04b3a6e59c312d661006fe9e73d8edacc7b22cc839e3c7cfe5d87c35444335b7084e
*1bdaace5793cab2eb711d4f3f1016553f367ca0fdaa67485d5f3b0f131643c9e730b753b4d7a7e
*2ce2f0a10e4db1c7bf4744364f0fd1783259d50f8e2fa782b0657c3c7fc23a4d923d4d97f0366c
*69d4a4ce2eb687ac50ba625b23f67dc7f298a0e1619d1607cfefddfbebe5e6d42b326a3683d989
*4702c5f764cd04e3c6fb5326237556cbbbb933c50eafcffd22ada98c4efafd5eaf66af6c17e9e6
*050deb185586b889b089e085235f8b09db1a10d3e13f9481fa977ffe5b4d11b08e24b12293e33e
*274ab5edf0399a504a89fdbe4b20478747499ad215f3e2112399898a7c24741e4091bc055501aa
*25829ce572b2a73469066f063f784e80d60a4ad7dbfb58df9b84f15a6be49c074db16642083bb4
*c11f110be71c628c887b81367ad08ef37bfab0fdf3f70b7eb2c3b5534ad0291658d716d7180305
*3bdc1c65dfd7f06edf02c2ceeadd220bb6950a5622303189a692bfb04a6e725e3ce6793e32fe6e
*33487d25abafb5629a261116a539e9acf2409c88d53c220d691f9f476b8bf5d5b4ac64851cb564
*da2926d94c369defd74602024804c9cfe0268d69becff6638cc386eefb0e3fd9411824d051bab6
*45538524cc768eeeb8993e6b6d4ed7c35805efbdc4d8f479fa5d056144ce39d960fe97af573265
*fa31464a0cbf51b07ddfe4e1f81a2c403d56c521f0f2e1a04df3650c79b4244e4972592b6152c6
*1509cba1b368240bc0e3398b807004291b5c3d5eaf178c3197a4afe55166482b185beb9f41538e
*102e713e5f2447f5471364ad15fbb9aeab5c9cb37b5ec45aabe059d6da8b43978db2f719f89069
*478aec78c1ce593d7f678cf15b93658c414d2d9828b9caf5f99adbfbb0fbd55c42e773705354c0
*344dc839639e67c9ad7a8824e50014dadcafdf2bad5bd528a9e55eba97d6c7fc17e2762c4e2518
*c34d94f5a613606bcd3d1653921922b6d1f9cd87eaef9d796bea9a62452e4942c57e439c371291
*d062a5c1467318dd2f166f58298534a56a0941c51c568ae08ca51097fda1520af3e3786ed5f9ad
*daa2528e92580bd777681a7908eafbb50d42b0ef478e9402522073ad6dcbbd742f9db96ea8a802
*87b0ead54a76bf94229bf7ebd7af2147f8fabd0185c24c8233126ab283c47ebd7e5dec2627926c
*464a29c3a25aeb60d4240fca00272b9235e4308db617f0d2da232baf9a34e5084a18268a29484e
*b3bd5b3e659da660055abe873550c0c3ee3ad047aef2e3034ad7c181cb7bd8cc1f79d8b22cf073
*cb733842d5fdeea550e1bd1587c5197b2945d058feb2657e0e2afbf173268c46511dc5cf06da65
*09379d73b07a12b0ef4e83583396a7ebcc6646ae7b73b08812169319a012003bf6b38fba5b14d6
*7076ac35eb8b8f2c8910e2699ac8fc1c2173451a6a2efde2afdb4bd68aef45f2b12d8edf710847
*8a94bf8548351f3d66cb0a552571584a29c48d1e3ea524174cb140db82b01549967aa9e405a9b5
*625fb3c4e23d04efbd4729b47935eba126704a77b0bfbb1ce9f069facfd1f5203c8c36f4b916fb
*cd1008ee31561f3e1322f50c563ae7e4190648a618c1fcf8991926ea8153a514fcd4fc66cd4d33
*ac233036a7a320c81f94a24f75430ee2e6f1e1dfaf4d248e21f15ed2534a483b04999d1673c969
*d657a48550045ff435181284e63bde5f01d3a3452eda34b439ee65f409ddbde4440bc442d4071c
*fdfd78efc991178af25868b4d648a1228420f7d287ce314640e76193073379688536574d2a358b
*2f645368ec910bfdcf7ffadfb5bfc118e3457df77d1f00475af80ce72c6aad9744d218837d0bb0
*ce485279c699241bef369bab95db3be3f9a349742dd7042f868ce531094ea54d85511e552549f2
*ce255bfe396c057ed62899f2270e9559ea6b51d02ea36425e6f5efbd723acac9a75ce42ea9dcb6
*4d346b5f47b84833fc2d95b62e67e00dead5b294827ddfc195c6b3c47dfeda10f60ceb8c2469b9
*c4cb669c6dbbb5b6958e91b0ef3b396b350b7ada0396ce1bb96f6d9a7fe933ee949268511f8189
*669b567616a76d2b942573a574b99497098e9f644d9a8403d36c25291eb0c193805be325ffe837
*63001773546d616b83cdd917f082c61d783e9ff270ec5c590a7efc35c35848d67d578fe78728a5
*605dd761b1b4d6581e948d3be790eb4691575703bfcb2db4d69234d66c10f64c8b731483ce35fd
*f57dcdb94ad252d194fa8aa964d64a5bd8f77b95b0dbdb6580daa1284acca937d161acb53b2d41
*d2597bd4bffcf3df6a332115351b185f6ef1aaa136e13d7efffa12d898133feb9598843f259382
*dd2833d4a5a92219e4ba6c0e1823ea41ba9e9051b286eeea0e29253c1e8f216bbe63aef0ef7204
*2a46f3c58c973fbdc29e0893caf781460c19da70714b4b3533ee6508f9070de1c294360ac69701
*593dc3d3fcffd7e73e2c5adc2bac57e2c8f9bdbdc31d1cff21ed3937ed636ca9bf2e87bea5940b
*54d20703da9421ebd75a238420f079832fdcad8d370ea32f01f07a7fde6a550801decd94893326
*651a7b856bf229252c0fa2283d3f6659bb1823b4ad62de9ced50f2bffdcbbfd55213c256e16775
*811fee30ac5e527bed091b85c3b556383b2397302c600a94d0e554290c6429a91a7b58ef2b9537
*2f551caa8eb778d177a86c7fbd9412553c2de509825fdd3d676ce17a0a04bdf73e35e78c1c013f
*9b8b06dfdd530c5950875af42568d0a5b2a3531787e49c6b5ca2a34ead95432d9a40b4350cf41d
*63bb9ab6a21b63f3f47e6d92f53e9e3352a8709316bbcb9bc1e121e33ce7326c8c115547c96386
*8751eedb852da588bfb3d64269a2f1f0664c7e41adb89866de0ce71cac07a6699685d78ab4812d
*c3d95fbe3e8940c21ac310d01d894384ed7ffdd3dfea19c327381a97e8a624756bf7946adc2cc6
*fe8df6c8e52ae1decd43923592d99ac470cd9b31a1ef784c7f4a0ccfc1445f3739dfb7b516db1a
*61b5034c923202c328b55638e7b0efbb00886781605fd76b159bcdaa8ed4a0ab2b6def84f96187
*fb1a9dfa8123e5a8246b36da4269aae6d55a244258df816a18dfc4e93967a8eaa06db9e4033d5a
*dbab3517c8fea32f058d94f2352c4e550a5edf39f45a0811383be2699a06d4fbb65877545599e2
*d417f09cf552cdec37fcbb97f71edb3b239515cbf4839c7a4a89c2c6408be7670d050bad1c6dc6
*4a26e5e7cf9f72a1e5e1aff6af03de50b5d48e7ffddfb78486295eedbcd61a356b81c07b93790e
*95fbe72bf5ba196c3acfdad1b32e29f4a4da8b564e8a6c7d09226e7fd88c9c87cdc899303c542d
*9bd123d577848f9e7ea46d2668a7eeb4218cfb4cb3159b475c5652d569d180224c2ac731d161c6
*1d2d50470eb0047dc70d122ce4128417d5db6a6727285386a8c9bb452843bdbd35468bf9524a49
*22db87b77d11eb4cd8639fc4b078a9512225f9db57809bafecca0b9675544d65d35481c674d1e2
*de1ff5f7658c8186eb723a056d0db14154f5979ac700cd1f4ee9c75ff37043778e89434eef3d61
*615a0bb675c760e7587f3029b50891ad77f4a5944108628cd8d7d15ff4fe86cd0623d82c4c3dc5
*484cd341887b7cf8c1a10f9adf9108fbb05dcc2f760aeb23a30e45105fa61fc99a4620e60d3967
*783753e922e5889c2a0af68124dd5fa457bfcfcfcf01509be6c6143cdbc6d7d75b248103871e0d
*1d12ac1004662056c97e213df3427331e7fd3a1cbf33ad247ce42bfd8610da7a007e2bfdfd9c1f
*117473f0bd5ea37963cdbf08d25ef17812aa3098a7620758883590e11d01728fdc699a26b23e39
*1ffaa4ca602b733a41eaa621c0b37f5226dc3d502ef1827a9e6996dbb6113eb557a9c8f51bc361
*ecd7d7d72d46d6274fac31cc09ebb9c51700b3d33ae71ca685b2655eb0f33d50f168fad601f3fa
*f4fcaa7349b7969ea3d118270ac486e95b2b9a8f2b8709eb896a471e622c5d5470a60e081224f5
*78a0dece7f97c8394b52344d1394a1c4a8d62a3c2c2efe4cd384699a1a21fb58dc6d8d88a9957d
*cff5f8de6c728de642c3d9abdc1f9b9c7314144220bfa180143372c2c0a4e4cf0b8c130fd421d6
*01daefe85fa8aa23a68308248c64f4dfcd24446df5847d0b073b5b89cd541ac2433d079bec80b8
*24c98c75ee62b26afc5c8a7990b21823158d264a1c432400f19c04325acc68eed984ddc132cb63
*1a84a4210e56804796e8d7e7de88e24791ac2ad238ef2794448bd76bffe0ab6643f89d6b648b21
*bc0f791062aeade43c82ae2cef25039aba7c1c504ce31879731bb15005cca02483799e06dc88b3
*dd9f3f7f22d591ed5755123689774bcb0b7263c1f335faeb7158dd7fa6e717f7765aebe3fe5591
*baf5beef12a86ce145cf6272e3ebfeb5481ec2111e9bc65293483a718449faf7354b085d4ac1b4
*b4168992b42cae316658c75a2b96f9096b26c9b5acf1087b6ec18339fa439c75d0b6817c7d62c4
*f0bbc00f88c865976c9b39bd35139d68dbb64b31ab94422c8b5811e22a0e9959817d971117bc46
*a51c258d4c5393daed9d514a16cde18a22d15fbbc8e844e761a9564a895ff87afdbe35bbdae000
*0bbd709fcf9aa36d813184fcf67f9be719fb468c961ebd08711bfcdfeb93f39042b83cd7abcfbe
*80fb3e8c31d0cac1f9d64ac00d3f1ca170a973207f9d58e67dd8a9b5c6e3390d0cc7ef0042f25d
*4acc4549fa2087ab5330e104b1ae2a481797f31ac80d9f63123713e57a7f760e0ef8e7dfbf5e22
*40f3f4400a4a8423e702e83464ff5ca799662b75fc3eaae412722d1ad372387566522c4f877d23
*82d70073ab866195da88038ce99cc3586deb6dd4c58e8bffd677669d218c21e13c11ee9a93a4ea
*e50061706de6682d2356a596eb959a510bd9eb8ab126fefadc0154c4902fcfc4a6cc7a489b5a2e
*11d657417a39091cc8145c6638297d9f2a28a5e03c4152fa5c6398662b6c913f017a1ca6713da5
*4f2a25d1cb1832e85a2be25605057e7dadb7ce1a001e8fe512e69e0b65d4056ba14fbb99539586
*200e4cb4d287c988029b5cc3740fa59b0f6d707d2673bc8696001eac7967e7c1ac09a5aaab80f6
*91590feff49421e2252b6836151cf2a64899652e71305dd3340d344fe735bc5b089f51043cc6ad
*5eec2e87985a51869a0f0dab45cb83b3638f31ca02f62023fba43b01a107cb835631a1a22f114f
*0b099af3e4a0fb8d65d6a3b10aefaf5d4a0a9c1b3184e2ec249fe3d035a60d31e42bb3f38481dd
*dd7b0fba6edb06a52bb4b18a1aef6de33b4dd384c9cfd22fc88e7e0fdb6046425c1bec3e69b8f9
*9a81a7588fcc7b1307a7940254c6e7af4d6e8c1be97b4664ff60ac8d0249d42a9d4efcfac7fff4
*53decb0bd737037168ab0d4ed93c04fc7c7c4ca8590f390e43e3c6d5db760be70dfcac45f35300
*4a34f2fce7a10603427cbc18b8d5e7a84a6b4db0456dd5be3313be5745ebafd0778b7ea84194cb
*9a2900dbb6cbf57efc350ff17aadb54925cc688399b2ef74b3f1260e6dd78c16ef5b922081af53
*0bf5e09f2121d60c063f0120d720da66b4bbb454e444426bd4446b52a954cd655beb81545758eb
*601d55252f8cf8620748463aa838c17b7fed43ca5fb391d6e59ceaa5a185cc90119eeaf9e1140c
*e6c7a8b6d6371c8ad91d29a5a18a26bd14df340739e7e03c6157afcf5dc2dab817fcfaf72f31a7
*da50f2ca918d75d405a674152ad3194beb4bcddcf419e236f81bab27a4bc53a1aaeec7bd5668d3
*900dc1f25e5f30daa3d43408f5e417e1035fc2eb9c33522c787c4c707692ea580f345ad7d81223
*e8c6b67b1b6ce6be25546471da7d32c73e61794c8353a396005cdadccee62bc608ef0871fe2fff
*f51f24397493c6f224a6226b2f67f8e75a87d61ad64cb7a8f6344d54f78f8d38d7d35253d92f11
*93a004cb42c3058ee79da609b9509b020badb3f3657204af6b2905daf9363420955d40bf12f550
*782aa50a591a008c9a04d286aa170418a0864792683d98bc7ddf6f09093ddb84cc963ed51e624b
*a8d0496435434dbebfcf4110fc3244687d145792a120e060be187724c295a07d16941c157efef5
*448e04859c05c77a5c9a63df9f3cef45a3d43898c05aabe44c5a6b6856df0be3ceb5669d5213ac
*35434324412a5aa20beed7e68d39b77cf5d8148a13bbfefedabf05272bca0968540412eed74cfe
*f5d9d748f2c5af586b2f92d9b335532253b98796bf50d269badcc1c3b87a0c4c207fd723060c87
*f07373bf88f115fb16615c91a0a24709b4697e5473df5e6fb3432098a327049c0b4b216e98262b
*a6ed3c5cc64f06612b50d50d52b9ef3ba029a456bae21ffff3cfdb0de99986fb16254b77931aea
*0b3c1cc7762332b8ab3527e29a09f5c7984b74d3f7d82ba5b03c3cb635de4645eff59322a86e2d
*b83d42f86687cf72ce1d656ea23909f5e7f025033d2a25cc8b3fdab7d97ea5c6f125ea64954829
*27dc50843c6228b724ba96b1976162c15d4ef17abde4737dacde377e9eab7b83dd7e3aa9c4b582
*108599fc0c6798beafc3f7511c2fd63c4ff2fb5adabab07f113c2d0438330bec4f1dc45492185a
*c9d5689e6badf25e2e60718426357537e9b1203469bc3e37cc0f7b60fe7948908c6d9d4667bc87
*9d9eb576b0a771bb6244d6dadb16b64b08bd6db7704c2fa93d1c5f72f3031c304829784f62f6ac
*b5a8b9b510bc5f3b2da0b292649e933ca5144aa2c6566620fa598b49e292c4b6eef7d5d12d0f1a
*1d4220ee819ba16b053e3e3e10b7eb6c90e70f2e1c392c4f2f6130432331ed70d6b71a71aa883b
*0df6daba261b81f5e7f6306747c8b34ea8ebe860dd2f5e1a86e6791eea07712f627aac9950b21a
*e1f8834f2bd08969dc32a83234d0e4ba0959faf19c6423fe48411a209c56474a29d1d4396b65d3
*c5af8600ad2ca6a57d37698583714788ad14452bbd03bda0aeaa5e1c21df544cada1c558053711
*023b3fcc2da3502b7b4bb67b7c789963a57423dcf50d43ccad8d2910eb91dbc2f23e84b8d2edeb
*d425dfd0b61ee390a8cd6e5fd3d1709a2f0bcef0096bbc449547c0d12ff6beb5395a15059fbf36
*4c8bc5be26c9d4bdf747806405e7abd9a020ca33ea100235b2cf57ae542965301b2996a1c3aa77
*4c4387503fc0ece87be78d39130638f28a21c34d94d1e6541b06d6d95e9e2722e17131b7a39ccc
*f72e4784e9f3f35330ae6ddda14cc6bea64b7e104268d0fc645a2e63c640619a1db1e093c2be05
*ccd34c7d2c93968dedef81212a0e3a64ddbdf79782520f67f4619f751a5545d8e3894b6ad31858
*bb38576076c9184dc44be6ad34f37aabd4188c55787dc64b52796101eadcda894f84e633242409
*68bc36853219c33a7bf16fe73e126749b350ec21e927987e32589605ca264295b51eda27ce5ac8
*9bbd6f9136e89c309dede248bfd403e96179fa8b9973de4081ccd6790109ceb8da616aacf4c368
*0ce3f2c12f6ebd84bce8fd351823e2096fbd10f5b895444a478dfc4c58e3b0bc9fd1f5f5f585e5
*31218470cc4ea1c5a5fec27448fa899d980f98a46a548c83d1cebd9483c97e3cb1ef47c5f02e61
*ba756427ea284f47bbd04271708473231533a4c2b692216f2ee18678c02f479bc1b606aa316b2d
*2c79693b336de243afdde788665e28e0102d3b4ab85c25643204f1a11c4aae036ec56686478794
*5286b668a965c431fcd7b6c8b34b53695f08fbdaae44c4420e5f5fcc41b1171b7a0931cb7dabda
*59dd8d39c80f931f20158ac88a90cd942ed719bba611dffa3ec126f1f9428a70ce51f3651c49d5
*0293f0e03336433a52987bf81d6daea5e7699a6e43d77e1d183cecb963e237e1c574f358a6e7c7
*48436250775db7b621620b75ba44193d95b2667dc1a0d65718baaece0f7056d59cb320c15ce8b9
*f4dae96ef0cda1212c915c7e15ded6464522aaeb9c0605a8eb3c494e34e7799630f76e1c2000ec
*ef32e4493d6b91cd320b13a7033d182964baa086819b6c46f77da7a946c5c07b471b4259ed15ea
*f69ef8beebfafea31dfceb1f3f84e450f275600cff2b44b3aec429e05e199db7b15447f9fabd4b
*afc7c6e3f90c41e4fd004de78df46e9c43d43bb37a215d4c8ddca0b596cf975a2e7388adf1d2ae
*71ae9570e593c912fc9c3cdbad6432b325934f5ee62745943a53c590ed1c7f697f93afd70bcf1f
*13a6f95a7eec87aaf4f6b18fca7891532cd293774738e3b14e670d0b7bc2c7cf493a9094a9c3f7
*701bc32551531ed6fc79523575ca9646d339c63fa1128acbd12213becfb513065597c774816758
*832f15ce4398deefb7b464974af42009a7cf95307e30ad8d740c9deb1900f07c7edc6e48ce59b2
*ee3ebafafdf9efb7f6f702fc755ac2a627ec71c8b663a0b956544ff1b0c68b9336c6608fefdbe4
*b30f021e8f07ec21857d354f69328d3ffe9a874a26a3bd3114e20a1c265746fbed6d0e71bf3631
*26d1aa36c0c65c82a369a2de77dd473cc22fd55a8803fb9a063c8a8758bedfaf8b6de60c99e9fc
*bd83ef29fcfb460d4261ad43c4f51d34e1a756b40a2190f41f9dc3b96e4899d0024e1c852715af
*9bbfbe776997a84862f6183a194882de9cc2f3c621e071b32d9fe866076b25f51a6678a61c3a46
*660b38041b2b85386e0c310833b194566f2806d659aa1747b279f3e2878adf25f2b8997cd03fa4
*520ade3b842db751ab4e5d78b1bdd6f6b981f7fef063cdd1b366734dfcf131094c720e18982dd9
*6baab5563a86732416e3bea5639eae162d20fa50ed40492d21f4344da269b944a120dd6162bcbe
*4af78063b99a2cbe79b1f59a608fc773a6ee1fdd2a7e325baa2b8552e858873a3b8fee1bb3f37a
*19b77d479da1fb5170beb139da1fa26064ce6be4542fb895524a9cf377a16bfffb9c331e1f5ec6
*641863e0a7562dd4fa98501df541666824eb7ddf895103334cd3ebe949c44dce433d87b5c45a0b
*0573dd10630c4a4dc3054308c43d4a0db5143ed1fec2dd35d6751552c2ed428086bc50567baad5
*e7e60c59c2d67595613767fc8cf0263524891c9971a3ce9f9a2fcfa35d5930788a4f5fff0821a0
*a820802337f7f073f2bc494e07c8f1f763d1750756261168eb2910b86c0857e0cea1ea343b3923
*a38f9858d564164a8c836d159b1beb1065396f84caa9f4318a1c6d74f979e898730e316f17e662
*bf809c0b717b443f8fb11f91c4f3b3c40c2e24f135530d3fa524cccdbe5460ad3df2320763e9d9
*97a7450c4504884bc2463b3c9ecbd8777fc2affc6491eb489ad03da400d0a49c9aed70c3db76f4
*6f70d4716034db1ac581f793dc6433f7d4ceeb30d46fde9b15eefa65a6cbbabd2e7ad4a3b9bd49
*bb3b848573a1deec863d1d499787338bd4d93f7fbf87e7eba7110d09abad825ef0bd33e2c008b9
*f35ae61d135414e5e0010e665af7551593c6d16b1fa16ba33da032d2ae8e93623cfcac866ea379
*9e81d2fa1db4d6887bb9b41a9f435ab695564f429090f33d627b302606708da2a73958fb3d3cd3
*4fee69e5d77990483fb5fa4be368d1314bfd493dece7b8c7b19426f5cc2d384f9bb8f381ce4e04
*ffab02ad88691f4346cd16cefac3d23081e244122f0aeabfffb7ff51ad9e8481b86d1b2dca31b8
*58e922a3ebbe7b3109ba9f8df2fe0a43f8ab6029cc044534dfb51c706f78cd5a7a5608ef217646
*4906dae6c3c459941aa1aa6da4be9b090e67c883b3ecffdfd777d7664a533fb5883770df7758e3
*90721ccce8483874d255a0adb5031d9435823021929ccb08899cc793123a73e51c512f79087d93
*f524ff72cfc41942e719590cd1f4122c1535db256b07585855b3ffcc11eec3cb7e81783318609c
*e7f9209873899722a110c285e2d313da869a919d1b88599c68279b382e57f0738af92b0b844e00
*000cff49444154e256b7b87648b11d9be6991d28635c1517a3cc7063ac6e8c96f6918f36e467de
*af8dc63675730865e0a59dc53fccf32c91dbdd6cae3ec9ebf95fbda028530499e5a38b782cf85d
*55d3fb09391efec369c909b42d449ef67e98f0334a9792c0645b23720952d2c53118e7eec5dd68
*3d5a4e2dda559263cdf02fbf79dbb6014a28351e0d3bb4008cfce6484e99d1d2bbf8fef19ce126
*c26918b413c7a98e6a5fd512bdf4713bcf5dd9d70c83191f3f17843d23e6edd25054f2d14cca14
*cec54a1ea56bbb3f393446d3d07c9ecfd812b6e6578603634e66aa2fbbce8b1b4a007d72db17c8
*b8844033c42aac71425d9a1727c74b9186d4366796618edede71df9fd65a6ae26e1a9dd2b91db9
*7f3066be1be5874d65c2ddbed2cc299ef6f0fc38e6fc5a4b7380d58e75a503b696656921e4f17e
*e7a98ac760214ba0b516b1bc65d3187feaff3ece5dafe86750f69b780e2238e1ac651c6b35709c
*0f412453a907a665ca716030f268749d7386750a935f2ed1c3794a742d4a9a1765184c5150d509
*618d1785ede773f9ebc09c76c4bc0d9b2ad538771c798124f3d3b99f639a1d3e7fad973af8e097
*8ed1191c860ab5bfefa032b80543cfe63ac53a686c8f5e4f33f9488596702a5d259a94331b8f0d
*e28a6529057713a9620a17129fe6acf9ebf55b2a6e433952eb76d08a2ad2f2d6df6455f198aca6
*608c95711139027b7c1de4856757e432d7cc59d561d025fb85142b1e1ffe1656093b6ddcfbb562
*9aad84a53d9079ae78864063a5726e2c132edff6b85adbf4d620ca8841dfdde5bd6f4391f58c9c
*b84b6b9cec3a3db4e45e21c40b6c2348304063eb9c73d4435dc7f9baa514c9179880c0f56c8612
*1a9655652a27254e46e69748334cce727e159738253bf757e9b58eb2fd9e94cdf7f5fc988903b6
*4c8296f277f4f7c5dacaf9c6baae40d5e26bb87c9ba3be86b9c7ccc68a3c9c49c5fe8aeb4264ff
*8bf40e9ec90f52fdf41adebb36c514e34c7dcdaa1243c11ede2221fbbe0f0d28b4215554ed4c30
*383bf4f76b1fec636f0639a2f1dea3aa885af4c089921338d7eea852d7f208d6dcf3bc94fe251d
*beb188c670ddc55adb583549cbdf990a2a519159844ccdd11167fbec3f19e2f9fdfbf705ade601
*fb97b9f25921ec418ef91bd068ce489dd763376ed764c263f6420c434de46c76640655a1e84b46
*60a4041ec98162506b1be327dcacc51e874176cc48d3d5a6652ef002ad2c4d6948e3b1a7e7bec2
*7d279e6ecf389793d20e2848db727b000b00c4bc62f2cb60c6bf4b2a9d99c70108858ec653c575
*674152114d9b4ae8792526236359fb9aa19d7317204fa0f5ae65d77b2fa8e5bcf8cb0823862938
*049ce77970964c848326cc27843098273e7242e9b6a0fd201a5e906ddb28e13b0e426943edf56d
*757018a31e8adce3e4974b6bb4736e8816e9b49cf1fcc2de6a30b45232f55a3aafc56a284dc9e7
*16bfa46ce02625633fb635a26087515e4e929b96e350b0bb71b0fdfcc37e1824dfe8bec56e2250
*6ab13f801235aa8e97f83dc57a759a999080f3096b3250f2c86699e1311edce591729061c63db4
*c1838dcff7d60bc077a581efe0121ec1e12773cc9c6f1dbd2519289380e22e75781ec85cf3717c
*5f1714c49dd00736c15a2b7b7b63fd878c55975981fd0c14aed0891d74656c0465bbdd9d1ad023
*b48c79f5052896ca655928d2dbf78133d683857eb248a19e720abadeb4d8e1dc5c09679dfb360c
*1e42f253716d5e5c37a5a8a3843ac2b3b4cdd8b7337412a8dedf9f7125beb10cad717a685e897f
*a6e02fcb22095b45be8cffeb99793cfd99ff4e1255065e548c112557c195fa835cfa30b5242db3
*b6f873673620e3713995ae657bc4dab82e22d49cd35caeb306dd9104d77740ca74fe61df8739f4
*bdc3a25632993c9249e97aa126f1ba3095376c197a3c9e475d42b5811d12eb80737df77a3e9f17
*360787979cfd1a45bc606d1a70783eeb8f43cb54b6a1438adb08ee90d769a6795cc39cc38e1f96
*4217a4ec092511399a23ba3b66bf1c4ecc27d8659afca35d414e040d59bd8cb5f7038da0091813
*cd067377189d6e018fcee4437a3bb96fc46ee7c52b4923954d54fd3c83b78fc2be83d4bfab659c
*cfbab5c68f737bbf3bccf2384f248480e7f329ed6835eb4badfeeeec93b39f9ae7f9223cfda0ff
*c13775ddc3dcf3c1daeadd8298b6fb690f8736863ddd121f18aa92117f7cd0b09fecd05fa1ed58
*eeec7bf1fa1a86ba5683259aba7b31efb78f5864a3ab1ac0b9730b353f503f9d8e26005dc37181
*ba236478739b6d42e1298f98621f1643c2b66fc8510d7e8dbabff4e5da0a06251a941a1b3bfe44
*3ffa7bc7f8899feb6de0348f87b984b5625bc3304ae87c08714f30ebeb0f7cfed285442d27a199
*5359d4b5664c3e6a95e9a985bed39cfacffbb36d7b33c35199524a48042543ecb9754a18f9c638
*584d63c373dda1aa85f3163ffffa3830b636bf378602e7fc85a5530b60fa632e0e08aa3f7e494c
*671d05b1afb95092082792d83b9d7ddfa10c716c738912febebe36416fa7691a90ce9ede72cea0
*fb4ea9334ff68ebb356ee2519728fb70b03d0f10d8d6787b400be17047cfc8dc1137b622e7e056
*24396c789a2654453d7f31b60102fdacb0aac2407ca0402182e76c85ad1c48407b0e630fbff72e
*43a24ad76c74d65213f990bb834eb894da8fdb3ee701bd6d65ba0c9de76abf9d752b9276aa27ef
*3b4d1dd55acb6cc5f13d8a82f14442a231a160bf14b194a211e74c22e85b20f85986c357bac38f
*7913a9faa7859d32f4cf1fcfccc74ee49ce9704adbb4206ce5203e10cacb8adcfba5bbf51493c5
*adc36cc3fb632604573ac6610c5cd7a379d2688a98f86c4399aef34d3436d451f63464d5d2ebc1
*b456ae9d143d503619ac2ca5482f494c61609e9c0fe872761a32f494f2d0d02a76dcb4f2c2d001
*053a30e0f5b977a3cfdb66a4700c25f3ad29d4cdcd175e4fa35317f3ab998bd56fc220b96b53a9
*2163e5f362b74d16877bc9bf7e531e22f0b6b2c383f5da3898b9ea6ff2814489a41e8309a52b1d
*ade4bd0cc1792c4f281861cf702d823f5791a55bcc7b7f61b4084c83be83b84b0c4144ebe78f49
*06fe33119cf29e7a5b4b0a7b1aa6de71599ccd2f4fb6064ec75578375d262f9cd5bd472c6bede0
*e66f425e0ee73854ed19163d99ae27d5fd3de648c3a54e75956ce5ec0f8edcee30aebbb0980f3d
*1e5a26b447ca3b6d90fafbc7e7f1a4d5be1e73cbd229807334e6e986cadb6ef8d7ef7fbf2d45f2
*b04b8e4c88c8505bc3fcd11331460fe3e2cad1a9c766f0d10dbd7ffaae86dde71f0cee397f6d2a
*ad8aecb9946887b9bef71b63f58cb027397db4e5284536e37ca6096b4d7f4d42b889dbdb23cffc
*de7e7d8cd5b2193d8c64ad25f89d1760599601e1ed1728a5243569b6ebdb3b0e784d2daa3bdaa7
*7529ddf9928a225cae9e06cadfcf93e53867d8378ae1efa66dd388db233f51f9b656c23c5b8eb2
*d86f1a4725d873ed874fde84ba1e1e10133d6b7fb0006fcee339137f9769ac954e3ee8bbc77a93
*cdc971ce19db3bd286e49cdbc29e46eaf51341bf7eafe2b44b29981f6ee8542593740c99d495ce
*e170d71179e7f037a70a65b24cba6667aab516b8e13c80a6379384168f848473e5b3477cfdaca5
*44c0b44e867b7a02c4d9a73285c91823bee87c7203d393b4d6509580cd75dd64d801afeb59488d
*a1890eea9fffe9dfaa7659ecef772c7155dd30583ee78cc9cf420253d08d9b74810d3c620c2d2f
*a8d4eadc9f69658cc1ebf592c3e17b42f4dd10837e332f006905e68793c61c058398f6dba0e53b
*9497dbb2ef8480a59cc63fd501ce3f1f99340432c5b49e1578140499455f4093e7f4f420f5aafa
*fe785456b57e3304a83b9d9a708ea0d8316aa5856be5bc1569d5b6a2942a6405f253f9327bc4f9
*c62b3e9ffa7c3ef2c83a053f53dd7cdb36021a8ff3a88cb117f3334d93008b7ddb41ef1fcecc10
*c1ced0866d328963dff701516eea6586363b4e4695c9787e2c82b7e9fecbe5e89dd22627303b9d
*0ff9e2f7f5147aef3db45158df57803197801077a9366edb262c4422cfb5c35600c8d09ac77391
*9637417f0f48bc1f44d6dbf0fedc11a3fde51cda52f2c5a7fdfefd1bd36250f298a47162bbaeeb
*d094d30ba4316d20f31ede12ac50486d0722df99f42073eadf7138b54edf252abd6dcea98a0364
*08854eb55162535f072384e78e5cb46cab32677d9e674990fa0598e7e5a2817e516d86cabed318
*23e5871333fb737599e41642b82c006b6b2ff13ce785cb00fdc8595e833e88782c1fb229259fea
*31476bddf2f417b6cbd9f4c5d01893f3e338512846acebda36246e47866e3cc61a8991dff745fc
*3ef3e461f88384753ecb4ded149efeb4cdfeb56d6b032f73a3d9f487c91b473375a552f99c81aa
*2e4d351495a58bf3643496f9c16c1de4041c3de26e177f55626b49e8486e1cba1a8be184a01ef6
*efd7d4793b508e1428805896055a556224f201bbfb96442a69845fab4f334de67cf2f2f990b052
*ca0049ecfb0835d442a6902588bb9bf635d15921aa0838c7b51686d6874d5c690a02cfc0e2eb11
*726d07de179fa39e7386f56a001a870438e0b605a31fea793685d3dc4656f148f59ebf0600cfc7
*c7f03df3c3b4b3460ef0b19482ff0732ec26a210639c300000000049454e44ae426082
hunk ./contrib/musicplayer/src/services/albumCover.js 8
     Artists = da.db.DocumentTemplate.Artist.view();
 
 function fetchAlbumCover(search_params, album, callback) {
+  console.log("Fetching album covers", album.doc.title);
   lastfm.album.getInfo(search_params, {
     success: function (data) {
       var urls = data.album.image ? data.album.image : null,
hunk ./contrib/musicplayer/src/services/albumCover.js 42
       if(!callback)
         return;
       
-      callback([
+      var urls = [
         "resources/images/album_cover_0.png",
         "resources/images/album_cover_1.png",
         "resources/images/album_cover_2.png",
hunk ./contrib/musicplayer/src/services/albumCover.js 47
         "resources/images/album_cover_3.png"
-      ]);
+      ];
       
hunk ./contrib/musicplayer/src/services/albumCover.js 49
+      album.update({album_cover_urls: urls});
+      if(callback)
+        callback(urls);
       delete callback;
     }
   });
hunk ./contrib/musicplayer/src/services/albumCover.js 58
 }
 
 /**
- *  da.service.albumCover(song[, callback]) -> undefined
- *  - song (da.db.DocumentTemplate): song whose album art needs to be fetched
+ *  da.service.albumCover(album[, callback]) -> undefined
+ *  - album (da.db.DocumentTemplate.Album): album whose album art needs to be fetched
  *  - callback (Function): called once album cover is fetched, with first
  *    argument being an array of four URLs.
  *  
hunk ./contrib/musicplayer/src/workers/indexer.js 59
 onmessage = function (event) {  
   queue.push(event.data);
   
-  if(queue.length < 3)
+  if(queue.length === 1)
     getTags(event.data);
 };
 
hunk ./contrib/musicplayer/src/workers/indexer.js 84
     },
     
     onFailure: function (calledBy) {
-      console.log("Failed to parse tags for", cap);
+      console.log("Failed to parse ID3 tags for", [cap, calledBy]);
       parser.destroy();
       delete parser;
       
hunk ./contrib/musicplayer/src/workers/scanner.js 13
     document = {},
     queue = [];
 
+var console = {
+  log: function (msg, obj) {
+    postMessage({debug: true, msg: msg, obj: obj});
+  }
+};
+
 this.da = {};
 
 //#require "libs/vendor/mootools-1.2.4-core-server.js"
hunk ./contrib/musicplayer/src/workers/scanner.js 36
  *  
  **/
 function scan (obj) {
-  obj.get(function () {
-    queue.erase(obj.uri);
-    
+  console.log("Inspecting cap", obj.uri);
+  
+  obj.get(function () {  
     if(obj.type === "filenode") {
       postMessage(obj.uri);
hunk ./contrib/musicplayer/src/workers/scanner.js 41
+      queue.erase(obj.uri);
       checkQueue();
       return;
     }
hunk ./contrib/musicplayer/src/workers/scanner.js 46
     
-    var n = obj.children.length;
+    var n = obj.children.length,
+        child;
     while(n--) {
hunk ./contrib/musicplayer/src/workers/scanner.js 49
-      var child = obj.children[n];
+      child = obj.children[n];
       
       if(child.type === "filenode")
         postMessage(child.ro_uri);
hunk ./contrib/musicplayer/src/workers/scanner.js 54
       else
-        scan(child);
+        queue.push(child.ro_uri);
     }
     
hunk ./contrib/musicplayer/src/workers/scanner.js 57
+    queue.erase(obj.uri);
     checkQueue();
   });
 }
hunk ./contrib/musicplayer/src/workers/scanner.js 78
 onmessage = function (event) {
   queue.push(event.data);
   
-  if(queue.length < 2)
+  if(queue.length === 1)
     scan(new TahoeObject(event.data));
 };
hunk ./contrib/musicplayer/tests/data/songs.js 11
       album: "Found Songs",
       track: 7,
       year:  2009,
-      genre: 0,
-      lyrics: "",
+      genre: -1,
       links: {
         official: ""
       }
hunk ./contrib/musicplayer/tests/data/songs.js 35
       album: "Unknown",
       track: 0,
       year:  0,
-      genre: 0,
-      lyrics: "",
+      genre: "Rock",
       links: {
         official: ""
       }
hunk ./contrib/musicplayer/tests/data/songs.js 43
     frames: {
       TIT2: "Death Will Never Conquer",
       TPE1: "Coldplay",
-      TCON: 0
+      TCON: "Rock"
     }
   },
   
hunk ./contrib/musicplayer/tests/data/songs.js 57
       track: 6,
       year: 2010,
       genre: 52, // Electornic,
-      lyrics: "",
       links: {
         official: "http://delphic.cc"
       }
hunk ./contrib/musicplayer/tests/initialize.js 29
   'test_NavigationController',
   'test_SettingsController',
   'test_PlayerController',
-  'test_SongContextController'
+  'test_SongContextController',
+  'test_SearchController',
+  'test_PlaylistController'
 ]);
hunk ./contrib/musicplayer/tests/shared.js 65
   }
 };
 
+// verifies that elements from `a` are in `b`, as well as on same positions
+// jum.assertEqualArrays([1, 2, 3], [1, 2, 3]): pass
+// jum.assertEqualArrays([1, 2, 3], [3, 1, 2]): fail
 jum.assertEqualArrays = function (a, b) {
   jum.assertEquals("arrays should have same length", a.length, b.length);
   
hunk ./contrib/musicplayer/tests/shared.js 86
   return true;
 };
 
+// verifies that elements from `a` are in `b`, without comparing their positions
+// or number of occurance.
+// jum.assertEqualArrays([1, 2, 3], [1, 2, 3]): pass
+// jum.assertEqualArrays([1, 2, 3], [3, 1, 2]): pass
 jum.assertSameArrays = function (a, b) {
   jum.assertEquals("arrays should have same length", a.length, b.length);
   
hunk ./contrib/musicplayer/tests/test_PlayerController.js 85
     );
   };
   
-  this.test_queue = function () {
-    jum.assertTrue("there shouldn't be anything left in the playlist",
-      !Player.getNext()
+  this.test_turnShuffleOn = function () {
+    this.tbs_playlist = [self.songs[0].id, 2, 3, 4, 5];
+    Player.play(self.songs[0]);
+    Player.setPlaylist(this.tbs_playlist);
+    Player.setPlayMode("shuffle");
+    
+    jum.assertNotEquals("Playlist should be shuffled",
+      Player.getPlaylist(), this.tbs_playlist
+    );
+    
+    jum.assertTrue("Next item is being chosen from the right playlist",
+      this.tbs_playlist.slice(1).contains(Player.getNext())
     );
hunk ./contrib/musicplayer/tests/test_PlayerController.js 98
+  };
+  
+  this.test_turnShuffleOff = function () {
+    Player.setPlayMode("normal");
     
hunk ./contrib/musicplayer/tests/test_PlayerController.js 103
+    jum.assertEquals("Non-shuffled playlist should be restored",
+      this.tbs_playlist, Player.getPlaylist()
+    );
+  };
+  
+  this.test_queue = function () {
     Player.queue(self.songs[0].id);
     
     jum.assertEquals("next song should be from queue",
hunk ./contrib/musicplayer/tests/test_PlayerController.js 116
       Player.getNext()
     );
     
-    Player.setPlaylist([self.songs[2].id]);
-    jum.assertEquals("next song should be from queue, ignoring the playlist",
+    Player.setPlaylist([]);
+    jum.assertEquals("next song should be from queue, ignoring the fact that playlist is empty",
       self.songs[0].id,
       Player.getNext()
     );
addfile ./contrib/musicplayer/tests/test_PlaylistController.js
hunk ./contrib/musicplayer/tests/test_PlaylistController.js 1
+var test_PlaylistController = new function () {
+  var PlaylistController  = da.controller.Playlist,
+      Playlist            = da.db.DocumentTemplate.Playlist,
+      Song                = da.db.DocumentTemplate.Song,
+      self                = this;
+      
+  this.setup = function () {
+    this.songs = $A(Song.view().rows).map(function (x) { return x.id });
+    
+    Playlist.create({
+      id:           "PLA",
+      title:        "Playlist A",
+      description:  "DA",
+      song_ids:     [this.songs[0], this.songs[1], this.songs[2]]
+    }, function (pl) { self.A = pl });
+    
+    Playlist.create({
+      id:           "PLB",
+      title:        "Playlist B",
+      description:  "DB",
+      song_ids:     [this.songs[2], this.songs[0]]
+    }, function (pl) { self.B = pl });
+    
+    Playlist.create({
+      id:           "PLC",
+      title:        "Playlist C",
+      description:  "DC",
+      song_ids:     [this.songs[1]]
+    }, function (pl) { self.pl_a = pl });
+  };
+  
+  this.test_addToExistingPlaylist = function () {
+    PlaylistController.addSong(Song.findById(this.songs[2]));
+    
+    jum.assertTrue("playlist chooser dialog should be visible",
+      $("add_to_pl_dialog").style.display !== "none"
+    );
+    
+    var playlist_ids = $("playlist_selector").getElements("option").map(function (x) {
+      return x.value;
+    });
+    jum.assertSameArrays(["PLA", "PLB", "PLC", "_new_playlist"], playlist_ids);
+    
+    $("playlist_selector").value = "PLC";
+    
+    $("add_to_pl_dialog").fireEvent("submit");
+    jum.assertFalse("dialog shouldn't be visible anymore",
+      !!$("add_to_pl_dialog")
+    );
+    
+    var plc = Playlist.findById("PLC");
+    jum.assertEqualArrays(plc.get("song_ids"), [this.songs[1], this.songs[2]]);
+  };
+  
+  this.test_addToNewPlaylist = function () {
+    PlaylistController.addSong(Song.findById(this.songs[1]));
+    
+    jum.assertTrue("playlist chooser dialog should be visible",
+      $("add_to_pl_dialog").style.display !== "none"
+    );
+    
+    $("playlist_selector").value = "_new_playlist";
+    
+    jum.assertTrue("form for creating new playlists should be visible",
+      $("add_to_new_pl").style.display !== "none"
+    );
+    
+    $("add_to_new_pl_title").value = "Playlist D";
+    $("add_to_new_pl_description").value = "DD";
+    
+    $("add_to_pl_dialog").fireEvent("submit");
+    
+    jum.assertFalse("dialog shouldn't be visible anymore",
+      !!$("add_to_pl_dialog")
+    );
+    
+    Playlist.find({
+      properties: {
+        title:       "Playlist D"
+      },
+      onSuccess: function (docs) {
+        self.D = docs[0];
+      }
+    });
+  };
+  
+  this.test_waitForNewPlaylist = {
+    method: "waits.forJS",
+    params: {js: function () { return Playlist.view().rows.length === 4 }}
+  };
+  
+  this.test_verfiyNewPlaylist = function () {
+    jum.assertEqualArrays(self.D.get("song_ids"), [self.songs[1]]);
+  };
+  
+  this.test_playlistEditor = function () {
+    PlaylistController.edit(self.B);
+    
+    jum.assertEquals("playlist editor should be visible",
+      1, $$(".playlist_editor").length
+    );
+    
+    var rendered_ids = $$("#playlist_songs li").map(function (x) {
+      return x.id.split("playlist_song_")[1]
+    });
+    
+    jum.assertEqualArrays(self.B.get("song_ids"), rendered_ids);
+    jum.assertEquals("playlist's title should be correct",
+      self.B.get("title"), $("playlist_title").value
+    );
+    jum.assertEquals("playlist's description should be correct",
+      self.B.get("description"), $("playlist_description").value
+    );
+  };
+  
+  this.test_playlistEditorSearchDialog = function () {
+    $("playlist_add_more_songs").fireEvent("click");
+    $("search_field").value = Song.findById(self.songs[1]).get("title");
+    $("search_field").fireEvent("keyup");
+  };
+  
+  this.test_waitForSearchResults = {
+    method: "waits.forJS",
+    params: {
+      js: function () { return !!$$("#search_results_column .column_item") }
+    }
+  };
+  
+  this.test_clickResultItem = function () {
+    // clicking the first (and only) search result
+    $("search_results_column").fireEvent("click:relay(.column_item)", [
+      {id: self.songs[1]},
+      $$("#search_results_column .column_item")[0]
+    ]);
+  };
+  
+  this.test_waitForSongToBeAddedToThePlaylist = {
+    method: "waits.forJS",
+    params: {
+      js: function () { return $$("#playlist_songs li").length === 3 }
+    }
+  };
+  
+  this.test_verifySearchDialogClick = function () {
+    var rendered_ids = $$("#playlist_songs li").map(function (x) {
+      return x.id.split("playlist_song_")[1]
+    });
+    
+    jum.assertEqualArrays([self.songs[2], self.songs[0], self.songs[1]], rendered_ids);
+  };
+  
+  this.test_removingAnSongFromPlaylist = function () {
+    var delete_icon = $("playlist_song_" + self.songs[0]).getElement(".action");
+    $("playlist_songs").fireEvent("click:relay(.action)", [null, delete_icon]);
+  };
+  
+  this.test_verifyRemovingAnSongFromPlaylist = {
+    method: "waits.forJS",
+    params: {
+      js: function () { return !$("playlist_song_" + self.songs[0]) }
+    }
+  };
+  
+  this.test_playlistEditorSave = function () {
+    $("playlist_save").fireEvent("click");
+  };
+  
+  this.test_waitForPlaylistToBeSaved = {
+    method: "waits.forJS",
+    params: {
+      js: function () { return Playlist.findById(self.B.id).get("song_ids").contains(self.songs[1]) }
+    }
+  };
+
+  this.test_verifySave = function () {  
+    jum.assertEqualArrays([self.songs[2], self.songs[1]], Playlist.findById(self.B.id).get("song_ids"));
+  };
+};
addfile ./contrib/musicplayer/tests/test_SearchController.js
hunk ./contrib/musicplayer/tests/test_SearchController.js 1
+var test_SearchController = new function () {
+  var Search = da.controller.Search,
+      self = this;
+  
+  this.setup = function () {
+    self._searches = 0;
+    self.results = {};
+    
+    Search.search("bang", ["Song"], {onComplete: function (results) {
+      self._searches++;
+      self.results.bang_song = results;
+    }});
+    Search.search("sunshine", ["Album"], {onComplete: function (results) {
+      self._searches++;
+      self.results.sunshine_album = results;
+    }});
+    Search.search("super", ["Artist"], {onComplete: function (results) {
+      self._searches++;
+      self.results.super_artist = results;
+    }});
+    Search.search("marina", ["Artist"], {onComplete: function (results) {
+      self._searches++;
+      self.results.marina_artist = results;
+    }});
+    
+    Search.search("super", ["Song", "Artist"], {onComplete: function (results) {
+      self._searches++;
+      self.results.super_song_artist = results;
+    }});
+    Search.search("sunshine", ["Artist", "Album"], {onComplete: function (results) {
+      self._searches++;
+      self.results.sunshine_artist_album = results;
+    }});
+    Search.search("bang", ["Album", "Artist"], {onComplete: function (results) {
+      self._searches++;
+      self.results.bang_album_artist = results;
+    }});
+    Search.search("super", ["Artist", "Song"], {onComplete: function (results) {
+      self._searches++;
+      self.results.super_artist_song = results;
+    }});
+    
+    Search.search("maps", ["Song", "Album", "Artist"], {onComplete: function (results) {
+      self._searches++;
+      self.results.maps_song_album_artist = results;
+    }});
+    Search.search("keane", ["Album", "Artist", "Song"], {onComplete: function (results) {
+      self._searches++;
+      self.results.keane_album_artist_song = results;
+    }});
+    Search.search("symmetry", ["Artist", "Song", "Album"], {onComplete: function (results) {
+      self._searches++;
+      self.results.symmetry_artist_song_album = results;
+    }});
+  };
+  
+  this.test_waitForResuls = {
+    method: "waits.forJS",
+    params: {js: function () { return self._searches === 11 }}
+  };
+
+  this.test_oneFilter = function () {
+    var r = self.results.bang_song;
+    jum.assertEquals("Search for 'bang' should result with only one song",
+      1, r.length
+    );
+    jum.assertEquals("Found song should have been 'Hey Big Bang'", 
+      "Hey Big Bang", r[0].key
+    );
+    
+    r = self.results.sunshine_album;
+    jum.assertEquals("Search for 'sunshine' should result with only one song",
+      1, r.length
+    );
+    jum.assertEquals("Found song should have been 'Maps'",
+      "Maps", r[0].key
+    );
+    
+    r = self.results.super_artist;
+    jum.assertEquals("Search for 'super' should result with two songs",
+      2, r.length
+    );
+    // search results are sorted by song's title
+    jum.assertEquals("First song should be 'Persona'",
+      "Persona", r[0].key
+    );
+    jum.assertEquals("Second song shuold be 'Hey Big Bang'",
+      "Hey Big Bang", r[1].key
+    );
+    
+    r = self.results.marina_artist;
+    jum.assertEquals("There should be no results for non-existing artist",
+      0, r.length
+    );
+  };
+  
+  this.test_twoFilters = function () {
+    var r = self.results.sunshine_artist_album;
+    jum.assertEquals("Search for 'sunshine' with 'Artist' and 'Album' filters should give one result",
+      1, r.length
+    );
+    jum.assertEquals("The result should be 'Maps'",
+      "Maps", r[0].key
+    );
+    
+    r = self.results.bang_album_artist;
+    jum.assertEquals("Search for 'bang' with 'Artist' and 'Album' filters should give no results",
+      0, r.length
+    );
+  };
+  
+  this.test_reversedFilterNames = function () {
+    var r = self.results.super_song_artist;
+    jum.assertEquals("Search for 'super' with 'Song' and 'Artist' filters should give two songs",
+      2, r.length
+    );
+    jum.assertEquals("The first song should be 'Persona'",
+      "Persona", r[0].key
+    );
+    jum.assertEquals("The scond song should be 'Hey Big Bang'",
+      "Hey Big Bang", r[1].key
+    );
+    
+    r = self.results.super_artist_song;
+    jum.assertEquals("Search for 'super' with 'Song' and 'Artist' filters should give two songs",
+      2, r.length
+    );
+    jum.assertEquals("The first song should be 'Persona'",
+      "Persona", r[0].key
+    );
+    jum.assertEquals("The scond song should be 'Hey Big Bang'",
+      "Hey Big Bang", r[1].key
+    );
+  };
+  
+  this.test_threeFilters = function () {
+    var r = self.results.maps_song_album_artist;
+    jum.assertEquals("Search for 'maps' with 'Song', 'Album' and 'Artist' filters should give one result",
+      1, r.length
+    );
+    jum.assertEquals("The first song should be 'Maps'",
+      "Maps", r[0].key
+    );
+    
+    r = self.results.keane_album_artist_song;
+    jum.assertEquals("Search for 'keane' with 'Album', 'Artist' and 'Song' filters should give one result",
+      1, r.length
+    );
+    jum.assertEquals("The first song should be 'Maps'",
+      "Maps", r[0].key
+    );
+    
+    r = self.results.symmetry_artist_song_album;
+    jum.assertEquals("Search for 'symmetry' with 'Artist', 'Song' and 'Album' filters shoudl give no results",
+      0, r.length
+    );
+  };
+  
+  this.teardown = function () {
+    $("search_dialog").parentNode.parentNode.hide();
+  }
+};
hunk ./setup.py 141
     # Mock - Mocking and Testing Library
     # http://www.voidspace.org.uk/python/mock/
     "mock",
+    # Windmill - Testing framework for web apps, see #1001
+    # http://getwindmill.com/, http://github.com/windmill/
+    "windmill",
     ]
 
 class ShowSupportLib(Command):
hunk ./src/allmydata/test/test_musicplayer.py 69
   def _set_up_tree(self):
     self.settings['JAVASCRIPT_TEST_DIR'] = '../contrib/musicplayer/tests'
     self.settings['SCRIPT_APPEND_ONLY'] = True
-    
     self.browser_debugging = True
hunk ./src/allmydata/test/test_musicplayer.py 70
+    
     self.test_url = 'static/musicplayer/index_devel.html'
     
     shutil.copytree('../contrib/musicplayer/src', self.public_html_path + '/musicplayer')
hunk ./src/allmydata/test/test_musicplayer.py 108
 
     return d
 
-#class ChromeTest(MusicPlayerJSTest, tilting.JSTestsMixin, tilting.Chrome):
-#  pass
-
-class FirefoxTest(MusicPlayerJSTest, tilting.JSTestsMixin, tilting.Firefox):
+class ChromeTest(MusicPlayerJSTest, tilting.JSTestsMixin, tilting.Chrome):
   pass
 
hunk ./src/allmydata/test/test_musicplayer.py 111
+#class FirefoxTest(MusicPlayerJSTest, tilting.JSTestsMixin, tilting.Firefox):
+#  pass
+
hunk ./src/allmydata/test/tilting.py 34
     return d
   
   def _set_up_windmill(self):
-    self.browser_debugging = False 
+    self.browser_debugging = False
     self.browser_name = 'firefox'
     self.test_url = '/'
     self._js_test_details = []
}

Context:

[added-songcontext-and-services
josip.lisec@gmail.com**20100731231316
 Ignore-this: e8cd467b7d5681d1b9fbf9decb8b1f4b
 * Added da.controller.SongContext with default contexts:
   * 'Artist' - shows basic information about the artist
     the currently playing song,
   * 'Recommendations' - shows similar artists and songs,
   * 'Music Videos' - presents search results from YouTube
     of currently playing song.
 * Added da.service.* APIs which are used by contexts above
   * da.service.lastFm - interface to the Last.fm services
   * da.service.artistInfo
   * da.service.recommendations
   * da.service.musicVideo
 * UTF-8 related fixes to ID3v2 parser
] 
[updated-docs
josip.lisec@gmail.com**20100731231211
 Ignore-this: cbfb98d6ebeed2f2826250eb43d912ff
 * Added NOTES file with instructions for running the tests.
 * Fixed typos in INSTALL
] 
[add-player-controls
josiplisec@gmail.com**20100728131919
 Ignore-this: 56f8d094357df285a679a04bf536c582
 * Added player controls (previos/play/next) with tests.
 * Made other, smaller, improvements to da.ui.NavigationColumn (smarter re-rendering)
 * Limited both scanner and indexer workers to allow only one request to Tahoe-LAFS,
   thus making network I/O almoast synchronous, mainly due to the fact that
   Tahoe never completes requests under high load.
 
] 
[add-controller-tests
josip.lisec@gmail.com**20100725094652
 Ignore-this: 506444f1ed082b7fd7caca82c1a2129f
 Added tests for:
   * da.ui.Dialog
   * da.controller.CollectionScanner
   * da.controller.Settings
] 
[player-interface
josip.lisec@gmail.com**20100719121357
 Ignore-this: b7287f386bcbfeb6e59b8686da0ec65c
  * Fixed bugs in (Segmented)ProgressBar
  * Added basic player controls
  * Added album cover fetcing via Last.fm
  * Reorganised the way external libraries are being imported
  * Fixed tests
] 
[add-progress-bars
josip.lisec@gmail.com**20100713181106
 Ignore-this: b96a74ab38924967a55383f75f888439
 Added da.ui.ProgressBar and da.ui.SegmentedProgressBar classes,
 the latter one will be used mainly for visualizing progress of 
 currently playing song and load percentage.
] 
[add-navigation-and-settings-tests
josip.lisec@gmail.com**20100712142621
 Ignore-this: 559424eabbd88c496d69d076f2fcd5de
 Added tests for da.controller.Navigation, da.controller.Settings and
 da.controller.CollectionScanner.
] 
[add-music-players-full-deps
josip.lisec@gmail.com**20100710190714
 Ignore-this: 59d7b3890a1f9349bc8ac511af05b2b8
] 
[add-music-players-core-deps
josip.lisec@gmail.com**20100710185908
 Ignore-this: 58f5546ff75501f77d6b346ae99eebec
] 
[add-music-player
josip.lisec@gmail.com**20100710185704
 Ignore-this: c29dc0709640abd2e33cfd119b2681f
] 
[misc/build_helpers/run-with-pythonpath.py: fix stale comment, and remove 'trial' example that is not the right way to run trial.
david-sarah@jacaranda.org**20100726225729
 Ignore-this: a61f55557ad69a1633bfb2b8172cce97
] 
[docs/specifications/dirnodes.txt: 'mesh'->'grid'.
david-sarah@jacaranda.org**20100723061616
 Ignore-this: 887bcf921ef00afba8e05e9239035bca
] 
[docs/specifications/dirnodes.txt: bring layer terminology up-to-date with architecture.txt, and a few other updates (e.g. note that the MAC is no longer verified, and that URIs can be unknown). Also 'Tahoe'->'Tahoe-LAFS'.
david-sarah@jacaranda.org**20100723054703
 Ignore-this: f3b98183e7d0a0f391225b8b93ac6c37
] 
[docs: use current cap to Zooko's wiki page in example text
zooko@zooko.com**20100721010543
 Ignore-this: 4f36f36758f9fdbaf9eb73eac23b6652
 fixes #1134
] 
[__init__.py: silence DeprecationWarning about BaseException.message globally. fixes #1129
david-sarah@jacaranda.org**20100720011939
 Ignore-this: 38808986ba79cb2786b010504a22f89
] 
[test_runner: test that 'tahoe --version' outputs no noise (e.g. DeprecationWarnings).
david-sarah@jacaranda.org**20100720011345
 Ignore-this: dd358b7b2e5d57282cbe133e8069702e
] 
[TAG allmydata-tahoe-1.7.1
zooko@zooko.com**20100719131352
 Ignore-this: 6942056548433dc653a746703819ad8c
] 
Patch bundle hash:
e420382ab010a68698dc21731d531d378fa42622