Rename 'codedStream' folder to 'stream'

Clement Champetier · Clement Champetier · commit df6626f51e2c · 2015-01-13T09:34:28.000+01:00
Also add a SWIG interface for this directory.
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -20,12 +20,6 @@
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
 
-#include <AvTranscoder/codedStream/IOutputStream.hpp>
-#include <AvTranscoder/codedStream/OutputStream.hpp>
-
-#include <AvTranscoder/codedStream/IInputStream.hpp>
-#include <AvTranscoder/codedStream/InputStream.hpp>
-
 #include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
 %}
@@ -48,12 +42,7 @@ namespace std {
 %include <AvTranscoder/codec/AudioCodec.hpp>
 %include <AvTranscoder/codec/DataCodec.hpp>
 
-%include <AvTranscoder/codedStream/IOutputStream.hpp>
-%include <AvTranscoder/codedStream/OutputStream.hpp>
-
-%include <AvTranscoder/codedStream/IInputStream.hpp>
-%include <AvTranscoder/codedStream/InputStream.hpp>
-
+%include "AvTranscoder/stream/stream.i"
 %include "AvTranscoder/decoder/decoder.i"
 %include "AvTranscoder/encoder/encoder.i"
 %include "AvTranscoder/file/file.i"
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -1,7 +1,7 @@
 #include "AudioDecoder.hpp"
 
 #include <AvTranscoder/codec/ICodec.hpp>
-#include <AvTranscoder/codedStream/InputStream.hpp>
+#include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/frame/AudioFrame.hpp>
 
 extern "C" {
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -1,7 +1,7 @@
 #include "VideoDecoder.hpp"
 
 #include <AvTranscoder/codec/ICodec.hpp>
-#include <AvTranscoder/codedStream/InputStream.hpp>
+#include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/frame/VideoFrame.hpp>
 
 extern "C" {
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -4,7 +4,7 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/option/FormatContext.hpp>
 #include <AvTranscoder/file/util.hpp>
-#include <AvTranscoder/codedStream/InputStream.hpp>
+#include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/mediaProperty/FileProperties.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -9,7 +9,7 @@
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/DataCodec.hpp>
 
-#include <AvTranscoder/codedStream/OutputStream.hpp>
+#include <AvTranscoder/stream/OutputStream.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
 
 #include <string>
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_CODED_STREAM_I_OUTPUT_STREAM_HPP_
-#define _AV_TRANSCODER_CODED_STREAM_I_OUTPUT_STREAM_HPP_
+#ifndef _AV_TRANSCODER_STREAM_I_OUTPUT_STREAM_HPP_
+#define _AV_TRANSCODER_STREAM_I_OUTPUT_STREAM_HPP_
 
 #include <AvTranscoder/codec/AudioCodec.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_CODED_STREAM_AV_INPUT_STREAM_HPP_
-#define _AV_TRANSCODER_CODED_STREAM_AV_INPUT_STREAM_HPP_
+#ifndef _AV_TRANSCODER_STREAM_INPUT_STREAM_HPP_
+#define _AV_TRANSCODER_STREAM_INPUT_STREAM_HPP_
 
 #include "IInputStream.hpp"
 
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
diff --git a/src/AvTranscoder/stream/OutputStream.hpp b/src/AvTranscoder/stream/OutputStream.hpp
@@ -1,5 +1,5 @@
-#ifndef _AV_TRANSCODER_CODED_STREAM_AV_OUTPUT_STREAM_HPP_
-#define _AV_TRANSCODER_CODED_STREAM_AV_OUTPUT_STREAM_HPP_
+#ifndef _AV_TRANSCODER_STREAM_OUTPUT_STREAM_HPP_
+#define _AV_TRANSCODER_STREAM_OUTPUT_STREAM_HPP_
 
 #include "IOutputStream.hpp"
 
diff --git a/src/AvTranscoder/stream/stream.i b/src/AvTranscoder/stream/stream.i
@@ -0,0 +1,13 @@
+%{
+#include <AvTranscoder/stream/IOutputStream.hpp>
+#include <AvTranscoder/stream/OutputStream.hpp>
+
+#include <AvTranscoder/stream/IInputStream.hpp>
+#include <AvTranscoder/stream/InputStream.hpp>
+%}
+
+%include <AvTranscoder/stream/IOutputStream.hpp>
+%include <AvTranscoder/stream/OutputStream.hpp>
+
+%include <AvTranscoder/stream/IInputStream.hpp>
+%include <AvTranscoder/stream/InputStream.hpp>
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -1,7 +1,7 @@
 
 #include "StreamTranscoder.hpp"
 
-#include <AvTranscoder/codedStream/InputStream.hpp>
+#include <AvTranscoder/stream/InputStream.hpp>
 
 #include <AvTranscoder/decoder/VideoDecoder.hpp>
 #include <AvTranscoder/decoder/AudioDecoder.hpp>
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -3,8 +3,8 @@
 
 #include <AvTranscoder/common.hpp>
 
-#include <AvTranscoder/codedStream/IInputStream.hpp>
-#include <AvTranscoder/codedStream/IOutputStream.hpp>
+#include <AvTranscoder/stream/IInputStream.hpp>
+#include <AvTranscoder/stream/IOutputStream.hpp>
 
 #include <AvTranscoder/decoder/IDecoder.hpp>
 #include <AvTranscoder/encoder/IEncoder.hpp>
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -4,7 +4,7 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
-#include <AvTranscoder/codedStream/IInputStream.hpp>
+#include <AvTranscoder/stream/IInputStream.hpp>
 #include <AvTranscoder/ProfileLoader.hpp>
 
 #include "StreamTranscoder.hpp"
