move In/OutputFile into subfolder

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e560daa046ae · 2014-06-23T16:54:00.000-04:00
diff --git a/app/audioRewrapper/audioRewrapper.cpp b/app/audioRewrapper/audioRewrapper.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/OutputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 
 #include <AvTranscoder/AvInputStream.hpp>
 #include <AvTranscoder/InputStreamAudio.hpp>
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -1,4 +1,4 @@
-#include <AvTranscoder/InputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
 #include <AvTranscoder/Metadatas/Print.hpp>
 
 #include <iostream>
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -8,8 +8,9 @@
 #include <AvTranscoder/OutputStream.hpp>
 #include <AvTranscoder/OutputStreamAudio.hpp>
 #include <AvTranscoder/OutputStreamVideo.hpp>
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/OutputFile.hpp>
+
+#include <AvTranscoder/File/InputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 
 #include <AvTranscoder/ColorTransform.hpp>
 
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -5,7 +5,7 @@
 #include <AvTranscoder/AvInputStream.hpp>
 #include <AvTranscoder/InputStreamAudio.hpp>
 #include <AvTranscoder/InputStreamVideo.hpp>
-#include <AvTranscoder/InputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
 
 #include <AvTranscoder/ColorTransform.hpp>
 
diff --git a/src/AvTranscoder/AvInputStream.cpp b/src/AvTranscoder/AvInputStream.cpp
@@ -1,6 +1,6 @@
 #include "AvInputStream.hpp"
 
-#include <AvTranscoder/InputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
diff --git a/src/AvTranscoder/AvOutputStream.cpp b/src/AvTranscoder/AvOutputStream.cpp
@@ -1,6 +1,6 @@
 #include "AvOutputStream.hpp"
 
-#include "OutputFile.hpp"
+#include <AvTranscoder/File/OutputFile.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp
@@ -1,12 +1,12 @@
 #include "InputFile.hpp"
-#include "AvInputStream.hpp"
-
-#include "Metadatas/VideoStreamProperties.hpp"
-#include "Metadatas/AudioStreamProperties.hpp"
-#include "Metadatas/DataStreamProperties.hpp"
-#include "Metadatas/SubtitleStreamProperties.hpp"
-#include "Metadatas/AttachementStreamProperties.hpp"
-#include "Metadatas/UnknownStreamProperties.hpp"
+#include <AvTranscoder/AvInputStream.hpp>
+
+#include <AvTranscoder/Metadatas/VideoStreamProperties.hpp>
+#include <AvTranscoder/Metadatas/AudioStreamProperties.hpp>
+#include <AvTranscoder/Metadatas/DataStreamProperties.hpp>
+#include <AvTranscoder/Metadatas/SubtitleStreamProperties.hpp>
+#include <AvTranscoder/Metadatas/AttachementStreamProperties.hpp>
+#include <AvTranscoder/Metadatas/UnknownStreamProperties.hpp>
 
 
 extern "C" {
diff --git a/src/AvTranscoder/File/InputFile.hpp b/src/AvTranscoder/File/InputFile.hpp
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
diff --git a/src/AvTranscoder/File/OutputFile.hpp b/src/AvTranscoder/File/OutputFile.hpp
diff --git a/src/AvTranscoder/Metadatas/Print.hpp b/src/AvTranscoder/Metadatas/Print.hpp
@@ -9,8 +9,8 @@
 #include <AvTranscoder/OutputStreamAudio.hpp>
 #include <AvTranscoder/OutputStreamVideo.hpp>
 
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/OutputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 
 #include <AvTranscoder/ColorTransform.hpp>
 
diff --git a/src/AvTranscoder/StreamTranscoder.hpp b/src/AvTranscoder/StreamTranscoder.hpp
@@ -10,7 +10,7 @@
 #include <AvTranscoder/InputStreamAudio.hpp>
 #include <AvTranscoder/OutputStreamAudio.hpp>
 
-#include <AvTranscoder/OutputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 
 
 namespace avtranscoder
diff --git a/src/AvTranscoder/Transcoder.hpp b/src/AvTranscoder/Transcoder.hpp
@@ -1,9 +1,9 @@
 #ifndef _AV_TRANSCODER_TRANSCODER_HPP_
 #define _AV_TRANSCODER_TRANSCODER_HPP_
 
-#include <AvTranscoder/InputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 #include <AvTranscoder/InputStream.hpp>
-#include <AvTranscoder/OutputFile.hpp>
 #include <AvTranscoder/ProgressListener.hpp>
 #include <AvTranscoder/DummyInputStream.hpp>
 #include <AvTranscoder/StreamTranscoder.hpp>
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -33,8 +33,8 @@
 #include <AvTranscoder/InputStreamAudio.hpp>
 #include <AvTranscoder/InputStreamVideo.hpp>
 
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/OutputFile.hpp>
+#include <AvTranscoder/File/InputFile.hpp>
+#include <AvTranscoder/File/OutputFile.hpp>
 
 #include <AvTranscoder/Transcoder.hpp>
 
@@ -77,7 +77,7 @@ namespace std {
 %include <AvTranscoder/InputStreamAudio.hpp>
 %include <AvTranscoder/InputStreamVideo.hpp>
 
-%include <AvTranscoder/InputFile.hpp>
-%include <AvTranscoder/OutputFile.hpp>
+%include <AvTranscoder/File/InputFile.hpp>
+%include <AvTranscoder/File/OutputFile.hpp>
 
 %include <AvTranscoder/Transcoder.hpp>
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -0,0 +1,37 @@
+#include "common.hpp"
+
+#include <dirent.h>
+#include <iostream>
+
+namespace avtranscoder
+{
+
+void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars )
+{
+	char* part = strtok( const_cast<char*>( inputString.c_str() ), splitChars.c_str() );
+	while( part != NULL )
+	{
+		splitedString.push_back( std::string( part ) );
+		part = strtok( NULL, splitChars.c_str() );
+	}
+}
+
+int getFilesInDir( std::string dir, std::vector< std::string > &files )
+{
+    DIR *dp;
+    struct dirent *dirp;
+    if( ( dp  = opendir( dir.c_str() ) ) == NULL )
+    {
+        std::cout << "Error(" << errno << ") opening " << dir << std::endl;
+        return errno;
+    }
+
+    while( ( dirp = readdir( dp ) ) != NULL )
+    {
+        files.push_back( std::string( dirp->d_name ) );
+    }
+    closedir( dp );
+    return 0;
+}
+
+}
diff --git a/src/SConscript b/src/SConscript
@@ -14,7 +14,9 @@ env.Append(
 
 sAvTranscoder = env.StaticLibrary(
     'sAvTranscoder',
-    Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ),
+    Glob( 'AvTranscoder/*.cpp' ) +
+    Glob( 'AvTranscoder/DatasStructures/*.cpp' ) +
+    Glob( 'AvTranscoder/File/*.cpp' ),
     LIBS = [
         'avutil',
         'avcodec',
@@ -26,7 +28,9 @@ sAvTranscoder = env.StaticLibrary(
 
 SharedAvTranscoder = env.SharedLibrary(
     'AvTranscoder',
-    Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ),
+    Glob( 'AvTranscoder/*.cpp' ) +
+    Glob( 'AvTranscoder/DatasStructures/*.cpp' ) +
+    Glob( 'AvTranscoder/File/*.cpp' ),
     LIBS = [
         'avutil',
         'avcodec',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <AvTranscoder/InputFile.hpp>`
	`1`	`+#include <AvTranscoder/File/InputFile.hpp>`
`2`	`2`	`#include <AvTranscoder/Metadatas/Print.hpp>`
`3`	`3`
`4`	`4`	`#include <iostream>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "AvOutputStream.hpp"`
`2`	`2`
`3`		`-#include "OutputFile.hpp"`
	`3`	`+#include <AvTranscoder/File/OutputFile.hpp>`
`4`	`4`
`5`	`5`	`namespace avtranscoder`
`6`	`6`	`{`