* nalbum : new fade out/in feature for album transition

[mpd-goodies.git] / lib / startop.py

diff --git a/lib/startop.py b/lib/startop.py
index 0ede89a20d0b2900564626796903ba459973763d..945e5bb59cb77385cd5422516a34f53c24552600 100644 (file)
--- a/lib/startop.py
+++ b/lib/startop.py
@@ -51,12 +51,14 @@ class StartOpt(object):
     """
     """
 
-    def __init__(self, script_info, options):#{{{
+    def __init__(self, script_info, child_options):#{{{
         self.parser = None
         self.cli_options = dict({})
         self.cli_args = dict({})
         self.info = dict(script_info)
-        self.options = list(options + OPTS)
+        # options allows to add new cli options within child objects calling
+        # parent __init__()
+        self.options = list(child_options + OPTS)
         self.main()#}}}
 
     def declare_opts(self):#{{{
@@ -66,8 +68,12 @@ class StartOpt(object):
         version = self.info.get('version')
         prog = self.info.get('prog_name')
         des = self.info.get('description')
+        if 'usage' in self.info:
+            usage = self.info.get('usage')
+        else:
+            usage = USAGE
         self.parser = OptionParser(version=version,
-                                   usage=USAGE,
+                                   usage=usage,
                                    prog=prog,
                                    description=des)
         con_id, passwd = get_mpd_environ()