Commit 7a4c7155 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

Pointed-out-by: default avatarRafaël Carré <funman@videolan.org>
(cherry picked from commit 500c1902)
parent 08d0d80f
...@@ -338,6 +338,18 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -338,6 +338,18 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
ui.deviceCombo->setToolTip( qtr(I_DEVICE_TOOLTIP) ); ui.deviceCombo->setToolTip( qtr(I_DEVICE_TOOLTIP) );
ui.deviceCombo->setInsertPolicy( QComboBox::InsertAtTop ); 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 */ /* CONNECTs */
BUTTONACT( ui.dvdRadioButton, updateButtons() ); BUTTONACT( ui.dvdRadioButton, updateButtons() );
BUTTONACT( ui.bdRadioButton, updateButtons() ); BUTTONACT( ui.bdRadioButton, updateButtons() );
...@@ -388,19 +400,7 @@ void DiscOpenPanel::onFocus() ...@@ -388,19 +400,7 @@ void DiscOpenPanel::onFocus()
} }
SetErrorMode(oldMode); 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 #endif
} }
DiscOpenPanel::~DiscOpenPanel() DiscOpenPanel::~DiscOpenPanel()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment