[MPlayer-users] Patch: gui and wid conflict (Was: Using -wid <id != 0> and gui=yes in config file)

[Koos Vriezen]

On Thu, 2 Jan 2003, Koos Vriezen wrote:

> Hi,
>
> The combination mplayer -wid and gui=yes doesn't play inside the window
> given by -wid, it runs the gui and own window instead.
>
> Isn't gui=yes obsoleted by gmplayer?

Because the gui=yes and using -wid for embedding in a browser conflicts, I
made this patch. It moves the cfg_read() after the commandline parsing and
disables the gui when there was a window id given.

--- mplayer.c.orig      Sat Jan  4 00:19:42 2003
+++ mplayer.c   Sat Jan  4 00:20:14 2003
@@ -645,16 +645,17 @@
     mp_input_register_options(mconfig);
     parse_cfgfiles(mconfig);

-#ifdef HAVE_NEW_GUI
-    if ( use_gui ) cfg_read();
-#endif
-
 #ifdef NEW_CONFIG
     playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
     if(playtree == NULL)
       exit(1);
 #else
     if(m_config_parse_command_line(mconfig, argc, argv) < 0) exit(1); // error parsing cmdline
+#endif
+
+#ifdef HAVE_NEW_GUI
+    if (use_gui && WinID) use_gui = 0;
+    if ( use_gui ) cfg_read();
 #endif

     playtree = play_tree_cleanup(playtree);

>
> Regards,
>
> Koos Vriezen
>
>