← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily-proposed

« back to all changes in this revision

Viewing changes to daemon/test/audiolayertest.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/test/audiolayertest.cpp
72
72
 
73
73
    for (int i = 0; i < 2; i++) {
74
74
        DEBUG("iter - %i", i);
75
 
        Manager::instance().switchAudioManager();
 
75
        if (wasAlsa)
 
76
            Manager::instance().setAudioManager(PULSEAUDIO_API_STR);
 
77
        else
 
78
            Manager::instance().setAudioManager(ALSA_API_STR);
76
79
 
77
80
        if (wasAlsa)
78
81
            CPPUNIT_ASSERT(dynamic_cast<PulseLayer*>(Manager::instance().getAudioDriver()));
90
93
    TITLE();
91
94
 
92
95
    if (dynamic_cast<AlsaLayer*>(Manager::instance().getAudioDriver())) {
93
 
        Manager::instance().switchAudioManager();
 
96
        Manager::instance().setAudioManager(PULSEAUDIO_API_STR);
94
97
        const struct timespec req = {0, 100000000};
95
98
        nanosleep(&req, 0);
96
99
    }