[Spice-devel,v2] Xspice: Don't set defaults for the options.

Submitted by Francois Gouget on Aug. 31, 2015, 1:26 p.m.

Details

Message ID alpine.DEB.2.20.1508311520550.31956@amboise
State New
Headers show

Not browsing as part of any series.

Commit Message

Francois Gouget Aug. 31, 2015, 1:26 p.m.
Otherwise they override Spice server's real builtin defaults, the Xorg configuration file settings, and even the XSPICE_XXX environment variables.
For instance, without this patch calling Xspice _without_ the '--streaming-video' option forces this setting to 'filter', overriding the XSPICE_STREAMING_VIDEO environment variable and the SpiceStreamingVideo spiceqxl.xorg.conf setting.
Note that this does not change the option defaults (the Xspice ones matched the spice server ones).

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
---

Updated the commit message.

 scripts/Xspice | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/scripts/Xspice b/scripts/Xspice
index 33085f5..88f8a1d 100755
--- a/scripts/Xspice
+++ b/scripts/Xspice
@@ -45,7 +45,7 @@  else:
     cgdb = None
 
 def add_boolean(flag, *args, **kw):
-    parser.add_argument(flag, action='store_const', const='1', default='0',
+    parser.add_argument(flag, action='store_const', const='1',
                         *args, **kw)
 
 wan_compression_options = ['auto', 'never', 'always']
@@ -65,7 +65,7 @@  parser.add_argument('--deferred-fps', type=int, help='If given, render to a buff
 parser.add_argument('--tls-port', type=int, help='spice tls port', default=0)
 add_boolean('--disable-ticketing', help="do not require a client password")
 add_boolean('--sasl', help="enable sasl")
-parser.add_argument('--x509-dir', help="x509 directory for tls", default='.')
+parser.add_argument('--x509-dir', help="x509 directory for tls")
 parser.add_argument('--cacert-file', help="ca certificate file for tls")
 parser.add_argument('--x509-cert-file', help="server certificate file for tls")
 parser.add_argument('--x509-key-file', help="server key file for tls")
@@ -76,16 +76,16 @@  parser.add_argument('--password', help="set password required to connect to serv
 parser.add_argument('--image-compression',
                     choices = ['off', 'auto_glz', 'auto_lz', 'quic',
                                'glz', 'lz'],
-                    default='auto_glz', help='auto_glz by default')
+                    help='auto_glz by default')
 parser.add_argument('--jpeg-wan-compression',
                     choices=wan_compression_options,
-                    default='auto', help='auto by default')
+                    help='auto by default')
 parser.add_argument('--zlib-glz-wan-compression',
                     choices=wan_compression_options,
-                    default='auto', help='auto by default')
+                    help='auto by default')
 # TODO - sound support
 parser.add_argument('--streaming-video', choices=['off', 'all', 'filter'],
-                    default='filter', help='filter by default')
+                    help='filter by default')
 parser.add_argument('--video-codecs', help="Sets a semicolon-separated list of preferred video codecs to use. Each takes the form encoder:codec, with spice:mjpeg being the default and other options being provided by gstreamer for the mjpeg, vp8 and h264 codecs.")
 add_boolean('--ipv4-only')
 add_boolean('--ipv6-only')
@@ -97,7 +97,7 @@  parser.add_argument('--vdagent-exec', help='path to spice-vdagent (used with --v
 parser.add_argument('--vdagent-no-launch', default=True, action='store_false', dest='vdagent_launch', help='do not launch vdagent & vdagentd, used for debugging or if some external script wants to take care of that')
 parser.add_argument('--vdagent-uid', default=str(os.getuid()), help='set vdagent user id. changing it makes sense only in conjunction with --vdagent-no-launch')
 parser.add_argument('--vdagent-gid', default=str(os.getgid()), help='set vdagent group id. changing it makes sense only in conjunction with --vdagent-no-launch')
-parser.add_argument('--audio-fifo-dir', default='', help="set fifo directory for playback audio. designed to work with PulseAudio's module-pipe-sink")
+parser.add_argument('--audio-fifo-dir', help="set fifo directory for playback audio. designed to work with PulseAudio's module-pipe-sink")
 
 #TODO
 #Option "SpiceAddr" ""
@@ -106,7 +106,7 @@  parser.add_argument('--audio-fifo-dir', default='', help="set fifo directory for
 #Option "EnableFallbackCache" "True"
 #Option "EnableSurfaces" "True"
 #Option "NumHeads" "4"
-#parser.add_argument('--playback-compression', choices=['0', '1'], default='1', help='enabled by default')
+#parser.add_argument('--playback-compression', choices=['0', '1'], help='enabled by default')
 #Option "SpiceDisableCopyPaste" "False"
 
 if cgdb:

Comments

I've pushed this patch, thanks!

On Mon, Aug 31, 2015 at 03:26:43PM +0200, Francois Gouget wrote:
> Otherwise they override Spice server's real builtin defaults, the Xorg configuration file settings, and even the XSPICE_XXX environment variables.
> For instance, without this patch calling Xspice _without_ the '--streaming-video' option forces this setting to 'filter', overriding the XSPICE_STREAMING_VIDEO environment variable and the SpiceStreamingVideo spiceqxl.xorg.conf setting.
> Note that this does not change the option defaults (the Xspice ones matched the spice server ones).
> 
> Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
> ---
> 
> Updated the commit message.
> 
>  scripts/Xspice | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/scripts/Xspice b/scripts/Xspice
> index 33085f5..88f8a1d 100755
> --- a/scripts/Xspice
> +++ b/scripts/Xspice
> @@ -45,7 +45,7 @@ else:
>      cgdb = None
>  
>  def add_boolean(flag, *args, **kw):
> -    parser.add_argument(flag, action='store_const', const='1', default='0',
> +    parser.add_argument(flag, action='store_const', const='1',
>                          *args, **kw)
>  
>  wan_compression_options = ['auto', 'never', 'always']
> @@ -65,7 +65,7 @@ parser.add_argument('--deferred-fps', type=int, help='If given, render to a buff
>  parser.add_argument('--tls-port', type=int, help='spice tls port', default=0)
>  add_boolean('--disable-ticketing', help="do not require a client password")
>  add_boolean('--sasl', help="enable sasl")
> -parser.add_argument('--x509-dir', help="x509 directory for tls", default='.')
> +parser.add_argument('--x509-dir', help="x509 directory for tls")
>  parser.add_argument('--cacert-file', help="ca certificate file for tls")
>  parser.add_argument('--x509-cert-file', help="server certificate file for tls")
>  parser.add_argument('--x509-key-file', help="server key file for tls")
> @@ -76,16 +76,16 @@ parser.add_argument('--password', help="set password required to connect to serv
>  parser.add_argument('--image-compression',
>                      choices = ['off', 'auto_glz', 'auto_lz', 'quic',
>                                 'glz', 'lz'],
> -                    default='auto_glz', help='auto_glz by default')
> +                    help='auto_glz by default')
>  parser.add_argument('--jpeg-wan-compression',
>                      choices=wan_compression_options,
> -                    default='auto', help='auto by default')
> +                    help='auto by default')
>  parser.add_argument('--zlib-glz-wan-compression',
>                      choices=wan_compression_options,
> -                    default='auto', help='auto by default')
> +                    help='auto by default')
>  # TODO - sound support
>  parser.add_argument('--streaming-video', choices=['off', 'all', 'filter'],
> -                    default='filter', help='filter by default')
> +                    help='filter by default')
>  parser.add_argument('--video-codecs', help="Sets a semicolon-separated list of preferred video codecs to use. Each takes the form encoder:codec, with spice:mjpeg being the default and other options being provided by gstreamer for the mjpeg, vp8 and h264 codecs.")
>  add_boolean('--ipv4-only')
>  add_boolean('--ipv6-only')
> @@ -97,7 +97,7 @@ parser.add_argument('--vdagent-exec', help='path to spice-vdagent (used with --v
>  parser.add_argument('--vdagent-no-launch', default=True, action='store_false', dest='vdagent_launch', help='do not launch vdagent & vdagentd, used for debugging or if some external script wants to take care of that')
>  parser.add_argument('--vdagent-uid', default=str(os.getuid()), help='set vdagent user id. changing it makes sense only in conjunction with --vdagent-no-launch')
>  parser.add_argument('--vdagent-gid', default=str(os.getgid()), help='set vdagent group id. changing it makes sense only in conjunction with --vdagent-no-launch')
> -parser.add_argument('--audio-fifo-dir', default='', help="set fifo directory for playback audio. designed to work with PulseAudio's module-pipe-sink")
> +parser.add_argument('--audio-fifo-dir', help="set fifo directory for playback audio. designed to work with PulseAudio's module-pipe-sink")
>  
>  #TODO
>  #Option "SpiceAddr" ""
> @@ -106,7 +106,7 @@ parser.add_argument('--audio-fifo-dir', default='', help="set fifo directory for
>  #Option "EnableFallbackCache" "True"
>  #Option "EnableSurfaces" "True"
>  #Option "NumHeads" "4"
> -#parser.add_argument('--playback-compression', choices=['0', '1'], default='1', help='enabled by default')
> +#parser.add_argument('--playback-compression', choices=['0', '1'], help='enabled by default')
>  #Option "SpiceDisableCopyPaste" "False"
>  
>  if cgdb:
> -- 
> 2.5.0
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel