From a17d9e4a6cbb4c924fdf58d5088dc80fac1ddc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santi=20Nore=C3=B1a?= <belfegor@gmail.com>
Date: Thu, 10 Jan 2013 20:18:21 +0100
Subject: [PATCH] - added gpan in audio_player - Clean audio patches - Fixed
 destructor. Now exits correctly - Small audio bugfixes

	modified:   libremediaserver/libremediaserver.cpp
	modified:   libremediaserver/libremediaserver.ui
	deleted:    libremediaserver/pd/gpan~.pd
	modified:   libremediaserver/pd/layer_audio.pd
	modified:   libremediaserver/pd/pms-audio.pd
	modified:   libremediaserver/pd/pms-video.pd
	modified:   libremediaserver/scripts/install_precise.sh
---
 libremediaserver/libremediaserver.cpp       |  12 +-
 libremediaserver/libremediaserver.ui        |  94 ++++--
 libremediaserver/pd/gpan~.pd                |  35 --
 libremediaserver/pd/layer_audio.pd          | 212 ++++++------
 libremediaserver/pd/pms-audio.pd            | 338 ++++++++++----------
 libremediaserver/pd/pms-video.pd            |   8 +-
 libremediaserver/scripts/install_precise.sh |   2 +-
 7 files changed, 347 insertions(+), 354 deletions(-)
 delete mode 100644 libremediaserver/pd/gpan~.pd

diff --git a/libremediaserver/libremediaserver.cpp b/libremediaserver/libremediaserver.cpp
index 9a423a0..da0c368 100644
--- a/libremediaserver/libremediaserver.cpp
+++ b/libremediaserver/libremediaserver.cpp
@@ -185,6 +185,7 @@ libreMediaServer::~libreMediaServer()
     {
          m_pd_read_audio->close();
     }
+    return;
 }
 
 
@@ -1345,14 +1346,14 @@ void libreMediaServer::on_audio_stateChanged(int state)
             disconnect(m_pd_write_audio, SIGNAL(connected()),this, SLOT(newconexion_audio()));
             m_pd_write_audio->close();
             delete m_pd_write_audio;
-            m_pd_write_audio == NULL;
+            m_pd_write_audio = NULL;
         }
-        if (m_pd_write_audio != NULL)
+        if (m_pd_read_audio != NULL)
         {
             disconnect(m_pd_read_audio, SIGNAL(newConnection()),this, SLOT(newPeer_audio()));
             m_pd_read_audio->close();
             delete m_pd_read_audio;
-            m_pd_write_audio == NULL;
+            m_pd_read_audio = NULL;
         }
     }
     if ((state == 2))
@@ -1394,13 +1395,14 @@ void libreMediaServer::pdstart_audio()
     qDebug()<<"error listening tcpServer";
     }
     // Arrancamos el proceso Pure Data
-    m_pd_audio->start("pd -nogui -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./pd pms-video.pd");
+    m_pd_audio->start("pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./pd pms-audio.pd");
     if (m_pd_audio->waitForStarted(3000)){
         ui.textEdit->appendPlainText("PD Audio started.");
     }
     else
     {
         ui.textEdit->appendPlainText("PD Audio not started!");
+        qErrnoWarning("Can not init PD Audio: ");
         return;
     }
     connect(m_pd_audio, SIGNAL(readyReadStandardError()), this, SLOT(stdout_audio()));
@@ -1562,7 +1564,7 @@ bool libreMediaServer::sendPacket_audio(const char *buffer, int bufferLen)
 void libreMediaServer::errorsending_audio() {
     if (ui.audio->checkState())
     {
-    ui.textEdit->appendPlainText("Can not send packets to PD Video");
+    ui.textEdit->appendPlainText("Can not send packets to PD Audio");
     }
 }
 
diff --git a/libremediaserver/libremediaserver.ui b/libremediaserver/libremediaserver.ui
index f85f476..3902dc5 100644
--- a/libremediaserver/libremediaserver.ui
+++ b/libremediaserver/libremediaserver.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
-    <height>605</height>
+    <width>789</width>
+    <height>615</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,11 +27,17 @@
       <height>441</height>
      </rect>
     </property>
+    <property name="cursor">
+     <cursorShape>CrossCursor</cursorShape>
+    </property>
+    <property name="autoFillBackground">
+     <bool>false</bool>
+    </property>
     <property name="tabShape">
      <enum>QTabWidget::Rounded</enum>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
     </property>
     <property name="usesScrollButtons">
      <bool>false</bool>
@@ -85,27 +91,36 @@
      <widget class="QSpinBox" name="ipAddress2">
       <property name="geometry">
        <rect>
-        <x>570</x>
+        <x>510</x>
         <y>340</y>
-        <width>55</width>
+        <width>31</width>
         <height>27</height>
        </rect>
       </property>
+      <property name="buttonSymbols">
+       <enum>QAbstractSpinBox::NoButtons</enum>
+      </property>
       <property name="maximum">
-       <number>254</number>
+       <number>255</number>
       </property>
      </widget>
      <widget class="QSpinBox" name="ipAddress4">
       <property name="geometry">
        <rect>
-        <x>710</x>
+        <x>590</x>
         <y>340</y>
-        <width>55</width>
+        <width>31</width>
         <height>27</height>
        </rect>
       </property>
+      <property name="frame">
+       <bool>true</bool>
+      </property>
+      <property name="buttonSymbols">
+       <enum>QAbstractSpinBox::NoButtons</enum>
+      </property>
       <property name="maximum">
-       <number>254</number>
+       <number>255</number>
       </property>
      </widget>
      <widget class="QLabel" name="label_3">
@@ -163,8 +178,8 @@
      <widget class="QPushButton" name="updateButton">
       <property name="geometry">
        <rect>
-        <x>650</x>
-        <y>290</y>
+        <x>490</x>
+        <y>190</y>
         <width>113</width>
         <height>32</height>
        </rect>
@@ -319,7 +334,7 @@
      <widget class="QSpinBox" name="universe">
       <property name="geometry">
        <rect>
-        <x>30</x>
+        <x>20</x>
         <y>210</y>
         <width>55</width>
         <height>27</height>
@@ -329,7 +344,7 @@
      <widget class="QCheckBox" name="video">
       <property name="geometry">
        <rect>
-        <x>30</x>
+        <x>20</x>
         <y>150</y>
         <width>93</width>
         <height>26</height>
@@ -381,8 +396,8 @@
      <widget class="QLabel" name="label_4">
       <property name="geometry">
        <rect>
-        <x>590</x>
-        <y>380</y>
+        <x>500</x>
+        <y>370</y>
         <width>81</width>
         <height>21</height>
        </rect>
@@ -394,14 +409,17 @@
      <widget class="QSpinBox" name="ipAddress3">
       <property name="geometry">
        <rect>
-        <x>640</x>
+        <x>550</x>
         <y>340</y>
-        <width>55</width>
+        <width>31</width>
         <height>27</height>
        </rect>
       </property>
+      <property name="buttonSymbols">
+       <enum>QAbstractSpinBox::NoButtons</enum>
+      </property>
       <property name="maximum">
-       <number>254</number>
+       <number>255</number>
       </property>
      </widget>
      <widget class="QCheckBox" name="layer3Check">
@@ -433,14 +451,20 @@
      <widget class="QSpinBox" name="ipAddress1">
       <property name="geometry">
        <rect>
-        <x>510</x>
+        <x>470</x>
         <y>340</y>
-        <width>55</width>
+        <width>31</width>
         <height>27</height>
        </rect>
       </property>
+      <property name="buttonSymbols">
+       <enum>QAbstractSpinBox::NoButtons</enum>
+      </property>
+      <property name="keyboardTracking">
+       <bool>true</bool>
+      </property>
       <property name="maximum">
-       <number>254</number>
+       <number>255</number>
       </property>
      </widget>
      <widget class="QSpinBox" name="layer4Add">
@@ -624,8 +648,8 @@
      <widget class="QPushButton" name="ChangePath">
       <property name="geometry">
        <rect>
-        <x>620</x>
-        <y>240</y>
+        <x>470</x>
+        <y>150</y>
         <width>150</width>
         <height>28</height>
        </rect>
@@ -640,8 +664,8 @@
      <widget class="QLabel" name="masterPreview">
       <property name="geometry">
        <rect>
-        <x>160</x>
-        <y>170</y>
+        <x>140</x>
+        <y>150</y>
         <width>320</width>
         <height>210</height>
        </rect>
@@ -722,7 +746,7 @@
        <rect>
         <x>80</x>
         <y>10</y>
-        <width>441</width>
+        <width>691</width>
         <height>21</height>
        </rect>
       </property>
@@ -748,7 +772,7 @@
        <rect>
         <x>80</x>
         <y>220</y>
-        <width>441</width>
+        <width>691</width>
         <height>17</height>
        </rect>
       </property>
@@ -826,7 +850,7 @@
        <rect>
         <x>80</x>
         <y>40</y>
-        <width>441</width>
+        <width>701</width>
         <height>17</height>
        </rect>
       </property>
@@ -865,7 +889,7 @@
        <rect>
         <x>80</x>
         <y>190</y>
-        <width>451</width>
+        <width>691</width>
         <height>17</height>
        </rect>
       </property>
@@ -891,7 +915,7 @@
        <rect>
         <x>80</x>
         <y>130</y>
-        <width>441</width>
+        <width>691</width>
         <height>17</height>
        </rect>
       </property>
@@ -966,7 +990,7 @@
        <rect>
         <x>80</x>
         <y>100</y>
-        <width>441</width>
+        <width>701</width>
         <height>17</height>
        </rect>
       </property>
@@ -979,7 +1003,7 @@
        <rect>
         <x>80</x>
         <y>160</y>
-        <width>451</width>
+        <width>691</width>
         <height>17</height>
        </rect>
       </property>
@@ -1044,7 +1068,7 @@
        <rect>
         <x>80</x>
         <y>70</y>
-        <width>441</width>
+        <width>701</width>
         <height>17</height>
        </rect>
       </property>
@@ -1106,7 +1130,7 @@
     </property>
     <property name="plainText">
      <string>LibreMediaServer 0.01-2 
-(C) 2012 Santiago Noreña  libremediaserver@gmail.com
+(C) 2012-2013 Santiago Noreña  libremediaserver@gmail.com
 This program comes with ABSOLUTELY NO WARRANTY</string>
     </property>
    </widget>
@@ -1117,7 +1141,7 @@ This program comes with ABSOLUTELY NO WARRANTY</string>
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>789</width>
      <height>25</height>
     </rect>
    </property>
diff --git a/libremediaserver/pd/gpan~.pd b/libremediaserver/pd/gpan~.pd
deleted file mode 100644
index 00c635a..0000000
--- a/libremediaserver/pd/gpan~.pd
+++ /dev/null
@@ -1,35 +0,0 @@
-#N canvas 0 22 474 324 10;
-#X obj 55 118 inlet~;
-#X obj 304 139 inlet~;
-#X obj 303 249 outlet~;
-#X obj 54 249 outlet~;
-#X obj 71 161 expr 1-$f1;
-#X obj 164 115 hsl 64 8 0 1 0 1 empty empty empty -2 -6 0 8 -166441
--123526 -1 3150 1;
-#X msg 161 79 0.5;
-#X obj 365 140 inlet;
-#X text 171 225 [gpan~];
-#X text 242 289 released under the GNU GPL;
-#X text 18 289 (C) Copyright 2004 Marc Lavalee;
-#X obj 319 205 line~;
-#X msg 319 184 \$1 1;
-#X obj 71 202 line~;
-#X msg 71 181 \$1 1;
-#X obj 303 225 *~;
-#X obj 55 227 *~;
-#X obj 161 58 loadbang;
-#X connect 0 0 16 0;
-#X connect 1 0 15 0;
-#X connect 4 0 14 0;
-#X connect 5 0 12 0;
-#X connect 5 0 4 0;
-#X connect 6 0 5 0;
-#X connect 7 0 5 0;
-#X connect 11 0 15 1;
-#X connect 12 0 11 0;
-#X connect 13 0 16 1;
-#X connect 14 0 13 0;
-#X connect 15 0 2 0;
-#X connect 16 0 3 0;
-#X connect 17 0 6 0;
-#X coords 0 0 1 1 120 12 1;
diff --git a/libremediaserver/pd/layer_audio.pd b/libremediaserver/pd/layer_audio.pd
index 22113ff..a3d89f7 100644
--- a/libremediaserver/pd/layer_audio.pd
+++ b/libremediaserver/pd/layer_audio.pd
@@ -1,46 +1,52 @@
-#N canvas 339 118 1016 665 10;
-#N canvas 347 96 1016 665 audio_player 0;
-#X msg 239 357 open \$1;
-#X msg 383 478 start;
-#X msg 438 479 stop;
-#X obj 384 568 oggread~;
-#X msg 491 481 resume;
-#X obj 239 185 inlet;
-#X obj 334 185 inlet;
-#X obj 239 304 spigot;
-#X msg 334 260 1;
-#X msg 379 261 0;
-#X obj 436 377 / 25;
-#X obj 436 346 spigot;
-#X obj 436 406 int;
-#X obj 436 186 r \$0-c5;
-#X obj 365 619 *~ 0;
-#X obj 422 619 *~ 0;
-#X obj 541 563 dbtorms;
-#X obj 484 563 dbtorms;
-#X obj 414 733 dac~;
-#X obj 365 690 gpan~;
-#X obj 580 466 r \$0-c1;
-#X obj 665 465 r \$0-c2;
-#X text 578 449 Volumen;
-#X text 677 449 Pan;
-#X obj 665 505 * 0.00392157;
-#X obj 334 226 select 1;
-#X obj 436 434 select 0 1 2;
-#X msg 214 511 seek \$1;
-#X obj 214 446 r \$0-c8;
-#X obj 580 502 * 0.0015308;
-#X obj 214 477 * 0.01;
-#X obj 465 621 s \$0-position;
+#N canvas 335 134 904 417 10;
+#N canvas 393 95 477 527 audio_player 0;
+#X msg 22 107 open \$1;
+#X msg 203 167 start;
+#X msg 242 168 stop;
+#X obj 119 214 oggread~;
+#X msg 274 168 resume;
+#X obj 22 9 inlet;
+#X obj 117 9 inlet;
+#X obj 22 85 spigot;
+#X msg 117 50 1;
+#X msg 162 51 0;
+#X obj 219 105 / 25;
+#X obj 219 85 spigot;
+#X obj 219 125 int;
+#X obj 219 10 r \$0-c5;
+#X obj 100 265 *~ 0;
+#X obj 157 265 *~ 0;
+#X obj 276 209 dbtorms;
+#X obj 219 209 dbtorms;
+#X obj 150 493 dac~;
+#X obj 363 140 r \$0-c1;
+#X obj 212 300 r \$0-c2;
+#X text 361 123 Volumen;
+#X text 224 284 Pan;
+#X obj 212 340 * 0.00392157;
+#X obj 117 30 select 1;
+#X obj 219 145 select 0 1 2;
+#X msg 119 175 seek \$1;
+#X obj 119 110 r \$0-c8;
+#X obj 363 176 * 0.0015308;
+#X obj 119 141 * 0.01;
+#X obj 200 267 s \$0-position;
+#X obj 117 383 expr 1-$f1;
+#X obj 210 432 line~;
+#X msg 210 411 \$1 1;
+#X obj 117 424 line~;
+#X msg 117 403 \$1 1;
+#X obj 194 452 *~;
+#X obj 101 449 *~;
 #X connect 0 0 3 0;
 #X connect 1 0 3 0;
 #X connect 2 0 3 0;
 #X connect 3 0 14 0;
 #X connect 3 1 15 0;
-#X connect 3 2 31 0;
+#X connect 3 2 30 0;
 #X connect 4 0 3 0;
 #X connect 5 0 7 0;
-#X connect 6 0 25 0;
+#X connect 6 0 24 0;
 #X connect 7 0 0 0;
 #X connect 8 0 7 1;
 #X connect 8 0 11 1;
@@ -48,60 +54,66 @@
 #X connect 9 0 11 1;
 #X connect 10 0 12 0;
 #X connect 11 0 10 0;
-#X connect 12 0 26 0;
+#X connect 12 0 25 0;
 #X connect 13 0 11 0;
-#X connect 14 0 19 0;
-#X connect 15 0 19 1;
+#X connect 14 0 37 0;
+#X connect 15 0 36 0;
 #X connect 16 0 15 1;
 #X connect 17 0 14 1;
-#X connect 19 0 18 0;
-#X connect 19 1 18 1;
-#X connect 20 0 29 0;
-#X connect 21 0 24 0;
-#X connect 24 0 19 2;
-#X connect 25 0 8 0;
-#X connect 25 1 9 0;
-#X connect 26 0 1 0;
-#X connect 26 1 2 0;
-#X connect 26 2 4 0;
-#X connect 27 0 3 0;
-#X connect 28 0 30 0;
-#X connect 29 0 17 0;
-#X connect 29 0 16 0;
-#X connect 30 0 27 0;
-#X connect 30 0 31 0;
-#X restore 37 -34 pd audio_player;
-#X obj 430 296 change;
-#X obj 483 296 change;
-#X obj 533 296 change;
-#X obj 589 296 change;
-#X obj 646 296 change;
-#X obj 701 296 change;
-#X obj 756 296 change;
-#X obj 818 296 change;
-#X obj 35 296 change;
-#X obj 83 296 change;
-#X obj 128 296 change;
-#X obj 173 296 change;
-#X obj 226 296 change;
-#X obj 277 296 change;
-#X obj 323 296 change;
-#X obj 376 296 change;
-#X obj 177 86 inlet;
-#X obj 35 423 s \$0-c1;
-#X obj 83 321 s \$0-c2;
-#X obj 128 321 s \$0-c3;
-#X obj 173 321 s \$0-c4;
-#X obj 226 321 s \$0-c5;
-#X obj 277 321 s \$0-c6;
-#X obj 376 429 s \$0-c8;
-#X obj 483 321 s \$0-c10;
-#X obj 533 321 s \$0-c11;
-#X obj 589 321 s \$0-c12;
-#X obj 646 321 s \$0-c13;
-#X obj 701 321 s \$0-c14;
-#X obj 756 321 s \$0-c15;
-#X obj 818 321 s \$0-c16;
+#X connect 19 0 28 0;
+#X connect 20 0 23 0;
+#X connect 23 0 31 0;
+#X connect 23 0 33 0;
+#X connect 24 0 8 0;
+#X connect 24 1 9 0;
+#X connect 25 0 1 0;
+#X connect 25 1 2 0;
+#X connect 25 2 4 0;
+#X connect 26 0 3 0;
+#X connect 27 0 29 0;
+#X connect 28 0 17 0;
+#X connect 28 0 16 0;
+#X connect 29 0 26 0;
+#X connect 29 0 30 0;
+#X connect 31 0 35 0;
+#X connect 32 0 36 1;
+#X connect 33 0 32 0;
+#X connect 34 0 37 1;
+#X connect 35 0 34 0;
+#X connect 36 0 18 1;
+#X connect 37 0 18 0;
+#X restore 37 -282 pd audio_player;
+#X obj 437 -92 change;
+#X obj 490 -92 change;
+#X obj 540 -92 change;
+#X obj 596 -92 change;
+#X obj 653 -92 change;
+#X obj 708 -92 change;
+#X obj 763 -92 change;
+#X obj 825 -92 change;
+#X obj 42 -92 change;
+#X obj 90 -92 change;
+#X obj 135 -92 change;
+#X obj 180 -92 change;
+#X obj 233 -92 change;
+#X obj 284 -92 change;
+#X obj 330 -92 change;
+#X obj 383 -92 change;
+#X obj 184 -302 inlet;
+#X obj 42 35 s \$0-c1;
+#X obj 90 -67 s \$0-c2;
+#X obj 135 -67 s \$0-c3;
+#X obj 180 -67 s \$0-c4;
+#X obj 233 -67 s \$0-c5;
+#X obj 284 -67 s \$0-c6;
+#X obj 383 41 s \$0-c8;
+#X obj 490 -67 s \$0-c10;
+#X obj 540 -67 s \$0-c11;
+#X obj 596 -67 s \$0-c12;
+#X obj 653 -67 s \$0-c13;
+#X obj 708 -67 s \$0-c14;
+#X obj 763 -67 s \$0-c15;
+#X obj 825 -67 s \$0-c16;
 #N canvas 1 104 1366 680 selector 0;
 #X obj 669 -356 loadbang;
 #X obj 221 455 outlet;
@@ -232,19 +244,18 @@
 #X connect 49 0 16 0;
 #X connect 50 0 31 0;
 #X connect 51 0 25 0;
-#X restore 37 -94 pd selector;
-#X obj 177 111 list split 16;
-#X obj 177 136 unpack f f f f f f f f f f f f f f f f;
-#X obj 35 352 << 8;
-#X obj 35 393 +;
-#X obj 81 359 t b f;
-#X obj 376 343 << 8;
-#X obj 376 384 +;
-#X obj 430 343 t b f;
-#X text 185 -46 c1 Vol c2 pan c3 folder c4 file c5 playback c6 Control
+#X restore 37 -342 pd selector;
+#X obj 184 -277 list split 16;
+#X obj 184 -252 unpack f f f f f f f f f f f f f f f f;
+#X obj 42 -36 << 8;
+#X obj 42 5 +;
+#X obj 88 -29 t b f;
+#X obj 383 -45 << 8;
+#X obj 383 -4 +;
+#X obj 437 -45 t b f;
+#X text 184 -336 c1 Vol c2 pan c3 folder c4 file c5 playback c6 Control
 c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
-#X obj 5 49 outlet;
-#X floatatom 163 425 5 0 0 0 - - -;
+#X obj 5 -199 outlet;
 #X connect 1 0 40 0;
 #X connect 2 0 25 0;
 #X connect 3 0 26 0;
@@ -254,7 +265,6 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
 #X connect 7 0 30 0;
 #X connect 8 0 31 0;
 #X connect 9 0 35 0;
-#X connect 9 0 43 0;
 #X connect 10 0 19 0;
 #X connect 11 0 20 0;
 #X connect 12 0 21 0;
@@ -291,4 +301,4 @@ c7 Volumen fino 8 Entry point Coarse 9 Entry point fine;
 #X connect 39 0 24 0;
 #X connect 40 0 39 0;
 #X connect 40 1 39 1;
-#X coords 0 665 1 664 0 0 0;
+#X coords 0 417 1 416 0 0 0;
diff --git a/libremediaserver/pd/pms-audio.pd b/libremediaserver/pd/pms-audio.pd
index 19499a9..00ce036 100644
--- a/libremediaserver/pd/pms-audio.pd
+++ b/libremediaserver/pd/pms-audio.pd
@@ -1,69 +1,60 @@
-#N canvas 475 220 838 622 10;
-#N canvas 341 118 1016 665 dmx 0;
-#X obj -7 437 list split;
-#X obj 99 444 list split;
-#X obj 50 385 - 1;
-#X obj 156 386 - 1;
-#X msg 613 211 close;
-#X obj 202 447 list split;
-#X obj 259 390 - 1;
-#X obj 308 446 list split;
-#X obj 365 367 - 1;
-#X obj 469 251 ola2pd;
-#X msg 391 201 universe \$1;
-#X msg 560 208 open;
-#X obj 21 520 outlet;
-#X obj 127 523 outlet;
-#X obj 230 523 outlet;
-#X obj 336 524 outlet;
-#X obj 434 457 list split;
-#X obj 491 378 - 1;
-#X obj 462 535 outlet;
-#X obj 558 448 list split;
-#X obj 615 369 - 1;
-#X obj 586 526 outlet;
-#X obj 675 449 list split;
-#X obj 744 353 - 1;
-#X obj 703 527 outlet;
-#X obj 800 445 list split;
-#X obj 857 366 - 1;
-#X obj 828 523 outlet;
-#X obj -7 379 spigot;
-#X obj 95 402 spigot;
-#X obj 204 397 spigot;
-#X obj 314 393 spigot;
-#X obj 421 395 spigot;
-#X obj 556 405 spigot;
-#X obj 672 407 spigot;
-#X obj 798 394 spigot;
-#X obj 64 236 r layer1;
-#X obj 389 152 r universe;
-#X obj 143 241 r layer2;
-#X obj 557 124 r ola;
-#X obj 224 240 r layer3;
-#X obj 309 240 r layer4;
-#X obj 484 312 r layer5;
-#X obj 635 291 r layer6;
-#X obj 727 294 r layer7;
-#X obj 833 281 r layer8;
-#X obj 21 479 list split 32;
-#X obj 127 482 list split 32;
-#X obj 230 482 list split 32;
-#X obj 336 483 list split 32;
-#X obj 462 494 list split 32;
-#X obj 586 485 list split 32;
-#X obj 703 486 list split 32;
-#X obj 828 482 list split 32;
-#X floatatom 319 191 5 0 0 0 - - -;
-#X floatatom 655 182 5 0 0 0 - - -;
-#X obj 522 204 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 690 221 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 560 178 select 1;
-#X obj 420 326 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X floatatom 2 572 5 0 0 0 - - -;
+#N canvas 577 140 838 411 10;
+#N canvas 339 126 1016 356 dmx 0;
+#X obj -7 -49 list split;
+#X obj 99 -57 list split;
+#X obj 50 -79 - 1;
+#X obj 156 -78 - 1;
+#X msg 552 -264 close;
+#X obj 202 -53 list split;
+#X obj 259 -74 - 1;
+#X obj 308 -76 list split;
+#X obj 365 -97 - 1;
+#X obj 469 -213 ola2pd;
+#X msg 420 -263 universe \$1;
+#X msg 507 -265 open;
+#X obj 21 -1 outlet;
+#X obj 127 2 outlet;
+#X obj 230 3 outlet;
+#X obj 336 -32 outlet;
+#X obj 427 -46 list split;
+#X obj 484 -86 - 1;
+#X obj 455 2 outlet;
+#X obj 558 -38 list split;
+#X obj 615 -95 - 1;
+#X obj 586 6 outlet;
+#X obj 675 -37 list split;
+#X obj 744 -111 - 1;
+#X obj 703 7 outlet;
+#X obj 800 -41 list split;
+#X obj 857 -98 - 1;
+#X obj 828 3 outlet;
+#X obj -7 -80 spigot;
+#X obj 99 -79 spigot;
+#X obj 202 -73 spigot;
+#X obj 308 -96 spigot;
+#X obj 427 -69 spigot;
+#X obj 558 -59 spigot;
+#X obj 675 -57 spigot;
+#X obj 800 -70 spigot;
+#X obj 50 -228 r layer1;
+#X obj 420 -285 r universe;
+#X obj 156 -223 r layer2;
+#X obj 507 -305 r ola;
+#X obj 259 -224 r layer3;
+#X obj 365 -224 r layer4;
+#X obj 484 -152 r layer5;
+#X obj 615 -173 r layer6;
+#X obj 744 -170 r layer7;
+#X obj 833 -183 r layer8;
+#X obj 21 -22 list split 32;
+#X obj 127 -19 list split 32;
+#X obj 230 -18 list split 32;
+#X obj 336 -53 list split 32;
+#X obj 455 -20 list split 32;
+#X obj 586 -15 list split 32;
+#X obj 703 -14 list split 32;
+#X obj 828 -18 list split 32;
+#X obj 507 -285 select 1;
 #X connect 0 1 46 0;
 #X connect 1 1 47 0;
 #X connect 2 0 0 1;
@@ -81,7 +72,6 @@
 #X connect 9 0 33 0;
 #X connect 9 0 34 0;
 #X connect 9 0 35 0;
-#X connect 9 0 59 0;
 #X connect 10 0 9 0;
 #X connect 11 0 9 0;
 #X connect 16 1 50 0;
@@ -103,15 +93,13 @@
 #X connect 36 0 2 0;
 #X connect 36 0 28 1;
 #X connect 37 0 10 0;
-#X connect 37 0 54 0;
 #X connect 38 0 29 1;
 #X connect 38 0 3 0;
-#X connect 39 0 55 0;
-#X connect 39 0 58 0;
-#X connect 40 0 30 0;
+#X connect 39 0 54 0;
 #X connect 40 0 6 0;
-#X connect 41 0 31 0;
+#X connect 40 0 30 1;
 #X connect 41 0 8 0;
+#X connect 41 0 31 1;
 #X connect 42 0 32 1;
 #X connect 42 0 17 0;
 #X connect 43 0 33 1;
@@ -121,7 +109,6 @@
 #X connect 45 0 26 0;
 #X connect 45 0 35 1;
 #X connect 46 0 12 0;
-#X connect 46 0 60 0;
 #X connect 47 0 13 0;
 #X connect 48 0 14 0;
 #X connect 49 0 15 0;
@@ -129,97 +116,96 @@
 #X connect 51 0 21 0;
 #X connect 52 0 24 0;
 #X connect 53 0 27 0;
-#X connect 58 0 11 0;
-#X connect 58 0 56 0;
-#X connect 58 1 4 0;
-#X connect 58 1 57 0;
-#X coords 0 665 1 664 1 1 0;
-#X restore -23 245 pd dmx;
-#X obj -249 348 layer_audio;
-#X msg 433 64 \; pd dsp 1;
-#X msg 509 64 \; pd dsp 0;
-#X obj 431 -3 loadbang;
-#X msg -249 380 send 1 \$1;
-#X obj -16 560 netsend;
-#X msg -136 387 send 2 \$1;
-#X msg -22 390 send 3 \$1;
-#X msg 75 392 send 4 \$1;
-#X msg 163 389 send 5 \$1;
-#X msg 255 393 send 6 \$1;
-#X msg 354 395 send 7 \$1;
-#X msg 448 395 send 8 \$1;
-#X obj 373 459 loadbang;
-#X obj 373 481 delay 50;
-#X msg 373 503 send 0;
-#X msg 203 482 connect localhost 9198;
+#X connect 54 0 11 0;
+#X connect 54 1 4 0;
+#X coords 0 356 1 355 1 1 0;
+#X restore -23 190 pd dmx;
+#X obj -249 248 layer_audio;
+#X msg 286 42 \; pd dsp 1;
+#X obj 286 -3 loadbang;
+#X msg -249 267 send 1 \$1;
+#X obj -16 330 netsend;
+#X msg -176 266 send 2 \$1;
+#X msg -104 268 send 3 \$1;
+#X msg -31 267 send 4 \$1;
+#X msg 44 267 send 5 \$1;
+#X msg 118 267 send 6 \$1;
+#X msg 191 269 send 7 \$1;
+#X msg 267 267 send 8 \$1;
+#X obj 484 243 loadbang;
+#X obj 484 265 delay 50;
+#X msg 484 287 send 0;
+#X msg 338 266 connect localhost 9198;
 #X obj 81 -30 netreceive 9197;
-#X obj -124 3 unpack f f s;
-#X obj -220 158 float;
-#X obj -221 187 s layer1;
-#X obj -153 155 float;
-#X obj -80 151 float;
-#X obj 0 155 float;
-#X obj 84 151 float;
-#X obj 156 149 float;
-#X obj 232 147 float;
-#X obj 309 145 float;
-#X obj 385 145 float;
-#X obj 464 142 float;
-#X obj -154 184 s layer2;
-#X obj -81 180 s layer3;
-#X obj -1 184 s layer4;
-#X obj 83 180 s layer5;
-#X obj 155 178 s layer6;
-#X obj 231 176 s layer7;
-#X obj 308 174 s layer8;
-#X obj 384 174 s ola;
-#X obj 463 171 s universe;
-#X obj 184 28 s path;
-#X obj -9 75 select 11 12 13 14 15 16 17 18 20 21;
-#X obj -36 346 layer_audio;
-#X obj 52 349 layer_audio;
-#X obj 141 354 layer_audio;
-#X obj -141 344 layer_audio;
-#X obj 237 350 layer_audio;
-#X obj 336 340 layer_audio;
-#X obj 434 337 layer_audio;
-#X obj 427 34 delay 500;
+#X obj 81 3 unpack f f s;
+#X obj -247 138 float;
+#X obj -247 158 s layer1;
+#X obj -192 137 float;
+#X obj -137 138 float;
+#X obj -82 139 float;
+#X obj -26 138 float;
+#X obj 29 139 float;
+#X obj 84 140 float;
+#X obj 140 140 float;
+#X obj 195 141 float;
+#X obj 234 140 float;
+#X obj -192 157 s layer2;
+#X obj -137 157 s layer3;
+#X obj -82 158 s layer4;
+#X obj -26 158 s layer5;
+#X obj 29 159 s layer6;
+#X obj 84 160 s layer7;
+#X obj 140 160 s layer8;
+#X obj 195 161 s ola;
+#X obj 234 160 s universe;
+#X obj 150 29 s path;
+#X obj -247 75 select 11 12 13 14 15 16 17 18 20 21;
+#X obj -104 247 layer_audio;
+#X obj -31 247 layer_audio;
+#X obj 44 247 layer_audio;
+#X obj -176 247 layer_audio;
+#X obj 118 247 layer_audio;
+#X obj 191 247 layer_audio;
+#X obj 265 247 layer_audio;
+#X obj 286 20 delay 500;
 #X connect 0 0 1 0;
-#X connect 0 1 45 0;
-#X connect 0 2 42 0;
-#X connect 0 3 43 0;
-#X connect 0 4 44 0;
-#X connect 0 5 46 0;
-#X connect 0 6 47 0;
-#X connect 0 7 48 0;
-#X connect 4 0 49 0;
-#X connect 5 0 6 0;
-#X connect 7 0 6 0;
-#X connect 8 0 6 0;
-#X connect 9 0 6 0;
-#X connect 10 0 6 0;
-#X connect 11 0 6 0;
-#X connect 12 0 6 0;
-#X connect 13 0 6 0;
+#X connect 0 1 44 0;
+#X connect 0 2 41 0;
+#X connect 0 3 42 0;
+#X connect 0 4 43 0;
+#X connect 0 5 45 0;
+#X connect 0 6 46 0;
+#X connect 0 7 47 0;
+#X connect 1 0 4 0;
+#X connect 3 0 48 0;
+#X connect 4 0 5 0;
+#X connect 6 0 5 0;
+#X connect 7 0 5 0;
+#X connect 8 0 5 0;
+#X connect 9 0 5 0;
+#X connect 10 0 5 0;
+#X connect 11 0 5 0;
+#X connect 12 0 5 0;
+#X connect 13 0 14 0;
+#X connect 13 0 16 0;
 #X connect 14 0 15 0;
-#X connect 14 0 17 0;
-#X connect 15 0 16 0;
-#X connect 16 0 6 0;
-#X connect 17 0 6 0;
-#X connect 18 0 19 0;
-#X connect 19 0 41 0;
-#X connect 19 1 20 1;
-#X connect 19 1 22 1;
-#X connect 19 1 23 1;
-#X connect 19 1 24 1;
-#X connect 19 1 25 1;
-#X connect 19 1 26 1;
-#X connect 19 1 27 1;
-#X connect 19 1 28 1;
-#X connect 19 1 29 1;
-#X connect 19 1 30 1;
-#X connect 19 2 40 0;
-#X connect 20 0 21 0;
+#X connect 15 0 5 0;
+#X connect 16 0 5 0;
+#X connect 17 0 18 0;
+#X connect 18 0 40 0;
+#X connect 18 1 19 1;
+#X connect 18 1 21 1;
+#X connect 18 1 22 1;
+#X connect 18 1 23 1;
+#X connect 18 1 24 1;
+#X connect 18 1 25 1;
+#X connect 18 1 26 1;
+#X connect 18 1 27 1;
+#X connect 18 1 28 1;
+#X connect 18 1 29 1;
+#X connect 18 2 39 0;
+#X connect 19 0 20 0;
+#X connect 21 0 30 0;
 #X connect 22 0 31 0;
 #X connect 23 0 32 0;
 #X connect 24 0 33 0;
@@ -228,15 +214,21 @@
 #X connect 27 0 36 0;
 #X connect 28 0 37 0;
 #X connect 29 0 38 0;
-#X connect 30 0 39 0;
-#X connect 41 0 20 0;
-#X connect 41 1 22 0;
-#X connect 41 2 23 0;
-#X connect 41 3 24 0;
-#X connect 41 4 25 0;
-#X connect 41 5 26 0;
-#X connect 41 6 27 0;
-#X connect 41 7 28 0;
-#X connect 41 8 29 0;
-#X connect 41 9 30 0;
-#X connect 49 0 2 0;
+#X connect 40 0 19 0;
+#X connect 40 1 21 0;
+#X connect 40 2 22 0;
+#X connect 40 3 23 0;
+#X connect 40 4 24 0;
+#X connect 40 5 25 0;
+#X connect 40 6 26 0;
+#X connect 40 7 27 0;
+#X connect 40 8 28 0;
+#X connect 40 9 29 0;
+#X connect 41 0 7 0;
+#X connect 42 0 8 0;
+#X connect 43 0 9 0;
+#X connect 44 0 6 0;
+#X connect 45 0 10 0;
+#X connect 46 0 11 0;
+#X connect 47 0 12 0;
+#X connect 48 0 2 0;
diff --git a/libremediaserver/pd/pms-video.pd b/libremediaserver/pd/pms-video.pd
index 15601ea..a1b853a 100644
--- a/libremediaserver/pd/pms-video.pd
+++ b/libremediaserver/pd/pms-video.pd
@@ -1,4 +1,4 @@
-#N canvas 773 508 611 318 10;
+#N canvas 806 522 611 318 10;
 #N canvas 315 169 952 599 dmx 0;
 #X obj -7 437 list split;
 #X obj 99 444 list split;
@@ -649,14 +649,14 @@
 #X obj -364 -297 r textgui;
 #X obj -476 -294 r preview;
 #X msg -407 -294 0;
-#X text -384 -470 (c) 2012 Santi Noreña libremediaserver@gmail.com
-GPL License;
 #X obj -476 -236 pix2jpg;
+#X text -384 -470 (c) 2012-2013 Santi Noreña libremediaserver@gmail.com
+GPL License;
 #X connect 5 0 16 0;
 #X connect 5 0 19 0;
 #X connect 14 0 15 0;
 #X connect 16 0 14 0;
 #X connect 17 0 6 0;
-#X connect 18 0 21 0;
+#X connect 18 0 20 0;
 #X connect 19 0 6 0;
 #X coords 0 0 1 1 85 60 0;
diff --git a/libremediaserver/scripts/install_precise.sh b/libremediaserver/scripts/install_precise.sh
index 4fa93b2..41b54c2 100644
--- a/libremediaserver/scripts/install_precise.sh
+++ b/libremediaserver/scripts/install_precise.sh
@@ -18,7 +18,7 @@ if [ "$output" -eq "0" ]; then
 	echo "deb http://apt.openlighting.org/debian/ precise main" >> /etc/apt/sources.list
 fi
 apt-get update
-apt-get -y --force-yes install ola puredata tcl tklibqtcore4 libqtgui4
+apt-get -y --force-yes install ola puredata tcl tk libqtcore4 libqtgui4 libmacgick++4 libav-tools 
 if [ "$?" -eq "0" ]; then 
 	echo "apt-get finish ok"
 	else "apt-get return errors!"