Changeset 354abbea2151c4718f1ad2a645afff4799252588

Timestamp:

25/08/08 10:06:48 (3 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1219651608 -0700

git-parent:

[5ca01aec25d467af7197eda4a368a341d41a3764]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1219651608 -0700

Message:

Don't allocate and create the Capture Open Panel in open.

The Capture panel is sensibly slower than all the other ones and way less used by most people. Therefore, don't build it (especially for windows) unless you need it. Better for speed and memory.

Files:

• modules/gui/qt4/components/open_panels.cpp (modified) (1 diff)
• modules/gui/qt4/components/open_panels.hpp (modified) (2 diffs)
• modules/gui/qt4/dialogs/open.cpp (modified) (3 diffs)
• modules/gui/qt4/dialogs/open.hpp (modified) (1 diff)

modules/gui/qt4/components/open_panels.cpp

@@ -558 +558 @@
-                                OpenPanel( _parent, _p_intf )
-{
+    isInitialized = false;
+}
+
+void CaptureOpenPanel::initialize()
+{
+    if( isInitialized ) return;
+
+    msg_Dbg( p_intf, "Initialization of Capture device panel" );
+    isInitialized = true;
+
-    ui.setupUi( this );
-

modules/gui/qt4/components/open_panels.hpp

@@ -180 +180 @@
-private:
-    Ui::OpenCapture ui;
+    bool isInitialized;
+
-    QString advMRL;
-    QDialog *adv;
@@ -204 +206 @@
-public slots:
-    virtual void updateMRL();
+    void initialize();
-private slots:
-    void updateButtons();

modules/gui/qt4/dialogs/open.cpp

@@ -129 +129 @@
-
-    /* Force MRL update on tab change */
-
+ int 
-
-    CONNECT( fileOpenPanel, mrlUpdated( QString ), this, updateMRL( QString ) );
@@ -209 +209 @@
-void OpenDialog::showTab( int i_tab )
-{
+    if( i_tab == OPEN_CAPTURE_TAB ) captureOpenPanel->initialize();
-    ui.Tab->setCurrentIndex( i_tab );
-    show();
@@ -214 +215 @@
-
-/* Function called on signal currentChanged triggered */
-
-
+
+
+
+
-    if( ui.Tab->currentWidget() != NULL )
-        ( dynamic_cast<OpenPanel *>( ui.Tab->currentWidget() ) )->updateMRL();

modules/gui/qt4/dialogs/open.hpp

@@ -115 +115 @@
-    void updateMRL();
-    void newCachingMethod( QString );
-
+ int 
-    void browseInputSlave();
-};