Commit 01cd2631 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Re-enable SDL audio driver (add some Windows backends)

parent 4467161d
......@@ -650,11 +650,16 @@ void KdenliveSettingsDialog::initDevices()
{
// Fill audio drivers
m_configSdl.kcfg_audio_driver->addItem(i18n("Automatic"), QString());
#ifndef Q_WS_MAC
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS"), "dsp");
#if defined(Q_OS_WIN)
//TODO: i18n
m_configSdl.kcfg_audio_driver->addItem("DirectSound", "directsound");
m_configSdl.kcfg_audio_driver->addItem("WinMM", "winmm");
m_configSdl.kcfg_audio_driver->addItem("Wasapi", "wasapi");
#elif !defined(Q_WS_MAC)
m_configSdl.kcfg_audio_driver->addItem(i18n("ALSA"), "alsa");
m_configSdl.kcfg_audio_driver->addItem(i18n("PulseAudio"), "pulse");
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS with DMA access"), "dma");
m_configSdl.kcfg_audio_driver->addItem(i18n("PulseAudio"), "pulseaudio");
m_configSdl.kcfg_audio_driver->addItem(i18n("OSS"), "dsp");
//m_configSdl.kcfg_audio_driver->addItem(i18n("OSS with DMA access"), "dma");
m_configSdl.kcfg_audio_driver->addItem(i18n("Esound daemon"), "esd");
m_configSdl.kcfg_audio_driver->addItem(i18n("ARTS daemon"), "artsc");
#endif
......@@ -728,7 +733,7 @@ void KdenliveSettingsDialog::initDevices()
m_configSdl.kcfg_audio_backend->setCurrentIndex(ix);
KdenliveSettings::setAudio_backend(ix);
}
m_configSdl.group_sdl->setEnabled(KdenliveSettings::audiobackend().startsWith(QLatin1String("sdl_audio")));
m_configSdl.group_sdl->setEnabled(KdenliveSettings::audiobackend().startsWith(QLatin1String("sdl")));
loadCurrentV4lProfileInfo();
}
......
......@@ -1142,7 +1142,7 @@ int GLWidget::reconfigure()
}
int volume = KdenliveSettings::volume();
if (serviceName.startsWith(QLatin1String("sdl_audio"))) {
if (serviceName.startsWith(QLatin1String("sdl"))) {
QString audioDevice = KdenliveSettings::audiodevicename();
if (!audioDevice.isEmpty()) {
m_consumer->set("audio_device", audioDevice.toUtf8().constData());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment