[vlc-commits] commit: Qt4: use putenv() before any thread is created ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 15 12:34:04 2010 +0300| [02e488310760a50050602a0722f9c6d8d0b0810b] | committer: Rémi Denis-Courmont 

Qt4: use putenv() before any thread is created

(cherry picked from commit 88e7248c43324b2f776cf54f4d90dc960a581756)

Conflicts:

	modules/gui/qt4/qt4.cpp

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=02e488310760a50050602a0722f9c6d8d0b0810b
---

 bin/vlc.c               |    4 ++++
 modules/gui/qt4/qt4.cpp |    1 -
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 8917ff4..2d44259 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -79,6 +79,10 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   endif
 #endif
 
+    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
+     * use the alpha channel for the embedded video window. */
+    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
+
     /* Synchronously intercepted POSIX signals.
      *
      * In a threaded program such as VLC, the only sane way to handle signals
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 2793f5e..319f01b 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -284,7 +284,6 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     XCloseDisplay( p_display );
-    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
 #endif
 
     /* Allocations of p_sys */