[vlc-devel] commit: Avoid comments within comments ( Rémi Denis-Courmont )

git version control git at videolan.org
Fri Jun 20 23:54:41 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jun 21 00:53:51 2008 +0300| [74ef05f32740e93237f8ce8fd1a90641cb4aa1e6]

Avoid comments within comments

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

 modules/gui/qt4/main_interface.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 2da99b0..c3a33c2 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -676,19 +676,19 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
             bgWasVisible = true;
             emit askBgWidgetToToggle();
         }
-
-        /*if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
+#if 0
+        if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
         {
             videoWidget->widgetSize = QSize( *pi_width, *pi_height );
         }
         else /* Background widget available, use its size */
-        /*{
+        {
             /* Ok, our visualizations are bad, so don't do this for the moment
              * use the requested size anyway */
             // videoWidget->widgetSize = bgWidget->widgeTSize;
-          /*  videoWidget->widgetSize = QSize( *pi_width, *pi_height );
-        }*/
-
+            videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+        }
+#endif
         videoIsActive = true;
 
         emit askVideoToResize( *pi_width, *pi_height );




More information about the vlc-devel mailing list