- Added FPS Counter in video tab
This commit is contained in:
Santi Noreña
parent
8b111d44a5
commit
13eb54a29d
11 changed files with 164 additions and 81 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#N canvas 486 82 722 633 10;
|
||||
#N canvas 596 90 722 633 10;
|
||||
#X obj 76 22 gemhead;
|
||||
#X obj 76 367 glsl_program;
|
||||
#X obj 169 329 print linking;
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
#X obj 106 535 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
|
||||
1;
|
||||
#X obj 76 489 pix_image img1.jpg;
|
||||
#X msg 103 460 open img2.jpg;
|
||||
#X msg 243 154 open texture_rect.frag;
|
||||
#X msg 114 114 0;
|
||||
#X obj 243 72 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
|
||||
|
|
@ -32,7 +31,7 @@
|
|||
#X text 400 240 <- adjust Brightness;
|
||||
#X text 138 67 <- load shader;
|
||||
#X obj 76 604 square 3;
|
||||
#N canvas 87 154 247 179 Gem.init 0;
|
||||
#N canvas 85 191 247 179 Gem.init 0;
|
||||
#X obj 118 46 loadbang;
|
||||
#X msg 118 81 reset;
|
||||
#X obj 118 113 outlet;
|
||||
|
|
@ -88,37 +87,38 @@
|
|||
#X floatatom 192 372 0 0 0 0 - - -;
|
||||
#X msg 151 308 link \$1;
|
||||
#X obj 151 259 change;
|
||||
#X msg 103 460 open img2.jpg;
|
||||
#X connect 0 0 11 0;
|
||||
#X connect 1 0 3 0;
|
||||
#X connect 1 1 38 0;
|
||||
#X connect 1 1 37 0;
|
||||
#X connect 3 0 14 0;
|
||||
#X connect 4 0 3 1;
|
||||
#X connect 5 0 3 2;
|
||||
#X connect 6 0 3 3;
|
||||
#X connect 7 0 29 0;
|
||||
#X connect 8 0 31 0;
|
||||
#X connect 7 0 28 0;
|
||||
#X connect 8 0 30 0;
|
||||
#X connect 9 0 10 0;
|
||||
#X connect 9 0 17 0;
|
||||
#X connect 9 0 16 0;
|
||||
#X connect 10 0 11 0;
|
||||
#X connect 11 0 1 0;
|
||||
#X connect 11 1 40 0;
|
||||
#X connect 13 0 32 0;
|
||||
#X connect 11 1 39 0;
|
||||
#X connect 13 0 31 0;
|
||||
#X connect 14 0 7 0;
|
||||
#X connect 15 0 14 0;
|
||||
#X connect 16 0 11 0;
|
||||
#X connect 17 0 34 0;
|
||||
#X connect 18 0 16 0;
|
||||
#X connect 18 0 21 0;
|
||||
#X connect 21 0 33 0;
|
||||
#X connect 15 0 11 0;
|
||||
#X connect 16 0 33 0;
|
||||
#X connect 17 0 15 0;
|
||||
#X connect 17 0 20 0;
|
||||
#X connect 20 0 32 0;
|
||||
#X connect 21 0 1 0;
|
||||
#X connect 22 0 1 0;
|
||||
#X connect 23 0 1 0;
|
||||
#X connect 23 0 21 0;
|
||||
#X connect 24 0 22 0;
|
||||
#X connect 25 0 23 0;
|
||||
#X connect 30 0 31 0;
|
||||
#X connect 32 0 7 0;
|
||||
#X connect 35 0 13 0;
|
||||
#X connect 36 0 11 0;
|
||||
#X connect 37 0 1 0;
|
||||
#X connect 39 0 1 0;
|
||||
#X connect 39 0 2 0;
|
||||
#X connect 40 0 39 0;
|
||||
#X connect 29 0 30 0;
|
||||
#X connect 31 0 7 0;
|
||||
#X connect 34 0 13 0;
|
||||
#X connect 35 0 11 0;
|
||||
#X connect 36 0 1 0;
|
||||
#X connect 38 0 1 0;
|
||||
#X connect 38 0 2 0;
|
||||
#X connect 39 0 38 0;
|
||||
#X connect 40 0 14 0;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Libre Media Server - A Media Server Sotfware for stage and performing
|
||||
Creates CITP/MSEx 1.0 packets
|
||||
|
||||
Copyright (C) 2012-2013 Santiago Noreña puremediaserver@gmail.com
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
// -*- mode: C++ -*-
|
||||
/*
|
||||
Libre Media Server - A Media Server Sotfware for stage and performing
|
||||
/* Creates packet of CITP/MSEx 1.0
|
||||
|
||||
Copyright (C) 2012 -2013 Santiago Noreña
|
||||
belfegor <AT> gmail <DOT> com
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
Pure Media Server - A Media Server Sotfware for stage and performing
|
||||
v0.03-1
|
||||
|
||||
Copyright (C) 2012-2013 Santi Noreña libremediaserver@gmail.com
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -911,7 +911,7 @@ void libreMediaServer::newPeer()
|
|||
this, SLOT(newmessage()));
|
||||
}
|
||||
|
||||
// New message in a TCP socket stablished connection
|
||||
// New message in a socket stablished connection
|
||||
void libreMediaServer::newmessage()
|
||||
{
|
||||
if (m_read_vid == NULL)
|
||||
|
|
@ -1733,7 +1733,15 @@ void libreMediaServer::stdout() {
|
|||
out.prepend("Layer 8 playing:");
|
||||
ui.textEdit->appendPlainText(out);
|
||||
break;
|
||||
default:
|
||||
case '9':
|
||||
out.remove(0,9);
|
||||
qDebug() <<out;
|
||||
bool ok;
|
||||
int fps;
|
||||
fps = out.toInt(&ok,10);
|
||||
ui.fpsCounter->display(fps);
|
||||
break;
|
||||
default:
|
||||
qDebug()<<"stdout:Invalid cookie received"<<out;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
|
||||
#define VERSION "LibreMediaServer Version 0.03-1"
|
||||
#define VERSION "LibreMediaServer Version 0.04-1"
|
||||
#define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com"
|
||||
#define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<rect>
|
||||
<x>410</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
<number>255</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_3">
|
||||
<widget class="QLabel" name="winsizeLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
<rect>
|
||||
<x>570</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
<rect>
|
||||
<x>250</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -227,7 +227,7 @@
|
|||
<string>Layer 4</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<widget class="QLabel" name="winposLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
|
|
@ -258,7 +258,7 @@
|
|||
<rect>
|
||||
<x>10</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>71</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -310,7 +310,7 @@
|
|||
<rect>
|
||||
<x>490</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -354,7 +354,7 @@
|
|||
<number>5000</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label">
|
||||
<widget class="QLabel" name="universeLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
|
|
@ -372,7 +372,7 @@
|
|||
<rect>
|
||||
<x>330</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -414,7 +414,7 @@
|
|||
<rect>
|
||||
<x>170</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -472,7 +472,7 @@
|
|||
<rect>
|
||||
<x>90</x>
|
||||
<y>70</y>
|
||||
<width>87</width>
|
||||
<width>81</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -686,6 +686,32 @@
|
|||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLCDNumber" name="fpsCounter">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>493</x>
|
||||
<y>320</y>
|
||||
<width>61</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="numDigits">
|
||||
<number>3</number>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="fpsLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>500</x>
|
||||
<y>350</y>
|
||||
<width>31</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>FPS</string>
|
||||
</property>
|
||||
</widget>
|
||||
<zorder>layer7Check</zorder>
|
||||
<zorder>layer5Check</zorder>
|
||||
<zorder>layer3Check</zorder>
|
||||
|
|
@ -695,7 +721,7 @@
|
|||
<zorder>winsizex</zorder>
|
||||
<zorder>ipAddress2</zorder>
|
||||
<zorder>ipAddress4</zorder>
|
||||
<zorder>label_3</zorder>
|
||||
<zorder>winsizeLabel</zorder>
|
||||
<zorder>layer6Add</zorder>
|
||||
<zorder>window</zorder>
|
||||
<zorder>layer7Add</zorder>
|
||||
|
|
@ -703,7 +729,7 @@
|
|||
<zorder>layer8Check</zorder>
|
||||
<zorder>layer2Add</zorder>
|
||||
<zorder>layer4Check</zorder>
|
||||
<zorder>label_2</zorder>
|
||||
<zorder>winposLabel</zorder>
|
||||
<zorder>readDMX</zorder>
|
||||
<zorder>layer1Check</zorder>
|
||||
<zorder>layer1Add</zorder>
|
||||
|
|
@ -712,7 +738,7 @@
|
|||
<zorder>universe</zorder>
|
||||
<zorder>video</zorder>
|
||||
<zorder>winsizey</zorder>
|
||||
<zorder>label</zorder>
|
||||
<zorder>universeLabel</zorder>
|
||||
<zorder>CITPaddress_label</zorder>
|
||||
<zorder>ipAddress3</zorder>
|
||||
<zorder>winpositionx</zorder>
|
||||
|
|
@ -729,6 +755,8 @@
|
|||
<zorder>masterPreview</zorder>
|
||||
<zorder>previewLayer</zorder>
|
||||
<zorder>previewMaster</zorder>
|
||||
<zorder>fpsCounter</zorder>
|
||||
<zorder>fpsLabel</zorder>
|
||||
</widget>
|
||||
<widget class="QWidget" name="Audio">
|
||||
<attribute name="title">
|
||||
|
|
@ -799,7 +827,7 @@
|
|||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_7">
|
||||
<widget class="QLabel" name="UniverseAudioLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>210</x>
|
||||
|
|
@ -1106,7 +1134,7 @@
|
|||
<zorder>layer1Add_audio</zorder>
|
||||
<zorder>layer8_audio</zorder>
|
||||
<zorder>layer2Check_audio</zorder>
|
||||
<zorder>label_7</zorder>
|
||||
<zorder>UniverseAudioLabel</zorder>
|
||||
<zorder>layer5Add_audio</zorder>
|
||||
<zorder>layer3Add_audio</zorder>
|
||||
<zorder>layer6Add_audio</zorder>
|
||||
|
|
|
|||
14
src/msex.cpp
14
src/msex.cpp
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
Pure Media Server - A Media Server Sotfware for stage and performing
|
||||
CITP/MSEx 1.0 implementation file
|
||||
|
||||
Copyright (C) 2012-2013 Santiago Noreña puremediaserver@gmail.com
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -16,12 +17,6 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "msex.h"
|
||||
//#include "libremediaserver.h"
|
||||
#include "MSEXDefines.h"
|
||||
#include "PacketCreator.h"
|
||||
#include "citp-lib.h"
|
||||
|
||||
#include <QtDebug>
|
||||
#include <QTimer>
|
||||
#include <QTcpServer>
|
||||
|
|
@ -29,6 +24,11 @@
|
|||
#include <QDir>
|
||||
#include <QDateTime>
|
||||
|
||||
#include "msex.h"
|
||||
#include "MSEXDefines.h"
|
||||
#include "PacketCreator.h"
|
||||
#include "citp-lib.h"
|
||||
|
||||
msex::msex(QObject *parent)
|
||||
: QObject(parent),
|
||||
m_peerState(STATE),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
/*
|
||||
Libre Media Server - A Media Server Sotfware for stage and performing
|
||||
/* The CITP/MSEx 1.0 header file
|
||||
|
||||
Copyright (C) 2012-2013 Santiago Noreña
|
||||
belfegor <AT> gmail <DOT> com
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -103,7 +102,7 @@ private slots:
|
|||
void sendFrame(); // Slot temporizado para mandar una señal a libremediaserver::sendframe() para mandar un frame
|
||||
|
||||
signals:
|
||||
void frameRequest();
|
||||
void frameRequest(); // Request a frame of the master preview
|
||||
};
|
||||
|
||||
#endif // MEDIASERVER_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue