From 644c87128b1fef5f5b6568b54d176a192d72eca0 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 8 May 2011 01:41:30 +0200 Subject: [PATCH] Naive workaround for #95 --- mopidy/core.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mopidy/core.py b/mopidy/core.py index d0f2a668..cd49dfa1 100644 --- a/mopidy/core.py +++ b/mopidy/core.py @@ -1,7 +1,17 @@ import logging import optparse +import sys import time +# Extract any non-GStreamer arguments, and leave the GStreamer arguments for +# processing by GStreamer. This needs to be done before GStreamer is imported, +# so that GStreamer doesn't hijack e.g. ``--help``. +# NOTE This naive fix does not support values like ``bar`` in +# ``--gst-foo bar``. Use equals to pass values, like ``--gst-foo=bar``. +gstreamer_args = [arg for arg in sys.argv[1:] if arg.startswith('--gst')] +mopidy_args = [arg for arg in sys.argv[1:] if not arg.startswith('--gst')] +sys.argv[1:] = gstreamer_args + from pykka.registry import ActorRegistry from mopidy import get_version, settings, OptionalDependencyError @@ -45,7 +55,7 @@ def parse_options(): parser.add_option('--list-settings', action='callback', callback=list_settings_optparse_callback, help='list current settings') - return parser.parse_args()[0] + return parser.parse_args(args=mopidy_args)[0] def setup_settings(): get_or_create_folder('~/.mopidy/')