readers: removed printInfo method

Clement Champetier · Clement Champetier · commit c6bc636503a2 · 2015-12-01T12:38:59.000+01:00
* Just need to get the properties.
* See next commit.
diff --git a/app/avPlay/Window.cpp b/app/avPlay/Window.cpp
@@ -1,6 +1,7 @@
-
 #include "Window.hpp"
 
+#include <AvTranscoder/mediaProperty/print.hpp>
+
 #ifdef __APPLE__
  #include <OpenGL/gl.h>
  #include <GLUT/glut.h>
@@ -421,7 +422,9 @@ void Window::displayInformations()
 	std::cout << textureType << " " << _width << "x" << _height << std::endl;
 
 	// stream info
-	_reader->printInfo();
+	const avtranscoder::VideoProperties* properties = _reader->getVideoProperties();
+	if( properties != NULL )
+		std::cout << *properties << std::endl;
 }
 
 void Window::move( float x, float y )
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -4,7 +4,6 @@
 #include <AvTranscoder/frame/AudioFrame.hpp>
 #include <AvTranscoder/transform/AudioTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
-#include <AvTranscoder/mediaProperty/print.hpp>
 
 namespace avtranscoder
 {
@@ -72,9 +71,4 @@ void AudioReader::updateOutput( const size_t sampleRate, const size_t nbChannels
 	_dstFrame = new AudioFrame( AudioFrameDesc( _outputSampleRate, _outputNbChannels, _outputSampleFormat ) );
 }
 
-void AudioReader::printInfo()
-{
-	std::cout << *_audioStreamProperties << std::endl;
-}
-
 }
diff --git a/src/AvTranscoder/reader/AudioReader.hpp b/src/AvTranscoder/reader/AudioReader.hpp
@@ -37,7 +37,6 @@ class AvExport AudioReader : public IReader
 	// @brief Input info
 	const AudioProperties* getAudioProperties() const {return _audioStreamProperties;}
 
-	void printInfo();
 
 private:
 	void init();
diff --git a/src/AvTranscoder/reader/IReader.cpp b/src/AvTranscoder/reader/IReader.cpp
@@ -1,7 +1,5 @@
 #include "IReader.hpp"
 
-#include <AvTranscoder/mediaProperty/print.hpp>
-
 #include <cassert>
 
 namespace avtranscoder
@@ -76,10 +74,4 @@ Frame* IReader::readFrameAt( const size_t frame )
 	return _dstFrame;
 }
 
-void IReader::printInfo()
-{
-	assert( _streamProperties != NULL );
-	std::cout << *_streamProperties << std::endl;
-}
-
 }
diff --git a/src/AvTranscoder/reader/IReader.hpp b/src/AvTranscoder/reader/IReader.hpp
@@ -48,10 +48,6 @@ class AvExport IReader
 	 */
 	Frame* readFrameAt( const size_t frame );
 
-	/**
-	 * @brief Print info of the source stream read.
-	 */
-	virtual void printInfo();
 
 protected:
 	InputFile* _inputFile;
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -4,7 +4,6 @@
 #include <AvTranscoder/frame/VideoFrame.hpp>
 #include <AvTranscoder/transform/VideoTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
-#include <AvTranscoder/mediaProperty/print.hpp>
 
 namespace avtranscoder
 {
@@ -73,9 +72,4 @@ void VideoReader::updateOutput(const size_t width, const size_t height, const st
 	_dstFrame = new VideoFrame( VideoFrameDesc( _outputWidth, _outputHeight, getOutputPixelFormat() ) );
 }
 
-void VideoReader::printInfo()
-{
-	std::cout << *_videoStreamProperties << std::endl;
-}
-
 }
diff --git a/src/AvTranscoder/reader/VideoReader.hpp b/src/AvTranscoder/reader/VideoReader.hpp
@@ -40,7 +40,6 @@ class AvExport VideoReader : public IReader
 	// @brief Input info
 	const VideoProperties* getVideoProperties() const {return _videoStreamProperties;}
 
-	void printInfo();
 
 private:
 	void init();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#include <AvTranscoder/frame/AudioFrame.hpp>`
`5`	`5`	`#include <AvTranscoder/transform/AudioTransform.hpp>`
`6`	`6`	`#include <AvTranscoder/progress/NoDisplayProgress.hpp>`
`7`		`-#include <AvTranscoder/mediaProperty/print.hpp>`
`8`	`7`
`9`	`8`	`namespace avtranscoder`
`10`	`9`	`{`
`@@ -72,9 +71,4 @@ void AudioReader::updateOutput( const size_t sampleRate, const size_t nbChannels`
`72`	`71`	`_dstFrame = new AudioFrame( AudioFrameDesc( _outputSampleRate, _outputNbChannels, _outputSampleFormat ) );`
`73`	`72`	`}`
`74`	`73`
`75`		`-void AudioReader::printInfo()`
`76`		`-{`
`77`		`- std::cout << *_audioStreamProperties << std::endl;`
`78`		`-}`
`79`		`-`
`80`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#include <AvTranscoder/frame/VideoFrame.hpp>`
`5`	`5`	`#include <AvTranscoder/transform/VideoTransform.hpp>`
`6`	`6`	`#include <AvTranscoder/progress/NoDisplayProgress.hpp>`
`7`		`-#include <AvTranscoder/mediaProperty/print.hpp>`
`8`	`7`
`9`	`8`	`namespace avtranscoder`
`10`	`9`	`{`
`@@ -73,9 +72,4 @@ void VideoReader::updateOutput(const size_t width, const size_t height, const st`
`73`	`72`	`_dstFrame = new VideoFrame( VideoFrameDesc( _outputWidth, _outputHeight, getOutputPixelFormat() ) );`
`74`	`73`	`}`
`75`	`74`
`76`		`-void VideoReader::printInfo()`
`77`		`-{`
`78`		`- std::cout << *_videoStreamProperties << std::endl;`
`79`		`-}`
`80`		`-`
`81`	`75`	`}`