diff --git a/gizmo/correlator.h b/gizmo/correlator.h index c5c5975..18a2460 100644 --- a/gizmo/correlator.h +++ b/gizmo/correlator.h @@ -39,7 +39,7 @@ class Correlator unsigned minPointsNo = 0, float minWordsSim = 0.5); - virtual ~Correlator(); + ~Correlator(); void connectStatsCallback(StatsCallback callback); @@ -84,7 +84,7 @@ class Correlator StatsCallback m_statsCb; CorrelationStats m_stats; - float m_windowSize; + float m_windowSize; double m_minCorrelation; float m_maxDistanceSqr; unsigned m_minPointsNo; diff --git a/gizmo/media/audiodec.h b/gizmo/media/audiodec.h index 70a2c00..1a345d9 100644 --- a/gizmo/media/audiodec.h +++ b/gizmo/media/audiodec.h @@ -6,7 +6,6 @@ #include "avout.h" #include <memory> -class Demux; class AVOutput; @@ -16,6 +15,11 @@ class AudioDec : public Decoder AudioDec(); virtual ~AudioDec(); + AudioDec(const AudioDec&) = delete; + AudioDec(AudioDec&&) = delete; + AudioDec& operator= (const AudioDec&) = delete; + AudioDec& operator= (AudioDec&&) = delete; + virtual void start(const AVStream *stream); virtual void stop(); diff --git a/gizmo/media/demux.h b/gizmo/media/demux.h index d587a5c..e0b7f89 100644 --- a/gizmo/media/demux.h +++ b/gizmo/media/demux.h @@ -18,6 +18,11 @@ class Demux Demux(const std::string &fileName); ~Demux(); + Demux(const Demux&) = delete; + Demux(Demux&&) = delete; + Demux& operator= (const Demux&) = delete; + Demux& operator= (Demux&&) = delete; + const StreamsFormat &getStreamsInfo() const; void connectDec(std::shared_ptr<Decoder> dec, unsigned streamId); diff --git a/gizmo/media/resampler.h b/gizmo/media/resampler.h index b4a2cd7..309158a 100644 --- a/gizmo/media/resampler.h +++ b/gizmo/media/resampler.h @@ -28,6 +28,11 @@ class Resampler : public AVOutput Resampler(); virtual ~Resampler(); + Resampler(const Resampler&) = delete; + Resampler(Resampler&&) = delete; + Resampler& operator= (const Resampler&) = delete; + Resampler& operator= (Resampler&&) = delete; + void connectOutput( std::shared_ptr<AVOutput> output, const AudioFormat &format, diff --git a/gizmo/media/speechrec.h b/gizmo/media/speechrec.h index cd5e499..6f398d5 100644 --- a/gizmo/media/speechrec.h +++ b/gizmo/media/speechrec.h @@ -13,6 +13,11 @@ class SpeechRecognition : public AVOutput SpeechRecognition(); virtual ~SpeechRecognition(); + SpeechRecognition(const SpeechRecognition&) = delete; + SpeechRecognition(SpeechRecognition&&) = delete; + SpeechRecognition& operator= (const SpeechRecognition&) = delete; + SpeechRecognition& operator= (SpeechRecognition&&) = delete; + virtual void start(const AVStream *stream); virtual void stop(); diff --git a/gizmo/media/subdec.h b/gizmo/media/subdec.h index e27e994..b2ec643 100644 --- a/gizmo/media/subdec.h +++ b/gizmo/media/subdec.h @@ -12,8 +12,6 @@ extern "C" #include <libavformat/avformat.h> } -class Demux; - class SubtitleDec : public Decoder { @@ -28,6 +26,11 @@ class SubtitleDec : public Decoder SubtitleDec(); virtual ~SubtitleDec(); + SubtitleDec(const SubtitleDec&) = delete; + SubtitleDec(SubtitleDec&&) = delete; + SubtitleDec& operator= (const SubtitleDec&) = delete; + SubtitleDec& operator= (SubtitleDec&&) = delete; + virtual void start(const AVStream *stream); virtual void stop();