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

fixed bug not resetting audio buffer in load and play

Browse source
This commit is contained in:
Santi Noreña 2014-07-13 20:12:32 +02:00
parent 7f9152b267
commit ad89b51aa3
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lms-audio.xlm
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<dmxSettings fileVersion="1" layersNumber="4" path="/home/santi/lo_que_vio_el_mayordomo/sound" universeNumber="1"> <dmxSettings fileVersion="1" layersNumber="3" path="/home/santi/lo_que_vio_el_mayordomo/sound" universeNumber="1">
<layer0 dmx="1" universe="1" /> <layer0 dmx="1" universe="1" />
<layer1 dmx="21" universe="1" /> <layer1 dmx="21" universe="1" />
<layer2 dmx="41" universe="1" /> <layer2 dmx="41" universe="1" />

5
src/audiolayerwidget.cpp
View file

@ -53,6 +53,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
m_folderLabel = new QLabel; m_folderLabel = new QLabel;
m_folderLabel->setText(FOLDER_LABEL); m_folderLabel->setText(FOLDER_LABEL);
m_folderValue = new QLabel; m_folderValue = new QLabel;
m_folderValue->setMaximumWidth(250);
folderLoaded->addWidget(m_folderLabel); folderLoaded->addWidget(m_folderLabel);
folderLoaded->addWidget(m_folderValue); folderLoaded->addWidget(m_folderValue);
layout->addLayout(folderLoaded); layout->addLayout(folderLoaded);
@ -61,6 +62,7 @@ AudioLayerWidget::AudioLayerWidget(QWidget *parent, QString name):
m_fileLabel = new QLabel; m_fileLabel = new QLabel;
m_fileLabel->setText(FILE_LABEL); m_fileLabel->setText(FILE_LABEL);
m_fileValue = new QLabel; m_fileValue = new QLabel;
m_fileValue->setMaximumWidth(250);
fileLoaded->addWidget(m_fileLabel); fileLoaded->addWidget(m_fileLabel);
fileLoaded->addWidget(m_fileValue); fileLoaded->addWidget(m_fileValue);
layout->addLayout(fileLoaded); layout->addLayout(fileLoaded);
@ -186,8 +188,8 @@ void AudioLayerWidget::loadMedia(QString file)
{ {
if (m_currentMedia == file) if (m_currentMedia == file)
return; return;
reset();
if (QFile::exists(file)){ if (QFile::exists(file)){
reset();
m_decoder->loadMedia(file); m_decoder->loadMedia(file);
m_currentMedia = file; m_currentMedia = file;
fileLoaded(file); fileLoaded(file);
@ -314,6 +316,7 @@ void AudioLayerWidget::reset()
void AudioLayerWidget::setInitPosition() void AudioLayerWidget::setInitPosition()
{ {
// m_buffer.clear();
m_decoder->setPos(0); m_decoder->setPos(0);
m_progressMs = 0; m_progressMs = 0;
m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs)); m_progressTime->setTime(QTime::fromMSecsSinceStartOfDay(m_progressMs));

6
src/libremediaserver-audio.ui
View file

@ -7,8 +7,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>745</width> <width>60</width>
<height>636</height> <height>57</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,7 +20,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>745</width> <width>60</width>
<height>29</height> <height>29</height>
</rect> </rect>
</property> </property>