Remove option folder

Clement Champetier · Clement Champetier · commit 96cac6d8ab87 · 2015-01-13T09:34:39.000+01:00
* Move FormatContext to 'file' directory.
* Move Option to main directory.
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -1,6 +1,6 @@
 #include <AvTranscoder/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
-#include <AvTranscoder/option/Option.hpp>
+#include <AvTranscoder/Option.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/codec/VideoCodec.hpp>
 
diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
@@ -2,7 +2,7 @@
 #define _AV_TRANSCODER_CODEC_ICODEC_HPP_
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/option/Option.hpp>
+#include <AvTranscoder/Option.hpp>
 
 #include <string>
 
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_FORMAT_CONTEXT_HPP_
 #define _AV_TRANSCODER_FORMAT_CONTEXT_HPP_
 
-#include "Option.hpp"
+#include <AvTranscoder/Option.hpp>
 
 extern "C" {
 #include <libavformat/avformat.h>
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -2,8 +2,8 @@
 #define _AV_TRANSCODER_FILE_INPUT_FILE_HPP_
 
 #include <AvTranscoder/common.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
 #include <AvTranscoder/file/util.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/mediaProperty/FileProperties.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 #include <AvTranscoder/codec/VideoCodec.hpp>
 #include <AvTranscoder/codec/AudioCodec.hpp>
diff --git a/src/AvTranscoder/file/file.i b/src/AvTranscoder/file/file.i
@@ -1,9 +1,11 @@
 %{
 #include <AvTranscoder/file/util.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
 %}
 
 %include <AvTranscoder/file/util.hpp>
+%include <AvTranscoder/file/FormatContext.hpp>
 %include <AvTranscoder/file/InputFile.hpp>
 %include <AvTranscoder/file/OutputFile.hpp>
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 #include <string>
 
diff --git a/src/AvTranscoder/mediaProperty/DataProperties.hpp b/src/AvTranscoder/mediaProperty/DataProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/mediaProperty/VideoProperties.hpp>
 #include <AvTranscoder/mediaProperty/AudioProperties.hpp>
 #include <AvTranscoder/mediaProperty/DataProperties.hpp>
diff --git a/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp b/src/AvTranscoder/mediaProperty/SubtitleProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/mediaProperty/UnknownProperties.hpp b/src/AvTranscoder/mediaProperty/UnknownProperties.hpp
@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -5,7 +5,7 @@
 #include "PixelProperties.hpp"
 #include <AvTranscoder/mediaProperty/util.hpp>
 #include <AvTranscoder/file/util.hpp>
-#include <AvTranscoder/option/FormatContext.hpp>
+#include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 
 extern "C" {
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -2,8 +2,7 @@
 #define	_AV_TRANSCODER_UTIL_HPP
 
 #include "common.hpp"
-
-#include <AvTranscoder/option/Option.hpp>
+#include "Option.hpp"
 
 extern "C" {
 #include <libavutil/pixfmt.h>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <AvTranscoder/common.hpp>`
`5`	`5`	`#include <AvTranscoder/mediaProperty/util.hpp>`
`6`		`-#include <AvTranscoder/option/FormatContext.hpp>`
	`6`	`+#include <AvTranscoder/file/FormatContext.hpp>`
`7`	`7`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`