From 501a20123427698e3c078583816804f4befb82ad Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 3 Jan 2017 19:50:58 +0000 Subject: replaced toAscii by toLatin1 git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6933 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/alsa/outputalsa.cpp | 6 +++--- src/plugins/Output/alsa/settingsdialog.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/Output/alsa') 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)); -- cgit v1.2.3-13-gbd6f