InputFile: include AvInputStream instead of forward declaration

Clement Champetier · Clement Champetier · commit bc227930bcdb · 2014-06-02T11:02:16.000+02:00
Necessary if I want to use the InputStream returned by getStream
function.
diff --git a/src/AvTranscoder/InputFile.hpp b/src/AvTranscoder/InputFile.hpp
@@ -1,6 +1,7 @@
 #ifndef _AV_TRANSCODER_INPUT_FILE_HPP_
 #define _AV_TRANSCODER_INPUT_FILE_HPP_
 
+#include <AvTranscoder/AvInputStream.hpp>
 #include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
 #include <AvTranscoder/DatasStructures/AudioDesc.hpp>
 #include <AvTranscoder/DatasStructures/VideoDesc.hpp>
@@ -19,8 +20,6 @@ class AVCodecContext;
 namespace avtranscoder
 {
 
-class AvInputStream;
-
 class AvExport InputFile
 {
 public:
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -20,17 +20,18 @@
 
 #include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
 
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/OutputFile.hpp>
-
 #include <AvTranscoder/OutputStream.hpp>
 #include <AvTranscoder/OutputStreamAudio.hpp>
 #include <AvTranscoder/OutputStreamVideo.hpp>
 
 #include <AvTranscoder/InputStream.hpp>
+#include <AvTranscoder/AvInputStream.hpp>
 #include <AvTranscoder/InputStreamAudio.hpp>
 #include <AvTranscoder/InputStreamVideo.hpp>
 
+#include <AvTranscoder/InputFile.hpp>
+#include <AvTranscoder/OutputFile.hpp>
+
 #include <AvTranscoder/Transcoder.hpp>
 
 %}
@@ -59,15 +60,16 @@ namespace std {
 
 %include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
 
-%include <AvTranscoder/InputFile.hpp>
-%include <AvTranscoder/OutputFile.hpp>
-
 %include <AvTranscoder/OutputStream.hpp>
 %include <AvTranscoder/OutputStreamAudio.hpp>
 %include <AvTranscoder/OutputStreamVideo.hpp>
 
 %include <AvTranscoder/InputStream.hpp>
+%include <AvTranscoder/AvInputStream.hpp>
 %include <AvTranscoder/InputStreamAudio.hpp>
 %include <AvTranscoder/InputStreamVideo.hpp>
 
+%include <AvTranscoder/InputFile.hpp>
+%include <AvTranscoder/OutputFile.hpp>
+
 %include <AvTranscoder/Transcoder.hpp>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#ifndef _AV_TRANSCODER_INPUT_FILE_HPP_`
`2`	`2`	`#define _AV_TRANSCODER_INPUT_FILE_HPP_`
`3`	`3`
	`4`	`+#include <AvTranscoder/AvInputStream.hpp>`
`4`	`5`	`#include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>`
`5`	`6`	`#include <AvTranscoder/DatasStructures/AudioDesc.hpp>`
`6`	`7`	`#include <AvTranscoder/DatasStructures/VideoDesc.hpp>`
`@@ -19,8 +20,6 @@ class AVCodecContext;`
`19`	`20`	`namespace avtranscoder`
`20`	`21`	`{`
`21`	`22`
`22`		`-class AvInputStream;`
`23`		`-`
`24`	`23`	`class AvExport InputFile`
`25`	`24`	`{`
`26`	`25`	`public:`