-- Added Live Cam Support

This commit is contained in:
Santi Noreña 2013-03-07 18:50:21 +01:00
parent c687f6135e
commit f5b363da41
9 changed files with 912 additions and 816 deletions

View file

@ -1,4 +1,4 @@
#N canvas 235 64 871 639 10;
#N canvas 457 104 871 639 10;
#X text 451 6 GEM object;
#X obj 8 46 cnv 15 540 100 empty empty empty 20 12 0 14 -233017 -66577
0;
@ -22,7 +22,7 @@ film into the specified colorspace.;
#X text 33 472 Outlet:;
#X obj 717 460 cnv 15 100 60 empty empty empty 20 12 0 14 -195568 -66577
0;
#N canvas 0 22 450 300 gemwin 0;
#N canvas 0 50 450 300 gemwin 0;
#X obj 132 136 gemwin;
#X obj 67 89 outlet;
#X obj 67 10 inlet;
@ -41,7 +41,7 @@ film into the specified colorspace.;
#X connect 7 1 6 0;
#X connect 7 1 5 0;
#X restore 722 499 pd gemwin;
#X msg 722 477 create;
#X msg 722 477 destroy;
#X text 718 456 Create window:;
#X obj 563 86 cnv 15 230 280 empty empty empty 20 12 0 14 -24198 -66577
0;
@ -72,11 +72,11 @@ system.;
#X msg 41 203 enumProps;
#X obj 31 21 cnv 15 400 80 empty empty readProperties 20 12 0 14 -233017
-66577 0;
#X obj 39 47 hradio 15 1 0 1 \$0-propreadId \$0-propreadId empty 0
#X obj 39 47 hradio 15 1 0 18 \$0-propreadId \$0-propreadId empty 0
-8 0 10 -262144 -1 -1 0;
#X obj 40 70 cnv 15 260 20 empty \$0-propreadName <none> 10 9 0 14
-203904 -66577 0;
#N canvas 186 49 450 537 PropertyLogic 0;
#N canvas 186 50 450 537 PropertyLogic 0;
#N canvas 586 84 774 460 id2property 0;
#X obj 353 106 r \$0-info;
#X obj 353 130 route proplist;
@ -174,7 +174,7 @@ system.;
#X obj 165 178 outlet;
#X obj 290 57 r \$0-info;
#X obj 290 79 route prop;
#N canvas 3 45 450 300 sroute 0;
#N canvas 3 50 450 300 sroute 0;
#X obj 73 12 inlet;
#X obj 312 9 inlet;
#X obj 73 113 outlet;
@ -307,7 +307,7 @@ system.;
-66577 0;
#X obj 31 111 cnv 15 400 80 empty empty writeProperties 20 12 0 14
-233017 -66577 0;
#X obj 39 137 hradio 15 1 0 1 \$0-propwriteId \$0-propwriteId empty
#X obj 39 137 hradio 15 1 0 15 \$0-propwriteId \$0-propwriteId empty
0 -8 0 10 -262144 -1 -1 0;
#X obj 40 160 cnv 15 260 20 empty \$0-propwriteName <none> 10 9 0 14
-203904 -66577 0;
@ -410,17 +410,23 @@ properties \, ...);
#X text 54 600 you can use [pix_buffer] to distribute the same pix
to different parts of your render-chain;
#X msg 625 235 device /dev/fw1;
#N canvas 697 49 586 667 backend 0;
#N canvas 697 50 586 667 backend 0;
#X obj 104 122 bng 15 250 50 0 \$0-backendinfo \$0-backendinfo <--show_info_on_drivers
17 8 0 10 -262144 -1 -1;
#N canvas 15 49 450 300 \$0-backendinfo 0;
#N canvas 13 88 450 300 \$0-backendinfo 0;
#X obj 60 120 v4l2-videoplugin \$0;
#X obj 60 140 v4l-videoplugin \$0;
#X text 50 65 You are currently using the 'v4l2' driver;
#X text 50 90 Click on any of the patches below for information about
a specific driver:;
#X text 50 50 On this system you have 2 drivers available;
#X restore 184 207 pd \$0-backendinfo;
#X obj 184 240 r \$0-backendinfo;
#X msg 223 331 clear;
#X obj 223 351 s pd-\$0-backendinfo;
#X obj 203 424 s \$0-ctl;
#X msg 203 405 driver;
#N canvas 4 49 685 300 fake 0;
#N canvas 4 50 685 300 fake 0;
#X obj 178 5 inlet bang;
#X msg 178 25 currentdriver v4l2 \, drivers 3 \, driver v4l2 analog
\, driver v4l analog \, driver dc1394 iidc \, driver unicap analog
@ -430,7 +436,7 @@ to different parts of your render-chain;
#X connect 1 0 2 0;
#X restore 265 414 pd fake;
#X obj 265 434 s \$0-info;
#N canvas 14 49 450 300 content 0;
#N canvas 14 50 450 300 content 0;
#X obj 123 124 route driver drivers currentdriver;
#N canvas 509 196 644 372 numdrivers 0;
#X obj 119 11 inlet;
@ -458,7 +464,7 @@ about a specific driver:;
#X connect 9 1 2 1;
#X connect 10 0 5 0;
#X restore 190 179 pd numdrivers;
#N canvas 12 49 638 300 currentdriver 0;
#N canvas 12 50 638 300 currentdriver 0;
#X obj 119 31 inlet;
#X obj 119 186 outlet;
#X obj 119 82 symbol <undefined>;
@ -483,7 +489,7 @@ about a specific driver:;
#X connect 9 0 6 0;
#X connect 10 0 6 0;
#X restore 280 179 pd currentdriver;
#N canvas 12 49 456 510 listdrivers 0;
#N canvas 12 50 456 510 listdrivers 0;
#X obj 149 61 inlet;
#X obj 149 276 outlet;
#X obj 241 61 inlet reset;

View file

@ -1674,7 +1674,6 @@ void libreMediaServer::stdout() {
QByteArray out = m_pd_video->readAllStandardError();
if (out.size() < 7) {return;}
out.chop(1);
qDebug() << "PD Video: " << out;
if (out.indexOf("ola2pd: Can not read DMX!",0) != -1)
{
ui.textEdit->appendPlainText("Can not read DMX data.");
@ -1742,5 +1741,7 @@ void libreMediaServer::stdout() {
qDebug()<<"stdout:Invalid cookie received"<<out;
break;
}
}
return;
}
qDebug() << "PD Video: " << out;
}

View file

@ -721,6 +721,19 @@
<height>41</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="maximum">
<number>60</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
<zorder>layer7Check</zorder>
<zorder>layer5Check</zorder>