updateAudioOptions( int ) );
audioOutput = ui.outputModule;
- //FIXME: use modules_Exists
+ //TODO: use modules_Exists
#ifndef WIN32
CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice );
CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
delete psz_vcddiscpath;
}
- CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
- CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
-
+ CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
+ CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
+
/* Caching */
/* CONFIG_GENERIC( );*/ //FIXME
- CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
- CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
- CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
+ CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
+ CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
+ CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
#ifdef WIN32
- CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
+ CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
#else
- ui.systemCodecBox->hide();
-#endif
- CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox );
- CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox );
-// CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record
+ ui.systemCodecBox->hide();
+#endif
+ /* Access Filters */
+ qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) );
+ ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) );
+ ui.dumpBox->setChecked( qs_filter.contains( "dump" ) );
+ ui.recordBox->setChecked( qs_filter.contains( "record" ) );
+ ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) );
+ timeshiftBox = ui.timeshiftBox;
+ recordBox = ui.recordBox;
+ dumpBox = ui.dumpBox;
+ bandwidthBox = ui.bandwidthBox;
END_SPREFS_CAT;
/* Interface Panel */
}
skinInterfaceButton = ui.skins;
qtInterfaceButton = ui.qt4;
+ delete psz_intf;
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
void SPrefsPanel::apply()
{
msg_Dbg( p_intf, "Trying to save the %i simple panel", number );
-
+
/* Generic save for ever panel */
QList<ConfigControl *>::Iterator i;
for( i = controls.begin() ; i != controls.end() ; i++ )
config_PutPsz( p_intf, "vcd", psz_devicepath );
config_PutPsz( p_intf, "cd-audio", psz_devicepath );
}
- }
+
+ bool b_first = true;
+#define saveBox( name, box ) {\
+ if( box->isChecked() ) { \
+ if( b_first ) { \
+ qs_filter.append( name ); \
+ b_first = false; \
+ } \
+ else qs_filter.append( ":" ).append( name ); \
+ } }
+ saveBox( "record", recordBox );
+ saveBox( "dump", dumpBox );
+ saveBox( "timeshift", timeshiftBox );
+ saveBox( "bandwidth", bandwidthBox );
+ config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) );
+ }
+
/* Interfaces */
if( number == SPrefsInterface )
{
if( qtInterfaceButton->isChecked() )
config_PutPsz( p_intf, "intf", "qt4" );
}
-
+
if( number == SPrefsAudio )
{
bool b_normChecked = normalizerBox->isChecked();
{
if( qs_filter.contains( "volnorm" ) )
{
- /* The qs_filter not empty and contains "volnorm" that we have to remove */
+ /* The qs_filter not empty and contains "volnorm"
+ that we have to remove */
if( !b_normChecked )
{
/* Ugly :D */
qs_filter.remove( "volnorm" );
}
}
- else /* qs_filter not empty, but doesn't have volnorm inside already */
+ else /* qs_filter not empty, but doesn't have volnorm inside */
if( b_normChecked ) qs_filter.append( ":volnorm" );
}
config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) );
<rect>
<x>0</x>
<y>0</y>
- <width>422</width>
+ <width>508</width>
<height>478</height>
</rect>
</property>
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>10</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>_("Network")</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
+ <property name="horizontalSpacing" >
+ <number>6</number>
+ </property>
+ <property name="verticalSpacing" >
<number>6</number>
</property>
<item row="2" column="0" colspan="2" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
- <property name="maximum" >
- <number>65535</number>
- </property>
<property name="minimum" >
<number>1</number>
</property>
+ <property name="maximum" >
+ <number>65535</number>
+ </property>
<property name="value" >
<number>1234</number>
</property>
<string>_("Codecs / Muxers")</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
+ <property name="horizontalSpacing" >
+ <number>6</number>
+ </property>
+ <property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
- <property name="maximum" >
- <number>65535</number>
- </property>
<property name="minimum" >
<number>1</number>
</property>
+ <property name="maximum" >
+ <number>65535</number>
+ </property>
<property name="value" >
<number>6</number>
</property>
<string>_("Access Filter")</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<widget class="QCheckBox" name="timeshiftBox" >
<property name="text" >
</widget>
</item>
<item>
- <widget class="QCheckBox" name="RecordBox" >
+ <widget class="QCheckBox" name="recordBox" >
<property name="text" >
<string>_("Record")</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="DumpBox" >
+ <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>
<tabstop>RTSP_TCPBox</tabstop>
<tabstop>systemCodecBox</tabstop>
<tabstop>timeshiftBox</tabstop>
- <tabstop>RecordBox</tabstop>
- <tabstop>DumpBox</tabstop>
+ <tabstop>recordBox</tabstop>
+ <tabstop>dumpBox</tabstop>
</tabstops>
<resources/>
<connections/>