diff options
Diffstat (limited to 'src/plugins/Output')
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/settingsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Output/oss/outputoss.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 2c49056da..f8135f3f0 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -38,7 +38,7 @@ OutputALSA::OutputALSA() : m_inited(false) QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString dev_name = settings.value("ALSA/device","default").toString(); m_use_mmap = settings.value("ALSA/use_mmap", false).toBool(); - pcm_name = strdup(dev_name.toAscii().data()); + pcm_name = strdup(dev_name.toLatin1().data()); pcm_handle = 0; m_prebuf = 0; m_prebuf_size = 0; @@ -449,7 +449,7 @@ int VolumeALSA::setupMixer(QString card, QString device) if ((err = getMixer(&m_mixer, card)) < 0) return err; - parseMixerName(device.toAscii().data(), &name, &index); + parseMixerName(device.toLatin1().data(), &name, &index); pcm_element = getMixerElem(m_mixer, name, index); @@ -536,7 +536,7 @@ int VolumeALSA::getMixer(snd_mixer_t **mixer, QString card) return -1; } - if ((err = snd_mixer_attach(*mixer, card.toAscii().constData())) < 0) + if ((err = snd_mixer_attach(*mixer, card.toLatin1().constData())) < 0) { qWarning("OutputALSA: Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err)); diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp index b30640000..89cdfe527 100644 --- a/src/plugins/Output/alsa/settingsdialog.cpp +++ b/src/plugins/Output/alsa/settingsdialog.cpp @@ -244,7 +244,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card) mixer = NULL; return -1; } - if ((err = snd_mixer_attach(*mixer, card.toAscii().constData())) < 0) + if ((err = snd_mixer_attach(*mixer, card.toLatin1().constData())) < 0) { qWarning("SettingsDialog (ALSA): alsa_get_mixer(): " "Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err)); diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp index 8b70a6e55..2431cd45a 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -72,7 +72,7 @@ void OutputOSS::sync() bool OutputOSS::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { - m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY); + m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY); if (m_audio_fd < 0) { @@ -215,7 +215,7 @@ void VolumeOSS::openMixer() { if (m_mixer_fd >= 0) return; - m_mixer_fd = open(m_mixer_device.toAscii(), O_RDWR); + m_mixer_fd = open(m_mixer_device.toLatin1(), O_RDWR); if (m_mixer_fd < 0) { qWarning("VolumeControlOSS: unable to open mixer device '%s'", qPrintable(m_mixer_device)); diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp index 0f4986fee..c8e45f4e9 100644 --- a/src/plugins/Output/oss4/outputoss4.cpp +++ b/src/plugins/Output/oss4/outputoss4.cpp @@ -108,7 +108,7 @@ void OutputOSS4::sync() bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { - m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY); + m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY); if (m_audio_fd < 0) { |
