LibreMediaServer/lms-audio
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed the audio library to SFML. Now working in qt5.3.2.

Browse source
This commit is contained in:
santi 2014-07-25 20:38:18 +02:00
parent 37835e7571
commit 1dd20c9b05
11 changed files with 143 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libremediaserver-audio.cpp
View file

@ -20,9 +20,6 @@
QTextEdit * libreMediaServerAudio::textEdit = 0;
/**
/ Constructor
*/
@ -70,13 +67,12 @@ libreMediaServerAudio::libreMediaServerAudio(QStringList args, QWidget *parent)
textEdit, SLOT(append(QString)), Qt::QueuedConnection);
*/
// Inicia el widget Master. No implementado todavía
/*
amw = new AudioMasterWidget(this);
QDockWidget *topWidget = new QDockWidget(tr("Master"), this);
topWidget->setAllowedAreas(Qt::TopDockWidgetArea);
topWidget->setWidget(amw);
addDockWidget(Qt::TopDockWidgetArea, topWidget);
*/
// Conectamos los menus
connect(ui.actionOpen_conf, SIGNAL(triggered()), this, SLOT(openFile()));
connect(ui.actionSave_conf, SIGNAL(triggered()), this, SLOT(saveFile()));
@ -196,7 +192,7 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
break;
case VOLUME_COARSE:
f = ( value * 0x100 ) + ola->getValue(layer, VOLUME_FINE);
aw->volChanged(layer, f / 65535);
aw->volChanged(layer, f / 655.35);
break;
case VOLUME_FINE:
f = ( ola->getValue(layer, VOLUME_COARSE) * 0x100 ) + value;
@ -211,13 +207,13 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
aux = value / 25;
switch (aux) {
case 0 :
aw->playbackChanged(layer, QAudio::ActiveState);
aw->playbackChanged(layer, Playing);
break;
case 1 :
aw->playbackChanged(layer, QAudio::StoppedState);
aw->playbackChanged(layer, Stopped);
break;
case 2 :
aw->playbackChanged(layer, QAudio::SuspendedState);
aw->playbackChanged(layer, Paused);
break;
}
default: