Progress: split into one class per file

Clement Champetier · Clement Champetier · commit a41e28f27ba6 · 2014-09-24T10:52:16.000+02:00
* 3 classes / files: IProgress, ConsoleProgress, NoDisplayProgress.
* Add a cpp file just for ConsoleProgress (the implementation is more
'complicated' than the others).
diff --git a/app/cpp/avMeta/avMeta.cpp b/app/cpp/avMeta/avMeta.cpp
@@ -1,5 +1,6 @@
 #include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/Metadatas/Print.hpp>
+#include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 #include <iostream>
 
diff --git a/app/cpp/avTranscoder/avTranscoder.cpp b/app/cpp/avTranscoder/avTranscoder.cpp
@@ -4,6 +4,7 @@
 
 #include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/File/OutputFile.hpp>
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
 #include <AvTranscoder/EssenceStream/InputAudio.hpp>
 #include <AvTranscoder/EssenceStream/InputVideo.hpp>
 #include <AvTranscoder/EssenceStream/OutputAudio.hpp>
diff --git a/app/cpp/avplay/AvReader.hpp b/app/cpp/avplay/AvReader.hpp
@@ -6,6 +6,7 @@
 #include <AvTranscoder/EssenceStream/InputVideo.hpp>
 #include <AvTranscoder/EssenceTransform/VideoEssenceTransform.hpp>
 #include <AvTranscoder/Metadatas/Print.hpp>
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
 
 #include "Reader.hpp"
 
diff --git a/app/cpp/genericProcessor/genericProcessor.cpp b/app/cpp/genericProcessor/genericProcessor.cpp
@@ -1,4 +1,4 @@
-
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
 #include <AvTranscoder/Transcoder/Transcoder.hpp>
 
 #include <iostream>
diff --git a/src/AvTranscoder/File/InputFile.hpp b/src/AvTranscoder/File/InputFile.hpp
@@ -10,7 +10,7 @@
 #include <AvTranscoder/CodedStream/AvInputStream.hpp>
 
 #include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
-#include <AvTranscoder/progress/ProgressListener.hpp>
+#include <AvTranscoder/progress/IProgress.hpp>
 
 #include <AvTranscoder/Profile.hpp>
 
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -11,7 +11,7 @@
 #include <AvTranscoder/EssenceStream/DummyAudio.hpp>
 #include <AvTranscoder/EssenceStream/DummyVideo.hpp>
 
-#include <AvTranscoder/progress/ProgressListener.hpp>
+#include <AvTranscoder/progress/IProgress.hpp>
 
 #include <AvTranscoder/Profile.hpp>
 
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -50,7 +50,7 @@
 #include <AvTranscoder/Transcoder/Transcoder.hpp>
 %}
 
-%include "AvTranscoder/progress/ProgressListener.i"
+%include "AvTranscoder/progress/progress.i"
 
 namespace std {
 %template(IntPair)         pair< size_t, size_t >;
diff --git a/src/AvTranscoder/progress/ConsoleProgress.cpp b/src/AvTranscoder/progress/ConsoleProgress.cpp
@@ -1,16 +1,14 @@
-#include "ProgressListener.hpp"
+#include "ConsoleProgress.hpp"
 
 #include <iostream>
 #include <iomanip>
 
 namespace avtranscoder
 {
 
-IProgress::~IProgress()
-{}
-
 ConsoleProgress::~ConsoleProgress()
-{}
+{
+}
 
 EJobStatus ConsoleProgress::progress( const double processedDuration, const double programDuration )
 {
@@ -26,12 +24,4 @@ EJobStatus ConsoleProgress::progress( const double processedDuration, const doub
 	return eJobStatusContinue;
 }
 
-NoDisplayProgress::~NoDisplayProgress()
-{}
-
-EJobStatus NoDisplayProgress::progress( const double processedDuration, const double programDuration )
-{
-	return eJobStatusContinue;
-}
-
 }
diff --git a/src/AvTranscoder/progress/ConsoleProgress.hpp b/src/AvTranscoder/progress/ConsoleProgress.hpp
@@ -0,0 +1,22 @@
+#ifndef _AV_TRANSCODER_CONSOLE_PROGRESS_HPP_
+#define _AV_TRANSCODER_CONSOLE_PROGRESS_HPP_
+
+#include "IProgress.hpp"
+
+namespace avtranscoder
+{
+
+/**
+ * @brief Implementation of IProgress, to display a progress bar in console.
+ */
+class ConsoleProgress : public IProgress
+{
+public:
+	~ConsoleProgress();
+
+	EJobStatus progress( const double processedDuration, const double programDuration );
+};
+
+}
+
+#endif
diff --git a/src/AvTranscoder/progress/IProgress.hpp b/src/AvTranscoder/progress/IProgress.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
-#define _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
+#ifndef _AV_TRANSCODER_IPROGRESS_LISTENER_HPP_
+#define _AV_TRANSCODER_IPROGRESS_LISTENER_HPP_
 
 #include <AvTranscoder/common.hpp>
 
@@ -25,7 +25,7 @@ enum EJobStatus
 class IProgress
 {
 public:
-	virtual ~IProgress() = 0;
+	virtual ~IProgress() {};
 	
 	/**
 	 * @brief Manage the progress.
@@ -36,28 +36,6 @@ class IProgress
 	virtual EJobStatus progress( const double processedDuration, const double programDuration ) = 0;
 };
 
-/**
- * @brief Implementation of IProgress, to display a progress bar in console.
- */
-class ConsoleProgress : public IProgress
-{
-public:
-	~ConsoleProgress();
-
-	EJobStatus progress( const double processedDuration, const double programDuration );
-};
-
-/**
- * @brief Implementation of IProgress, to manage cases when we need an IProgress but don't care of a progress bar.
- */
-class NoDisplayProgress : public IProgress
-{
-public:
-	~NoDisplayProgress();
-
-	EJobStatus progress( const double processedDuration, const double programDuration );
-};
-
 }
 
 #endif
diff --git a/src/AvTranscoder/progress/NoDisplayProgress.hpp b/src/AvTranscoder/progress/NoDisplayProgress.hpp
@@ -0,0 +1,26 @@
+#ifndef _AV_TRANSCODER_NO_DISPLAY_PROGRESS_HPP_
+#define _AV_TRANSCODER_NO_DISPLAY_PROGRESS_HPP_
+
+#include "IProgress.hpp"
+
+namespace avtranscoder
+{
+
+/**
+ * @brief Implementation of IProgress, to manage cases when we need an IProgress but don't care of a progress bar.
+ */
+class NoDisplayProgress : public IProgress
+{
+public:
+	~NoDisplayProgress()
+	{}
+
+	EJobStatus progress( const double processedDuration, const double programDuration )
+	{
+		return eJobStatusContinue;
+	}
+};
+
+}
+
+#endif
diff --git a/src/AvTranscoder/progress/ProgressListener.i b/src/AvTranscoder/progress/ProgressListener.i
diff --git a/src/AvTranscoder/progress/progress.i b/src/AvTranscoder/progress/progress.i
@@ -0,0 +1,15 @@
+%module(directors="1") AvTranscoder
+
+
+%{
+ #include <AvTranscoder/progress/IProgress.hpp>
+ #include <AvTranscoder/progress/ConsoleProgress.hpp>
+ #include <AvTranscoder/progress/NoDisplayProgress.hpp>
+%}
+
+/* turn on director wrapping for IProgress */
+%feature("director") IProgress;
+
+%include <AvTranscoder/progress/IProgress.hpp>
+%include <AvTranscoder/progress/ConsoleProgress.hpp>
+%include <AvTranscoder/progress/NoDisplayProgress.hpp>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+#include <AvTranscoder/progress/ConsoleProgress.hpp>`
`2`	`2`	`#include <AvTranscoder/Transcoder/Transcoder.hpp>`
`3`	`3`
`4`	`4`	`#include <iostream>`