Video/AudioGenerator: copy constructor and operator= are private

Clement Champetier · Clement Champetier · commit fd3be2c1bb19 · 2016-04-12T12:00:02.000+02:00
* No need to define them, since _inputFrame, _blackImage/_silent are not
copied.
* With this update, _frameDesc can be a const attribute.
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -14,21 +14,6 @@ AudioGenerator::AudioGenerator(const AudioFrameDesc& frameDesc)
 {
 }
 
-AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)
-    : _inputFrame(NULL)
-    , _silent(NULL)
-    , _frameDesc(audioGenerator._frameDesc)
-{
-}
-
-AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)
-{
-    _inputFrame = NULL;
-    _silent = NULL;
-    _frameDesc = audioGenerator._frameDesc;
-    return *this;
-}
-
 AudioGenerator::~AudioGenerator()
 {
     delete _silent;
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -9,10 +9,12 @@ namespace avtranscoder
 
 class AvExport AudioGenerator : public IDecoder
 {
+private:
+    AudioGenerator& operator=(const AudioGenerator& audioGenerator);
+    AudioGenerator(const AudioGenerator& audioGenerator);
+
 public:
     AudioGenerator(const AudioFrameDesc& frameDesc);
-    AudioGenerator(const AudioGenerator& audioGenerator);
-    AudioGenerator& operator=(const AudioGenerator& audioGenerator);
 
     ~AudioGenerator();
 
@@ -24,7 +26,7 @@ class AvExport AudioGenerator : public IDecoder
 private:
     Frame* _inputFrame;  ///< Has link (no ownership)
     AudioFrame* _silent; ///< The generated silent (has ownership)
-    AudioFrameDesc _frameDesc; ///< The description of the silence (sampleRate, channels...)
+    const AudioFrameDesc _frameDesc; ///< The description of the silence (sampleRate, channels...)
 };
 }
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -15,21 +15,6 @@ VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)
 {
 }
 
-VideoGenerator::VideoGenerator(const VideoGenerator& videoGenerator)
-    : _inputFrame(NULL)
-    , _blackImage(NULL)
-    , _frameDesc(videoGenerator._frameDesc)
-{
-}
-
-VideoGenerator& VideoGenerator::operator=(const VideoGenerator& videoGenerator)
-{
-    _inputFrame = NULL;
-    _blackImage = NULL;
-    _frameDesc = videoGenerator._frameDesc;
-    return *this;
-}
-
 VideoGenerator::~VideoGenerator()
 {
     delete _blackImage;
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -9,11 +9,13 @@ namespace avtranscoder
 
 class AvExport VideoGenerator : public IDecoder
 {
-public:
-    VideoGenerator(const VideoFrameDesc& frameDesc);
+private:
     VideoGenerator(const VideoGenerator& videoGenerator);
     VideoGenerator& operator=(const VideoGenerator& videoGenerator);
 
+public:
+    VideoGenerator(const VideoFrameDesc& frameDesc);
+
     ~VideoGenerator();
 
     bool decodeNextFrame(Frame& frameBuffer);
@@ -24,7 +26,7 @@ class AvExport VideoGenerator : public IDecoder
 private:
     Frame* _inputFrame;        ///< A frame given from outside (has link, no ownership)
     VideoFrame* _blackImage;   ///< The generated black image (has ownership)
-    VideoFrameDesc _frameDesc; ///< The description of the black image (width, height...)
+    const VideoFrameDesc _frameDesc; ///< The description of the black image (width, height...)
 };
 }
 
