Move functions from common to ProfileLoader

Clement Champetier · Clement Champetier · commit b7899b16a4ba · 2015-02-03T14:51:47.000+01:00
diff --git a/src/AvTranscoder/ProfileLoader.cpp b/src/AvTranscoder/ProfileLoader.cpp
@@ -6,6 +6,7 @@
 #include <fstream>
 #include <cstdlib>
 #include <stdexcept>
+#include <dirent.h>
 
 namespace avtranscoder
 {
@@ -200,5 +201,35 @@ bool ProfileLoader::checkAudioProfile( const Profile& profileToCheck )
 	return isValid;
 }
 
+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( const std::string& dir, std::vector< std::string >& files )
+{
+	DIR *dp;
+	struct dirent *dirp;
+	if( ( dp  = opendir( dir.c_str() ) ) == NULL )
+	{
+		std::cerr << "Error(" << errno << ") opening " << dir << std::endl;
+		return errno;
+	}
+
+	while( ( dirp = readdir( dp ) ) != NULL )
+	{
+		std::string filename( dirp->d_name );
+		if( filename == "." || filename == ".." )
+			continue;
+		files.push_back( filename );
+	}
+	closedir( dp );
+	return 0;
+}
 
 }
diff --git a/src/AvTranscoder/ProfileLoader.hpp b/src/AvTranscoder/ProfileLoader.hpp
@@ -73,5 +73,10 @@ class AvExport ProfileLoader
 	Profiles _profiles;
 };
 
+#ifndef SWIG
+void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
+int getFilesInDir( const std::string& dir, std::vector< std::string >& files );
+#endif
+
 }
 #endif
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -6,9 +6,6 @@ extern "C" {
 #include <libavutil/error.h>
 }
 
-#include <dirent.h>
-#include <iostream>
-
 namespace avtranscoder
 {
 
@@ -22,37 +19,6 @@ void setLogLevel( const int level )
 	av_log_set_level( level );
 }
 
-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( const std::string& dir, std::vector< std::string >& files )
-{
-	DIR *dp;
-	struct dirent *dirp;
-	if( ( dp  = opendir( dir.c_str() ) ) == NULL )
-	{
-		std::cerr << "Error(" << errno << ") opening " << dir << std::endl;
-		return errno;
-	}
-
-	while( ( dirp = readdir( dp ) ) != NULL )
-	{
-		std::string filename( dirp->d_name );
-		if( filename == "." || filename == ".." )
-			continue;
-		files.push_back( filename );
-	}
-	closedir( dp );
-	return 0;
-}
-
 std::string getFormat( const std::string& filename )
 {
 	std::string format( "" );
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -18,7 +18,6 @@ extern "C" {
 
 #include <string>
 #include <cstring>
-#include <vector>
 
 #ifdef SWIG
  #define AvExport
@@ -66,11 +65,6 @@ void AvExport preloadCodecsAndFormats();
  */
 void AvExport setLogLevel( const int level );
 
-#ifndef SWIG
-void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
-int getFilesInDir( const std::string& dir, std::vector< std::string >& files );
-#endif
-
 std::string AvExport getFormat( const std::string& filename );
 bool AvExport matchFormat( const std::string& format, const std::string& filename );
 
