Move ColorTransform and AudioTransform into EssenceTransform folder

Valentin Noel · Valentin Noel · commit 80704bf9632d · 2014-06-25T15:45:53.000+02:00
diff --git a/app/audioRewrapper/audioRewrapper.cpp b/app/audioRewrapper/audioRewrapper.cpp
@@ -8,7 +8,7 @@
 #include <AvTranscoder/InputStreamAudio.hpp>
 #include <AvTranscoder/OutputStreamAudio.hpp>
 
-#include <AvTranscoder/AudioTransform.hpp>
+#include <AvTranscoder/EssenceTransform/AudioTransform.hpp>
 
 void rewrapAudio( const char* inputfilename, const char* outputFilename )
 {
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -12,7 +12,7 @@
 #include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/File/OutputFile.hpp>
 
-#include <AvTranscoder/ColorTransform.hpp>
+#include <AvTranscoder/EssenceTransform/ColorTransform.hpp>
 
 #include <AvTranscoder/DatasStructures/VideoDesc.hpp>
 #include <AvTranscoder/DatasStructures/Image.hpp>
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -7,7 +7,7 @@
 #include <AvTranscoder/InputStreamVideo.hpp>
 #include <AvTranscoder/File/InputFile.hpp>
 
-#include <AvTranscoder/ColorTransform.hpp>
+#include <AvTranscoder/EssenceTransform/ColorTransform.hpp>
 
 #include <AvTranscoder/Metadatas/Print.hpp>
 
diff --git a/src/AvTranscoder/EssenceTransform/AudioTransform.cpp b/src/AvTranscoder/EssenceTransform/AudioTransform.cpp
@@ -1,6 +1,5 @@
 #include "AudioTransform.hpp"
-#include "DatasStructures/AudioFrame.hpp"
-#include "common.hpp"
+#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
diff --git a/src/AvTranscoder/EssenceTransform/AudioTransform.hpp b/src/AvTranscoder/EssenceTransform/AudioTransform.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_AUDIO_TRANSFORM_HPP
 #define _AV_TRANSCODER_AUDIO_TRANSFORM_HPP
 
-#include "common.hpp"
+#include <AvTranscoder/common.hpp>
 
 #ifdef AV_RESAMPLE_LIBRARY
  #define ResampleContext AVAudioResampleContext
diff --git a/src/AvTranscoder/EssenceTransform/ColorTransform.cpp b/src/AvTranscoder/EssenceTransform/ColorTransform.cpp
@@ -1,5 +1,5 @@
 #include "ColorTransform.hpp"
-#include "common.hpp"
+#include <AvTranscoder/common.hpp>
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
diff --git a/src/AvTranscoder/EssenceTransform/ColorTransform.hpp b/src/AvTranscoder/EssenceTransform/ColorTransform.hpp
@@ -1,8 +1,8 @@
 #ifndef _AV_TRANSCODER_COLOR_TRANSFORM_HPP_
 #define _AV_TRANSCODER_COLOR_TRANSFORM_HPP_
 
-#include "DatasStructures/Pixel.hpp"
-#include "DatasStructures/Image.hpp"
+#include <AvTranscoder/DatasStructures/Pixel.hpp>
+#include <AvTranscoder/DatasStructures/Image.hpp>
 
 #include <vector>
 #include <string>
diff --git a/src/AvTranscoder/Metadatas/Print.hpp b/src/AvTranscoder/Metadatas/Print.hpp
@@ -12,7 +12,7 @@
 #include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/File/OutputFile.hpp>
 
-#include <AvTranscoder/ColorTransform.hpp>
+// #include <AvTranscoder/EssenceTransform/ColorTransform.hpp>
 
 #include <AvTranscoder/DatasStructures/VideoDesc.hpp>
 #include <AvTranscoder/DatasStructures/Image.hpp>
diff --git a/src/SConscript b/src/SConscript
@@ -17,6 +17,7 @@ sAvTranscoder = env.StaticLibrary(
     'sAvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) +
     Glob( 'AvTranscoder/DatasStructures/*.cpp' ) +
+    Glob( 'AvTranscoder/EssenceTransform/*.cpp' ) +
     Glob( 'AvTranscoder/File/*.cpp' ),
     LIBS = [
         'avutil',

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#include <AvTranscoder/InputStreamAudio.hpp>`
`9`	`9`	`#include <AvTranscoder/OutputStreamAudio.hpp>`
`10`	`10`
`11`		`-#include <AvTranscoder/AudioTransform.hpp>`
	`11`	`+#include <AvTranscoder/EssenceTransform/AudioTransform.hpp>`
`12`	`12`
`13`	`13`	`void rewrapAudio( const char* inputfilename, const char* outputFilename )`
`14`	`14`	`{`