--- src/gmixer.old	2010-05-25 14:50:54.000000000 +0400
+++ src/gmixer	2010-05-25 15:13:13.000000000 +0400
@@ -110,7 +110,6 @@
 
 TIMEOUT_PROGRESS_POPUP=1000
 TRAY_SCROLL_STEP=5
-VOLKEYS_UPDATE_STEP=10
 
 locale.setlocale(locale.LC_ALL, '')
 gettext.bindtextdomain(APPNAME, I18NDIR)
@@ -577,9 +576,10 @@
     _gvolume_dic = {}
     _popup = None
     _timeout_tray_id = None
-    def __init__(self, systray_mode = False, custom_mixer_cmd = None, pixmap_mode = False):
+    def __init__(self, systray_mode = False, custom_mixer_cmd = None, pixmap_mode = False, volkeys_update_step = 10):
         gobject.GObject.__init__(self)
 
+        self._volkeys_update_step = volkeys_update_step
         self._custom_mixer_cmd_pid = None
         self._custom_mixer_cmd = custom_mixer_cmd
         if self._custom_mixer_cmd:
@@ -667,14 +667,14 @@
     def __on_raise_volume_cb(self, *args):
         track = self._get_master_track()
         values = list(self._current_mixer.get_volume(track))
-        values = [ min(val + VOLKEYS_UPDATE_STEP, track.max_volume) for val in values ]
+        values = [ min(val + self._volkeys_update_step, track.max_volume) for val in values ]
         self._current_mixer.set_volume(self._get_master_track(),tuple(values))
         self.__update_progress_popup()
 
     def __on_lower_volume_cb(self, *args):
         track = self._get_master_track()
         values = list(self._current_mixer.get_volume(track))
-        values = [ max(val - VOLKEYS_UPDATE_STEP, track.min_volume) for val in values ]
+        values = [ max(val - self._volkeys_update_step, track.min_volume) for val in values ]
         self._current_mixer.set_volume(self._get_master_track(),tuple(values))
         self.__update_progress_popup()
 
@@ -1139,11 +1139,12 @@
         d.destroy()
 
 if __name__ == "__main__":
-    usage = "usage: %prog [-d|--daemon] [-c|--custom-mixer-cmd]"
+    usage = "usage: %prog [-d|--daemon] [-c|--custom-mixer-cmd] [--volkeys-update-step=N]"
     optparser = OptionParser(usage=usage,version="%prog "+VERSION)
     optparser.add_option("-d","--daemon", action="store_true", dest="daemon", default=False)
     optparser.add_option("-n","--nopixmap", action="store_true", dest="pixmap", default=False)
     optparser.add_option("-c","--custom-mixer-cmd", action="store", dest="custom_mixer_cmd", default=None)
+    optparser.add_option("--volkeys-update-step", action="store", type="int", dest="volkeys_update_step", default=10)
     (options, args) = optparser.parse_args(sys.argv[1:])
 
     if options.daemon:
@@ -1165,5 +1166,5 @@
             if pid != 0:
                 os._exit(0)
 
-    GMixer(options.daemon, options.custom_mixer_cmd, options.pixmap)
+    GMixer(options.daemon, options.custom_mixer_cmd, options.pixmap, options.volkeys_update_step)
     gtk.main()