VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ATV modulator: removed volume control and add .wmv to the video file extensions

This commit is contained in:
f4exb 2017-03-10 13:32:37 +01:00
parent de9bbb26fd
commit 293ac223e4
3 changed files with 3 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -71,7 +71,6 @@ void ATVModGUI::resetToDefaults()
ui->rfBW->setValue(10);
ui->uniformLevel->setValue(35);
ui->volume->setValue(10);
ui->standard->setCurrentIndex(0);
ui->inputSelect->setCurrentIndex(0);
ui->deltaFrequency->setValue(0);
@ -91,7 +90,6 @@ QByteArray ATVModGUI::serialize() const
s.writeS32(4, ui->standard->currentIndex());
s.writeS32(5, ui->inputSelect->currentIndex());
s.writeU32(6, m_channelMarker.getColor().rgb());
s.writeS32(7, ui->volume->value());
s.writeS32(8, ui->modulation->currentIndex());
return s.final();
@ -132,8 +130,6 @@ bool ATVModGUI::deserialize(const QByteArray& data)
m_channelMarker.setColor(u32tmp);
}
d.readS32(7, &tmp, 10);
ui->volume->setValue(tmp);
d.readS32(8, &tmp, 0);
ui->modulation->setCurrentIndex(tmp);
@ -233,12 +229,6 @@ void ATVModGUI::on_inputSelect_currentIndexChanged(int index)
applySettings();
}
void ATVModGUI::on_volume_valueChanged(int value)
{
ui->volumeText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1));
applySettings();
}
void ATVModGUI::on_channelMute_toggled(bool checked)
{
applySettings();
@ -260,7 +250,7 @@ void ATVModGUI::on_imageFileDialog_clicked(bool checked)
void ATVModGUI::on_videoFileDialog_clicked(bool checked)
{
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open video file"), ".", tr("Video Files (*.avi *.mpg *.mp4 *.mov *.m4v *.vob)"));
tr("Open video file"), ".", tr("Video Files (*.avi *.mpg *.mp4 *.mov *.m4v *.vob *.wmv)"));
if (fileName != "")
{

1
plugins/channeltx/modatv/atvmodgui.h
View File

@ -64,7 +64,6 @@ private slots:
void on_rfBW_valueChanged(int value);
void on_uniformLevel_valueChanged(int value);
void on_inputSelect_currentIndexChanged(int index);
void on_volume_valueChanged(int value);
void on_channelMute_toggled(bool checked);
void on_imageFileDialog_clicked(bool checked);
void on_videoFileDialog_clicked(bool checked);

48
plugins/channeltx/modatv/atvmodgui.ui
View File

@ -272,51 +272,7 @@
<item>
<widget class="QLabel" name="volLabel">
<property name="text">
<string>Vol</string>
</property>
</widget>
</item>
<item>
<widget class="QDial" name="volume">
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Video input gain (not implemented)</string>
</property>
<property name="maximum">
<number>20</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="volumeText">
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Audio input gain value</string>
</property>
<property name="statusTip">
<string/>
</property>
<property name="text">
<string>1.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>Video</string>
</property>
</widget>
</item>
@ -329,7 +285,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Level (% full range) top trace: average, bottom trace: instantaneous peak, tip: peak hold</string>
<string>video signal level in % of 0:1 range</string>
</property>
</widget>
</item>