[vlc-commits] Qt4: add Linux discs choices once, not once per focus

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb  8 20:42:34 2012 +0200| [7a4c715522d0237ab0869212d5ac97ae1b0019ec] | committer: Rémi Denis-Courmont

Qt4: add Linux discs choices once, not once per focus

Pointed-out-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 500c1902bb2e2885e7aaca1f45a59ec26fb389e4)

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

 modules/gui/qt4/components/open_panels.cpp |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 8d085be..dc1f9e6 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -338,6 +338,18 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     ui.deviceCombo->setToolTip( qtr(I_DEVICE_TOOLTIP) );
     ui.deviceCombo->setInsertPolicy( QComboBox::InsertAtTop );
 
+#ifndef WIN32
+    char const * const ppsz_discdevices[] = {
+        "sr*",
+        "sg*",
+        "scd*",
+        "dvd*",
+        "cd*"
+    };
+    QComboBox *discCombo = ui.deviceCombo; /* avoid namespacing in macro */
+    POPULATE_WITH_DEVS( ppsz_discdevices, discCombo );
+#endif
+
     /* CONNECTs */
     BUTTONACT( ui.dvdRadioButton,     updateButtons() );
     BUTTONACT( ui.bdRadioButton,      updateButtons() );
@@ -388,19 +400,7 @@ void DiscOpenPanel::onFocus()
         }
         SetErrorMode(oldMode);
     }
-#else /* Linux */
-    char const * const ppsz_discdevices[] = {
-        "sr*",
-        "sg*",
-        "scd*",
-        "dvd*",
-        "cd*"
-    };
-    QComboBox *discCombo = ui.deviceCombo; /* avoid namespacing in macro */
-    POPULATE_WITH_DEVS( ppsz_discdevices, discCombo );
 #endif
-
-
 }
 
 DiscOpenPanel::~DiscOpenPanel()