Varias mejoras. Incluido settingsdialog, pero no funcional

This commit is contained in:
santi 2014-08-13 21:47:28 +02:00
parent 5612d10711
commit 90f3b093c0
12 changed files with 150 additions and 17 deletions

View file

@ -102,7 +102,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
connect(m_watchDMX, SIGNAL(timeout()),
this, SLOT(watchDMXExpired()));
m_watchDMX->start(200);
m_watchDMX->start(123);
}
AudioLayerWidget::~AudioLayerWidget()
@ -195,16 +195,12 @@ void AudioLayerWidget::stop()
void AudioLayerWidget::watchDMXExpired() {
m_receiveDMX->setChecked(false);
}
void AudioLayerWidget::updateWatchDMX(bool b)
{
m_receiveDMX->setChecked(b);
switch (m_music.getStatus()) {
case sf::SoundSource::Playing:
m_progressMs += m_progressCounter->restart();
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
m_statusValue->setText(PLAY_LABEL);
m_progressSlider->setValue(m_progressMs);
break;
case sf::SoundSource::Paused:
m_statusValue->setText(PAUSE_LABEL);
@ -214,10 +210,16 @@ void AudioLayerWidget::updateWatchDMX(bool b)
m_progressMs = 0;
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));
m_statusValue->setText(STOP_LABEL);
m_progressSlider->setValue(m_progressMs);
break;
}
}
void AudioLayerWidget::updateWatchDMX(bool b)
{
m_receiveDMX->setChecked(b);
}
void AudioLayerWidget::toggleSuspendResume()
{