From 6e268323d2a2c34048dee532cef0481f10267270 Mon Sep 17 00:00:00 2001
From: santi <belfegor@gmail.com>
Date: Fri, 4 Jul 2014 12:42:10 +0200
Subject: [PATCH] Fixed bug in pan channel

---
 puredata/layer_audio.pd        | 34 +++++++++++++++++-----------------
 src/libremediaserver-audio.cpp | 13 +++++++------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/puredata/layer_audio.pd b/puredata/layer_audio.pd
index ad7da1b..fa44c35 100755
--- a/puredata/layer_audio.pd
+++ b/puredata/layer_audio.pd
@@ -1,5 +1,5 @@
-#N canvas 74 160 904 466 10;
-#N canvas 1064 252 547 527 audio_player 1;
+#N canvas 70 180 904 466 10;
+#N canvas 1132 494 547 527 audio_player 1;
 #X msg 203 93 start;
 #X msg 259 95 stop;
 #X obj 119 140 oggread~;
@@ -17,7 +17,6 @@
 #X msg 119 101 seek \$1;
 #X obj 119 36 r \$0-c8;
 #X obj 119 67 * 0.01;
-#X obj 117 309 expr 1-$f1;
 #X obj 210 358 line~;
 #X msg 210 337 \$1 1;
 #X obj 117 350 line~;
@@ -28,36 +27,37 @@
 #X obj 333 386 outlet;
 #X obj 333 347 int;
 #X obj 335 305 * 100;
+#X obj 117 297 1 - \$1;
 #X connect 0 0 2 0;
 #X connect 1 0 2 0;
 #X connect 2 0 6 0;
 #X connect 2 1 7 0;
-#X connect 2 2 24 0;
+#X connect 2 2 23 0;
 #X connect 3 0 2 0;
 #X connect 4 0 2 0;
 #X connect 5 0 13 0;
-#X connect 6 0 23 0;
-#X connect 7 0 22 0;
+#X connect 6 0 22 0;
+#X connect 7 0 21 0;
 #X connect 9 0 7 1;
 #X connect 9 0 6 1;
-#X connect 9 0 27 0;
-#X connect 10 0 17 0;
-#X connect 10 0 19 0;
+#X connect 9 0 26 0;
+#X connect 10 0 18 0;
+#X connect 10 0 27 0;
 #X connect 13 0 0 0;
 #X connect 13 1 1 0;
 #X connect 13 2 3 0;
 #X connect 14 0 2 0;
 #X connect 15 0 16 0;
 #X connect 16 0 14 0;
-#X connect 17 0 21 0;
-#X connect 18 0 22 1;
-#X connect 19 0 18 0;
-#X connect 20 0 23 1;
-#X connect 21 0 20 0;
-#X connect 22 0 8 1;
-#X connect 23 0 8 0;
+#X connect 17 0 21 1;
+#X connect 18 0 17 0;
+#X connect 19 0 22 1;
+#X connect 20 0 19 0;
+#X connect 21 0 8 1;
+#X connect 22 0 8 0;
+#X connect 25 0 24 0;
 #X connect 26 0 25 0;
-#X connect 27 0 26 0;
+#X connect 27 0 20 0;
 #X restore 219 -234 pd audio_player;
 #X obj 19 -18 s \$0-c1;
 #X obj 79 -19 s \$0-c2;
diff --git a/src/libremediaserver-audio.cpp b/src/libremediaserver-audio.cpp
index 3b43582..c73288d 100755
--- a/src/libremediaserver-audio.cpp
+++ b/src/libremediaserver-audio.cpp
@@ -195,7 +195,7 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
 //    qDebug() << tr("olaInterface|") << "newdmx layer" << layer << "channel" << channel << "value" << value;
     QString mediaFile = NULL;
     int aux;
-    float vol;
+    float f;
     switch(channel){
     case DMX_FOLDER:// Folder
         aux = ola->getValue(layer, DMX_FILE);
@@ -210,15 +210,16 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
             AudioMotor::getInstance()->load(layer, mediaFile);
         break;
     case VOLUME_COARSE:
-        vol = ( value * 0x100 ) + ola->getValue(layer, VOLUME_FINE);
-        AudioMotor::getInstance()->setLayerVolume(layer, vol/65535);
+        f = ( value * 0x100 ) + ola->getValue(layer, VOLUME_FINE);
+        AudioMotor::getInstance()->setLayerVolume(layer, f/65535);
         break;
     case VOLUME_FINE:
-        vol = ( ola->getValue(layer, VOLUME_COARSE) * 0x100 ) + value;
-        AudioMotor::getInstance()->setLayerVolume(layer, vol/65535);
+        f = ( ola->getValue(layer, VOLUME_COARSE) * 0x100 ) + value;
+        AudioMotor::getInstance()->setLayerVolume(layer, f/65535);
         break;
     case PAN:
-        AudioMotor::getInstance()->setLayerPan(layer, value/255);
+        f = (float)value / 255;
+        AudioMotor::getInstance()->setLayerPan(layer, f );
         break;
     case PLAYBACK:
         aux = value / 25;