LibreMediaServer/lms-video
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Added check boxes for enable/disable the layers and master preview to save reoources

Browse source
This commit is contained in:
Santi Noreña 2013-03-01 18:49:03 +01:00
parent 84c85d5b36
commit d1c4295692
6 changed files with 104 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/libremediaserver.cpp
View file

@ -1588,6 +1588,39 @@ void libreMediaServer::sendFrame()
m_msex->n_timer->start();
}
// Enable/Disable the GUI Master preview
void libreMediaServer::on_previewMaster_stateChanged (int state)
{
if ((state == 0)) {
m_preview->stop();
}
if ((state == 2))
{
m_preview->start();
}
}
// Enable/Disable the GUI Layers preview
void libreMediaServer::on_previewLayer_stateChanged (int state)
{
if ((state == 0)) {
QString desc = tr("0022 0;");
if (!sendPacket(desc.toAscii().constData(),desc.size()))
{
errorsending();
}
}
if ((state == 2))
{
QString desc = tr("0022 1;");
if (!sendPacket(desc.toAscii().constData(),desc.size()))
{
errorsending();
}
}
}
///////////////////////////////////////////////////////////////////
//
// Terminal and Log
@ -1604,7 +1637,7 @@ void libreMediaServer::stdout_audio() {
}
}
// Sacamos la salida de Pure Data Video en la terminal
// Sacamos la salida de Pure Data Video en la terminal. Filtra mensajes para el GUI.
void libreMediaServer::stdout() {
QByteArray out = m_pd_video->readAllStandardError();
if (out.size() < 7) {return;}

2
src/libremediaserver.h
View file

@ -123,6 +123,8 @@ private slots:
void pdrestart();
void stdout();
void on_video_stateChanged(int state);
void on_previewMaster_stateChanged(int state);
void on_previewLayer_stateChanged(int state);
//Audio
void newPeer_audio();
void newmessage_audio();

2
src/libremediaserver.pro.user
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.5.0, 2013-03-01T16:14:51. -->
<!-- Written by Qt Creator 2.5.0, 2013-03-01T18:09:52. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>

49
src/libremediaserver.ui
View file

@ -91,7 +91,7 @@
<widget class="QSpinBox" name="ipAddress2">
<property name="geometry">
<rect>
<x>570</x>
<x>520</x>
<y>170</y>
<width>31</width>
<height>27</height>
@ -107,7 +107,7 @@
<widget class="QSpinBox" name="ipAddress4">
<property name="geometry">
<rect>
<x>650</x>
<x>600</x>
<y>170</y>
<width>31</width>
<height>27</height>
@ -384,7 +384,7 @@
<property name="geometry">
<rect>
<x>480</x>
<y>150</y>
<y>200</y>
<width>241</width>
<height>21</height>
</rect>
@ -396,7 +396,7 @@
<widget class="QSpinBox" name="ipAddress3">
<property name="geometry">
<rect>
<x>610</x>
<x>560</x>
<y>170</y>
<width>31</width>
<height>27</height>
@ -438,7 +438,7 @@
<widget class="QSpinBox" name="ipAddress1">
<property name="geometry">
<rect>
<x>530</x>
<x>480</x>
<y>170</y>
<width>31</width>
<height>27</height>
@ -651,6 +651,41 @@
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="previewLayer">
<property name="geometry">
<rect>
<x>480</x>
<y>240</y>
<width>131</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>Preview Layers</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="previewMaster">
<property name="geometry">
<rect>
<x>480</x>
<y>270</y>
<width>141</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>Preview Master</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="autoRepeat">
<bool>false</bool>
</property>
</widget>
<zorder>layer7Check</zorder>
<zorder>layer5Check</zorder>
<zorder>layer3Check</zorder>
@ -692,6 +727,8 @@
<zorder>layer7Preview</zorder>
<zorder>layer8Preview</zorder>
<zorder>masterPreview</zorder>
<zorder>previewLayer</zorder>
<zorder>previewMaster</zorder>
</widget>
<widget class="QWidget" name="Audio">
<attribute name="title">
@ -1112,7 +1149,7 @@ This program comes with ABSOLUTELY NO WARRANTY</string>
<x>0</x>
<y>0</y>
<width>745</width>
<height>25</height>
<height>29</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">