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

Cleaned old code. Changed the GUI refresh. Now there is a global receive

Browse source 
dmx instead one by layer
This commit is contained in:
santi 2014-08-13 22:51:25 +02:00
parent 90f3b093c0
commit d7db568784
10 changed files with 78 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/audiolayerwidget.cpp
View file

@ -7,14 +7,14 @@
#include <QFile>
#include <QTime>
#include <time.h> // nanosleep y la chapuza de liberar el buffer
//#include <time.h> // nanosleep y la chapuza de liberar el buffer
AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
QGroupBox(parent)
, m_suspendResumeButton(0)
, m_watchDMX(new QTimer(this))
, m_progressCounter(new QTime(0,0,0,1))
, m_progressMs(0)
// , m_progressCounter(new QTime(0,0,0,1))
// , m_progressMs(0)
, m_currentMedia(" ")
, m_running(false)
{
@ -26,9 +26,9 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
m_statusLabel = new QLabel;
m_statusLabel->setText(STATUS_LABEL);
m_statusValue = new QLabel;
m_receiveDMX = new QCheckBox("Receiving DMX", this);
m_receiveDMX->setChecked(false);
status->addWidget(m_receiveDMX);
// m_receiveDMX = new QCheckBox("Receiving DMX", this);
// m_receiveDMX->setChecked(false);
// status->addWidget(m_receiveDMX);
status->addWidget(m_statusLabel);
status->addWidget(m_statusValue);
layout->addLayout(status);
@ -37,7 +37,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
m_folderLabel = new QLabel;
m_folderLabel->setText(FOLDER_LABEL);
m_folderValue = new QLabel;
m_folderValue->setMaximumWidth(250);
m_folderValue->setMaximumWidth(200);
folderLoaded->addWidget(m_folderLabel);
folderLoaded->addWidget(m_folderValue);
layout->addLayout(folderLoaded);
@ -46,7 +46,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
m_fileLabel = new QLabel;
m_fileLabel->setText(FILE_LABEL);
m_fileValue = new QLabel;
m_fileValue->setMaximumWidth(250);
m_fileValue->setMaximumWidth(200);
fileLoaded->addWidget(m_fileLabel);
fileLoaded->addWidget(m_fileValue);
layout->addLayout(fileLoaded);
@ -102,7 +102,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
connect(m_watchDMX, SIGNAL(timeout()),
this, SLOT(watchDMXExpired()));
m_watchDMX->start(123);
m_watchDMX->start(243);
}
AudioLayerWidget::~AudioLayerWidget()
@ -141,7 +141,7 @@ void AudioLayerWidget::loadMedia(QString file)
}
m_music.setAttenuation(0);
m_progressCounter->restart();
// m_progressCounter->restart();
durationChanged(m_music.getDuration().asMilliseconds());
fileLoaded(file);
@ -160,15 +160,15 @@ void AudioLayerWidget::fileLoaded(QString file)
m_folderValue->setText(list.at(size - 2));
m_fileValue->setText(list.at(size - 1));
}
m_progressMs = 0;
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
// m_progressMs = 0;
// m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
}
/*
void AudioLayerWidget::notified()
{
}
*/
// duration in miliseconds
void AudioLayerWidget::durationChanged(qint64 dur)
{
@ -179,13 +179,13 @@ void AudioLayerWidget::durationChanged(qint64 dur)
void AudioLayerWidget::play()
{
m_music.play();
m_progressCounter->restart();
// m_progressCounter->restart();
}
void AudioLayerWidget::pause()
{
m_music.pause();
m_progressCounter->restart();
// m_progressCounter->restart();
}
void AudioLayerWidget::stop()
@ -194,34 +194,45 @@ void AudioLayerWidget::stop()
}
void AudioLayerWidget::watchDMXExpired() {
m_receiveDMX->setChecked(false);
// m_receiveDMX->setChecked(false);
int progress;
switch (m_music.getStatus()) {
case sf::SoundSource::Playing:
m_progressMs += m_progressCounter->restart();
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
// m_progressMs += m_progressCounter->restart();
progress = m_music.getPlayingOffset().asMilliseconds();
m_progressSlider->setValue(progress);
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(progress));
m_statusValue->setText(PLAY_LABEL);
m_progressSlider->setValue(m_progressMs);
m_suspendResumeButton->setText(tr(PLAY_LABEL));
break;
case sf::SoundSource::Paused:
m_statusValue->setText(PAUSE_LABEL);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
break;
case sf::SoundSource::Stopped:
m_progressCounter->restart();
m_progressMs = 0;
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
// m_progressCounter->restart();
// m_progressMs = 0;
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(0));
m_statusValue->setText(STOP_LABEL);
m_progressSlider->setValue(m_progressMs);
m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
m_progressSlider->setValue(0);
break;
}
}
/*
void AudioLayerWidget::updateWatchDMX(bool b)
{
m_receiveDMX->setChecked(b);
// m_receiveDMX->setChecked(b);
}
*/
void AudioLayerWidget::toggleSuspendResume()
{
if (m_music.getStatus() == sf::SoundSource::Playing) {
m_music.pause();
// m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
} else {
m_music.play();
// m_suspendResumeButton->setText(tr(PLAY_LABEL));
}
}