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

[Qt] Remove access filters from Preferences.

Timeshift and record are automatic now.
parent 54b49f69
......@@ -383,17 +383,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#else
ui.systemCodecBox->hide();
#endif
/* Access Filters */
char* psz = config_GetPsz( p_intf, "access-filter" );
qs_filter = qfu( psz );
free( psz );
ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) );
ui.dumpBox->setChecked( qs_filter.contains( "dump" ) );
ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) );
optionWidgets.append( ui.dumpBox );
optionWidgets.append( ui.bandwidthBox );
optionWidgets.append( ui.timeshiftBox );
optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo );
......@@ -617,23 +606,6 @@ void SPrefsPanel::apply()
config_PutPsz( p_intf, "cd-audio", psz_devicepath );
}
/* Access filters */
#define saveBox( name, box ) {\
if( box->isChecked() ) { \
if( b_first ) { \
qs_filter.append( name ); \
b_first = false; \
} \
else qs_filter.append( ":" ).append( name ); \
} }
bool b_first = true;
qs_filter.clear();
saveBox( "dump", qobject_cast<QCheckBox *>(optionWidgets[dumpChB]) );
saveBox( "timeshift", qobject_cast<QCheckBox *>(optionWidgets[timeshiftChB]) );
saveBox( "bandwidth", qobject_cast<QCheckBox *>(optionWidgets[bandwidthChB] ) );
config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) );
#define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue )
#define CaC( name ) CaCi( name, 1 )
/* Caching */
......@@ -677,7 +649,7 @@ void SPrefsPanel::apply()
if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
config_PutPsz( p_intf, "intf", "skins2" );
if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
config_PutPsz( p_intf, "intf", "qt4" );
config_PutPsz( p_intf, "intf", "qt" );
break;
}
......
......@@ -72,7 +72,7 @@ enum {
audioOutCoB,
normalizerChB,
volLW };
enum { dumpChB, bandwidthChB, timeshiftChB, inputLE, cachingCoB };
enum { inputLE, cachingCoB };
enum { skinRB, qtRB };
class ConfigControl;
......
......@@ -175,36 +175,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>_("Access Filter")</string>
</property>
<layout class="QHBoxLayout" >
<item>
<widget class="QCheckBox" name="timeshiftBox" >
<property name="text" >
<string>_("Timeshift")</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="dumpBox" >
<property name="text" >
<string>_("Dump")</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="bandwidthBox" >
<property name="text" >
<string>_("Bandwidth limiter")</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<tabstops>
......@@ -217,9 +187,6 @@
<tabstop>AviRepair</tabstop>
<tabstop>RTSP_TCPBox</tabstop>
<tabstop>systemCodecBox</tabstop>
<tabstop>timeshiftBox</tabstop>
<tabstop>dumpBox</tabstop>
<tabstop>bandwidthBox</tabstop>
</tabstops>
<resources/>
<connections/>
......
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