diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 01:35:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 01:35:15 (GMT) |
| commit | 54cf827951ce95403f464c4b3351a32640836abf (patch) | |
| tree | f00778abd627e6e78bb87794416f5581c1e41d6f /src | |
| parent | f8ae6e9f9819023913699ca7370ea32ea8ab94b3 (diff) | |
| parent | c7eed5ccad051e4287693dda6dfaf7f7326620fd (diff) | |
| download | Qt-54cf827951ce95403f464c4b3351a32640836abf.zip Qt-54cf827951ce95403f464c4b3351a32640836abf.tar.gz Qt-54cf827951ce95403f464c4b3351a32640836abf.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioOutput always uses default output device
symbian: deploy 4.wav test file properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index cf3726b..afae8b7 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -84,8 +84,7 @@ QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioF resuming = false; opened = false; - QStringList list1 = QString(QLatin1String(device)).split(QLatin1String(":")); - m_device = QByteArray(list1.at(0).toLocal8Bit().constData()); + m_device = device; timer = new QTimer(this); connect(timer,SIGNAL(timeout()),SLOT(userFeed())); @@ -282,11 +281,11 @@ bool QAudioOutputPrivate::open() int count=0; unsigned int freakuency=settings.frequency(); - QString dev = QLatin1String(m_device.constData()); + QString dev = QString(QLatin1String(m_device.constData())); QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); if(dev.compare(QLatin1String("default")) == 0) { #if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) - dev = QLatin1String(devices.first().constData()); + dev = QLatin1String(devices.first()); #else dev = QLatin1String("hw:0,0"); #endif |