[vlc-devel] commit: Oops, remove dummy code ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Oct 20 21:26:07 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Oct 20 22:25:58 2008 +0300| [e925457d4638486c6f841a0db3fee9af5de5e005] | committer: Rémi Denis-Courmont 

Oops, remove dummy code

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

 modules/gui/qt4/qt4.cpp |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 193a3ba..d830fa1 100755
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -455,9 +455,8 @@ static void *Thread( void *obj )
         /* Destroy first the main interface because it is connected to some
            slots in the MainInputManager */
         /* Destroy under the iface lock to sync vout QPointer */
-    }
-    msleep( CLOCK_FREQ );
         delete p_mi;
+    }
 
     /* Destroy all remaining windows,
        because some are connected to some slots
@@ -519,9 +518,7 @@ static int WindowOpen (vlc_object_t *obj)
     vout_window_t *wnd = (vout_window_t *)obj;
     QPointer<MainInterface> *miP;
 
-#if 1
     if (config_GetInt (obj, "embedded-video") <= 0)
-#endif
         return VLC_EGENERIC;
 
     intf_thread_t *intf = (intf_thread_t *)




More information about the vlc-devel mailing list