← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdemultimedia/maverick-proposed

« back to all changes in this revision

Viewing changes to kmix/mixer_alsa9.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-05-25 08:30:50 UTC
  • mfrom: (1.2.43 upstream)
  • Revision ID: james.westby@ubuntu.com-20100525083050-8o3otjqjwsnzjb6h
Tags: 4:4.4.80-0ubuntu1
* New upstream beta release:
  - Bump kde-sc-dev-latest to 4.4.80
  - Update various .install files
  - Refresh all patches
  - Add build-depends on libswscale-dev, libavcodec-dev, and libavformat-dev
    for new video thumbnailer backends
  - Add a new ffmpegthumbs package for the new video thumbnailer
* Switch to source format 3.0 (quilt):
  - Bump debhelper build-depend version to 7.3.16 or greater

Show diffs side-by-side

added added

removed removed

Lines of Context:
kmix/mixer_alsa9.cpp
106
106
   if (name.contains("mic"        , Qt::CaseInsensitive)) return MixDevice::MICROPHONE;
107
107
   if (name.contains("lfe"        , Qt::CaseInsensitive)) return MixDevice::SURROUND_LFE;
108
108
   if (name.contains("monitor"    , Qt::CaseInsensitive)) return MixDevice::RECMONITOR;
109
 
   if (name.contains("3d"         , Qt::CaseInsensitive)) return MixDevice::SURROUND;  // Should be probably some own icon
 
109
   if (name.contains("3d"         , Qt::CaseInsensitive)) return MixDevice::SURROUND;
 
110
   if (name.contains("side"       , Qt::CaseInsensitive)) return MixDevice::SURROUND_BACK;
110
111
 
111
112
   return MixDevice::EXTERNAL;
112
113
}
420
421
    }
421
422
 
422
423
 
423
 
    // Chek if this control has at least one volume control
 
424
    // Check if this control has at least one volume control
424
425
    bool hasVolume = (chn != Volume::MNONE);
425
426
 
426
 
    // Chek if a appropriate switch is present (appropriate means, based o nthe "capture" parameer)
 
427
    // Check if a appropriate switch is present (appropriate means, based o nthe "capture" parameer)
427
428
    bool hasCommonSwitch = snd_mixer_selem_has_common_switch ( elem );
428
429
 
429
430
    bool hasSwitch = hasCommonSwitch |
732
733
    } // has playback volume
733
734
 
734
735
    // --- playback switch
 
736
    // TODO: What about has_common_switch()
735
737
    if ( snd_mixer_selem_has_playback_switch( elem ) )
736
738
    {
737
739
        snd_mixer_selem_get_playback_switch( elem, SND_MIXER_SCHN_FRONT_LEFT, &elem_sw );
765
767
    } // has capture volume
766
768
 
767
769
    // --- capture switch
 
770
    // TODO: What about has_common_switch()
768
771
    if ( snd_mixer_selem_has_capture_switch( elem ) )
769
772
    {
770
773
        snd_mixer_selem_get_capture_switch( elem, SND_MIXER_SCHN_FRONT_LEFT, &elem_sw );