← Back to branch summary

~ubuntu-branches/ubuntu/wily/kradio4/wily

« back to all changes in this revision

Viewing changes to plugins/alsa-sound/alsa-sounddevice-metadata.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Pino Toscano, Pino Toscano
  • Date: 2011-01-16 10:37:20 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110116103720-hdne9plqu6uek40k
Tags: 4.0.2-1
http://bugs.debian.org/609258
[ Pino Toscano ]
* QA upload.
* New upstream release. (Closes: #609258)
* Bring back and update the kradio4-convert-presents.1 man page.
* Update copyright.
* debian/rules: pass first the sequence to `dh', then the arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/alsa-sound/alsa-sounddevice-metadata.cpp
23
23
AlsaSoundDeviceMetaData::AlsaSoundDeviceMetaData(const QString &name, const QString &alsa_raw_description)
24
24
    : m_pcmDeviceName(name)
25
25
{
 
26
    IErrorLogClient::staticLogDebug("AlsaSoundDeviceMetaData::AlsaSoundDeviceMetaData: alsa device name: >>" + name + "<<");
 
27
    IErrorLogClient::staticLogDebug("AlsaSoundDeviceMetaData::AlsaSoundDeviceMetaData: alsa raw description: >>" + alsa_raw_description + "<<");
 
28
 
26
29
    QStringList descrlines = alsa_raw_description.trimmed().split("\n");
27
30
 
28
31
    if (descrlines.size() > 1) {
29
32
        QStringList devDescrList   = descrlines[0].trimmed().split(",");
30
33
        m_cardDescription          = devDescrList[0].trimmed();
31
 
        m_deviceDescription        = devDescrList[1].trimmed();
 
34
        m_deviceDescription        = devDescrList.size() > 1 ? devDescrList[1].trimmed() : QString::null;
32
35
        m_deviceVerboseDescription = descrlines[1].trimmed();
33
36
    } else {
34
37
        m_cardDescription          = QString::null;