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

Qt4: screen-fps is a float, not an integer...

...so allow decimal values.
parent f47bbde3
...@@ -1012,13 +1012,16 @@ void CaptureOpenPanel::initialize() ...@@ -1012,13 +1012,16 @@ void CaptureOpenPanel::initialize()
qtr( "Desired frame rate for the capture." ) ); qtr( "Desired frame rate for the capture." ) );
screenPropLayout->addWidget( screenFPSLabel, 0, 0 ); screenPropLayout->addWidget( screenFPSLabel, 0, 0 );
screenFPS = new QSpinBox; screenFPS = new QDoubleSpinBox;
screenFPS->setValue( 1 ); screenFPS->setValue( 1. );
screenFPS->setRange( .01, 100. );
screenFPS->setAlignment( Qt::AlignRight ); screenFPS->setAlignment( Qt::AlignRight );
/* xgettext: frames per second */
screenFPS->setSuffix( qtr( " f/s" ) );
screenPropLayout->addWidget( screenFPS, 0, 1 ); screenPropLayout->addWidget( screenFPS, 0, 1 );
/* Screen connect */ /* Screen connect */
CuMRL( screenFPS, valueChanged( int ) ); CuMRL( screenFPS, valueChanged( double ) );
/* General connects */ /* General connects */
CONNECT( ui.deviceCombo, activated( int ) , CONNECT( ui.deviceCombo, activated( int ) ,
...@@ -1136,7 +1139,7 @@ void CaptureOpenPanel::updateMRL() ...@@ -1136,7 +1139,7 @@ void CaptureOpenPanel::updateMRL()
#endif #endif
case SCREEN_DEVICE: case SCREEN_DEVICE:
fileList << "screen://"; fileList << "screen://";
mrl = " :screen-fps=" + QString::number( screenFPS->value() ); mrl = " :screen-fps=" + QString::number( screenFPS->value(), 'f' );
emit methodChanged( "screen-caching" ); emit methodChanged( "screen-caching" );
updateButtons(); updateButtons();
break; break;
......
...@@ -198,7 +198,7 @@ private: ...@@ -198,7 +198,7 @@ private:
QCheckBox *jackPace, *jackConnect; QCheckBox *jackPace, *jackConnect;
QLineEdit *jackPortsSelected; QLineEdit *jackPortsSelected;
#endif #endif
QSpinBox *screenFPS; QDoubleSpinBox *screenFPS;
public slots: public slots:
virtual void updateMRL(); virtual void updateMRL();
......
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