[vlc-commits] Qt: fix OSS simple prefs
Jean-Baptiste Kempf
git at videolan.org
Wed Aug 13 03:49:26 CEST 2014
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 13 03:42:29 2014 +0200| [334c42b9668efd987f1eb164eeee26d06f066454] | committer: Jean-Baptiste Kempf
Qt: fix OSS simple prefs
Close #11694
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=334c42b9668efd987f1eb164eeee26d06f066454
---
modules/gui/qt4/components/simple_preferences.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 1432f33..5cf8fc9 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -465,10 +465,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#define audioControl2( name) \
audioCommon( name ) \
+ QHBoxLayout * name ## hboxLayout = new QHBoxLayout; \
QLineEdit * name ## Device = new QLineEdit; \
name ## Label->setBuddy( name ## Device ); \
+ name ## hboxLayout->addWidget( name ## Device ); \
QPushButton * name ## Browse = new QPushButton( qtr( "Browse..." ) ); \
- outputAudioLayout->addWidget( name ## Device, outputAudioLayout->rowCount() - 1, 0, 1, -1, Qt::AlignLeft );
+ name ## hboxLayout->addWidget( name ## Browse ); \
+ outputAudioLayout->addLayout( name ## hboxLayout, outputAudioLayout->rowCount() - 1, 1, 1, 1, Qt::AlignLeft );
/* Build if necessary */
QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
@@ -506,7 +509,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
optionWidgets["ossL"] = OSSLabel;
optionWidgets["ossW"] = OSSDevice;
optionWidgets["ossB"] = OSSBrowse;
- CONFIG_GENERIC_FILE( "oss-audio-device" , File, NULL, OSSDevice,
+ CONFIG_GENERIC_FILE( "oss-audio-device" , File, OSSLabel, OSSDevice,
OSSBrowse );
}
#endif
More information about the vlc-commits
mailing list