← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/audio/sound/audiofile.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/src/audio/sound/audiofile.cpp
39
39
#include <sndfile.hh>
40
40
 
41
41
#include "audiofile.h"
42
 
#include "audio/samplerateconverter.h"
 
42
#include "audio/resampler.h"
43
43
#include "client/callmanager.h"
44
44
#include "manager.h"
45
45
 
118
118
    // get n "items", aka samples (not frames)
119
119
    fileHandle.read(interleaved, nbFrames * fileHandle.channels());
120
120
 
121
 
    AudioBuffer * buffer = new AudioBuffer(nbFrames, fileHandle.channels(), fileHandle.samplerate());
 
121
    AudioBuffer * buffer = new AudioBuffer(nbFrames, AudioFormat(fileHandle.samplerate(), fileHandle.channels()));
122
122
    buffer->deinterleave(interleaved, nbFrames, fileHandle.channels());
123
123
    delete [] interleaved;
124
124
 
125
125
    const int rate = static_cast<int32_t>(sampleRate);
126
126
 
127
127
    if (fileHandle.samplerate() != rate) {
128
 
        SamplerateConverter converter(std::max(fileHandle.samplerate(), rate), fileHandle.channels());
129
 
        AudioBuffer * resampled = new AudioBuffer(nbFrames, fileHandle.channels(), rate);
130
 
        converter.resample(*buffer, *resampled);
 
128
        Resampler resampler(std::max(fileHandle.samplerate(), rate), fileHandle.channels());
 
129
        AudioBuffer * resampled = new AudioBuffer(nbFrames, AudioFormat(rate, fileHandle.channels()));
 
130
        resampler.resample(*buffer, *resampled);
131
131
        delete buffer;
132
132
        delete buffer_;
133
133
        buffer_ = resampled;