Fixed bug in pan channel
This commit is contained in:
parent
39a3c39582
commit
6e268323d2
2 changed files with 24 additions and 23 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue