Commit af967f85 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - and fix the previous [22886]

parent dc2fe858
...@@ -267,6 +267,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -267,6 +267,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Input and Codecs Panel Implementation */ /* Input and Codecs Panel Implementation */
START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
inputDevice = ui.DVDDevice;
/* Disk Devices */ /* Disk Devices */
{ {
ui.DVDDevice->setToolTip( qtr( "If this propriety is blank, then you have\n" ui.DVDDevice->setToolTip( qtr( "If this propriety is blank, then you have\n"
...@@ -401,7 +402,7 @@ void SPrefsPanel::apply() ...@@ -401,7 +402,7 @@ void SPrefsPanel::apply()
} }
/* Devices */ /* Devices */
//FIXME is it qta or qtu ???? //FIXME is it qta or qtu ????
char *psz_devicepath = qtu( ui.DVDDevice->Text() ); char *psz_devicepath = qtu( inputDevice->text() );
if( !EMPTY_STR( psz_devicepath ) ) if( !EMPTY_STR( psz_devicepath ) )
{ {
config_PutPsz( p_intf, "dvd", psz_devicepath ); config_PutPsz( p_intf, "dvd", psz_devicepath );
......
...@@ -41,6 +41,8 @@ enum { ...@@ -41,6 +41,8 @@ enum {
class ConfigControl; class ConfigControl;
class QComboBox; class QComboBox;
class QLineEdit;
class SPrefsCatList : public QWidget class SPrefsCatList : public QWidget
{ {
Q_OBJECT; Q_OBJECT;
...@@ -72,6 +74,7 @@ private: ...@@ -72,6 +74,7 @@ private:
QWidget *directx_options; QWidget *directx_options;
QWidget *file_options; QWidget *file_options;
QComboBox *audioOutput; QComboBox *audioOutput;
QLineEdit *inputDevice;
/* Display only the options for the selected audio output */ /* Display only the options for the selected audio output */
private slots: private slots:
......
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