quita el glitch al resproducir después de cargar un fichero.
varias optimizaciones y comprobaciones
This commit is contained in:
parent
db86987b6a
commit
0d29dda4c1
8 changed files with 66 additions and 71 deletions
|
|
@ -70,8 +70,7 @@ void libreMediaServerAudio::loadMedia(int layer, int folder, int file)
|
|||
if (strcmp(mediaFile.toLatin1().constData(), m_currentMedia[layer].toLatin1().constData()) == 0)
|
||||
return;
|
||||
if (QFile::exists(mediaFile)){
|
||||
m_mae.loadMedia(layer, mediaFile.toLatin1().data(),\
|
||||
m_dmxSettings.at(layer).audioDevice);
|
||||
m_mae.loadMedia(layer, mediaFile.toLatin1().data());
|
||||
m_currentMedia[layer] = mediaFile;
|
||||
#ifndef NOGUI
|
||||
if (m_ui)
|
||||
|
|
@ -135,7 +134,7 @@ void libreMediaServerAudio::dmxInput(int layer, int channel, int value)
|
|||
}
|
||||
#endif
|
||||
} else if (channel >= HP_FREQ) {
|
||||
m_mae.filterParamChanged(layer, m_dmxSettings.at(layer).audioDevice, channel, value);
|
||||
m_mae.filterParamChanged(layer, channel, value);
|
||||
#ifndef NOGUI
|
||||
if (m_ui) {
|
||||
m_lmsUi->m_aw->filterParamChanged(layer, channel, value);
|
||||
|
|
@ -252,10 +251,10 @@ void libreMediaServerAudio::uiSliderChanged(int layer, Slider s, int value)
|
|||
m_mae.setBypass(m_dmxSettings.at(layer).audioDevice, layer, value);
|
||||
break;
|
||||
case Slider::Bus1:
|
||||
m_mae.filterParamChanged(layer, m_dmxSettings.at(layer).audioDevice, SEND1, value / 255);
|
||||
m_mae.filterParamChanged(layer, SEND1, value / 255.0f);
|
||||
break;
|
||||
case Slider::Bus2:
|
||||
m_mae.filterParamChanged(layer, m_dmxSettings.at(layer).audioDevice, SEND2, value / 255);
|
||||
m_mae.filterParamChanged(layer, SEND2, value / 255.0f);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -278,7 +277,7 @@ void libreMediaServerAudio::uiLoadMedia(int layer, QString mediaFile)
|
|||
|
||||
if (strcmp(mediaFile.toLatin1().constData(), m_currentMedia[layer].toLatin1().constData()) == 0)
|
||||
return;
|
||||
result = m_mae.loadMedia(layer, mediaFile.toLatin1().data(), m_dmxSettings[layer].audioDevice);
|
||||
result = m_mae.loadMedia(layer, mediaFile.toLatin1().data());
|
||||
if (result == MA_SUCCESS) {
|
||||
m_currentMedia[layer] = mediaFile;
|
||||
m_lmsUi->m_aw->mediaLoaded(layer, mediaFile, m_mae.getDuration(layer));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue