ProgressListener: separate interface from implemntation

Clement Champetier · Clement Champetier · commit ffb762a6db7d · 2014-09-24T10:35:49.000+02:00
* Create ProgressListener.cpp.
* Add include to iostream in Transcoder.
diff --git a/src/AvTranscoder/ProgressListener.cpp b/src/AvTranscoder/ProgressListener.cpp
@@ -0,0 +1,37 @@
+#include "ProgressListener.hpp"
+
+#include <iostream>
+#include <iomanip>
+
+namespace avtranscoder
+{
+
+IProgress::~IProgress()
+{}
+
+ConsoleProgress::~ConsoleProgress()
+{}
+
+EJobStatus ConsoleProgress::progress( const double processedDuration, const double programDuration )
+{
+	std::string progress( 80, '-' );
+	std::string done( 80.0 * processedDuration / programDuration, '#' );
+	progress.replace( 0, done.size(), done );
+
+	std::cout  << std::setprecision(2) << std::fixed << "\r[" << progress << "] " << processedDuration << "/" << programDuration << std::flush;
+
+	// if( processedFrames >= 100 )
+	// 	return avtranscoder::eJobStatusCancel;
+
+	return eJobStatusContinue;
+}
+
+NoDisplayProgress::~NoDisplayProgress()
+{}
+
+EJobStatus NoDisplayProgress::progress( const double processedDuration, const double programDuration )
+{
+	return eJobStatusContinue;
+}
+
+}
diff --git a/src/AvTranscoder/ProgressListener.hpp b/src/AvTranscoder/ProgressListener.hpp
@@ -1,8 +1,9 @@
 #ifndef _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
 #define _AV_TRANSCODER_PROGRESS_LISTENER_HPP_
 
+#include <AvTranscoder/common.hpp>
+
 #include <iostream>
-#include <iomanip>
 
 namespace avtranscoder
 {
@@ -24,7 +25,7 @@ enum EJobStatus
 class IProgress
 {
 public:
-	virtual ~IProgress() {};
+	virtual ~IProgress() = 0;
 	
 	/**
 	 * @brief Manage the progress.
@@ -41,22 +42,9 @@ class IProgress
 class ConsoleProgress : public IProgress
 {
 public:
-	~ConsoleProgress()
-	{}
-
-	EJobStatus progress( const double processedDuration, const double programDuration )
-	{
-		std::string progress( 80, '-' );
-		std::string done( 80.0 * processedDuration / programDuration, '#' );
-		progress.replace( 0, done.size(), done );
-
-		std::cout  << std::setprecision(2) << std::fixed << "\r[" << progress << "] " << processedDuration << "/" << programDuration << std::flush;
-
-		// if( processedFrames >= 100 )
-		// 	return avtranscoder::eJobStatusCancel;
+	~ConsoleProgress();
 
-		return eJobStatusContinue;
-	}
+	EJobStatus progress( const double processedDuration, const double programDuration );
 };
 
 /**
@@ -65,13 +53,9 @@ class ConsoleProgress : public IProgress
 class NoDisplayProgress : public IProgress
 {
 public:
-	~NoDisplayProgress()
-	{}
+	~NoDisplayProgress();
 
-	EJobStatus progress( const double processedDuration, const double programDuration )
-	{
-		return eJobStatusContinue;
-	}
+	EJobStatus progress( const double processedDuration, const double programDuration );
 };
 
 }
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -1,5 +1,7 @@
 #include "Transcoder.hpp"
+
 #include <limits>
+#include <iostream>
 
 namespace avtranscoder
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include "Transcoder.hpp"`
	`2`	`+`
`2`	`3`	`#include <limits>`
	`4`	`+#include <iostream>`
`3`	`5`
`4`	`6`	`namespace avtranscoder`
`5`	`7`	`{`