← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/pci/emu10k1/emumixer.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/pci/emu10k1/emumixer.c
1729
1729
                "Master Mono Playback Volume",
1730
1730
                "PCM Out Path & Mute",
1731
1731
                "Mono Output Select",
1732
 
                "Front Playback Switch",
1733
 
                "Front Playback Volume",
1734
1732
                "Surround Playback Switch",
1735
1733
                "Surround Playback Volume",
1736
1734
                "Center Playback Switch",
1879
1877
                                emu->rear_ac97 = 1;
1880
1878
                                snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
1881
1879
                                snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
 
1880
                                remove_ctl(card,"Front Playback Volume");
 
1881
                                remove_ctl(card,"Front Playback Switch");
1882
1882
                        }
1883
1883
                        /* remove unused AC97 controls */
1884
1884
                        snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
1913
1913
        for (; *c; c += 2)
1914
1914
                rename_ctl(card, c[0], c[1]);
1915
1915
 
 
1916
        if (emu->card_capabilities->subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */
 
1917
                remove_ctl(card, "Center Playback Volume");
 
1918
                remove_ctl(card, "LFE Playback Volume");
 
1919
                remove_ctl(card, "Wave Center Playback Volume");
 
1920
                remove_ctl(card, "Wave LFE Playback Volume");
 
1921
        }
1916
1922
        if (emu->card_capabilities->subsystem == 0x20071102) {  /* Audigy 4 Pro */
1917
1923
                rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");
1918
1924
                rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");