diff options
author | Tuukka Pasanen <tuukka.pasanen@ilmi.fi> | 2015-07-20 21:19:59 +0300 |
---|---|---|
committer | Tuukka Pasanen <tuukka.pasanen@ilmi.fi> | 2015-07-20 21:19:59 +0300 |
commit | b92805c5e31420b3f5daf1df3fabbe59c5a19538 (patch) | |
tree | 9e36e352abd78df21a4e52b74f5ec2cc4f3599f2 /src/sources/soundsourceffmpeg.h | |
parent | 0578f3c952072fab7b8dd9ada4ce96c6cf719dc1 (diff) |
Now FFMPEG follows Mixxx code style and merges cleanly
Diffstat (limited to 'src/sources/soundsourceffmpeg.h')
-rw-r--r-- | src/sources/soundsourceffmpeg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sources/soundsourceffmpeg.h b/src/sources/soundsourceffmpeg.h index 0bbac056fe..75c24a5c2b 100644 --- a/src/sources/soundsourceffmpeg.h +++ b/src/sources/soundsourceffmpeg.h @@ -41,7 +41,7 @@ struct ffmpegCacheObject { }; class SoundSourceFFmpeg : public SoundSource { -public: + public: explicit SoundSourceFFmpeg(QUrl url); ~SoundSourceFFmpeg(); @@ -51,7 +51,7 @@ public: SINT readSampleFrames(SINT numberOfFrames, CSAMPLE* sampleBuffer) override; -private: + private: Result tryOpen(const AudioSourceConfig& audioSrcCfg) override; bool readFramesToCache(unsigned int count, SINT offset); @@ -85,7 +85,7 @@ private: }; class SoundSourceProviderFFmpeg: public SoundSourceProvider { -public: + public: QString getName() const override { return "FFmpeg"; } |