profile: add util header to separate functions to browse profiles

Clement Champetier · Clement Champetier · commit 2020627547d5 · 2015-02-27T16:28:40.000+01:00
diff --git a/src/AvTranscoder/profile/ProfileLoader.cpp b/src/AvTranscoder/profile/ProfileLoader.cpp
@@ -1,10 +1,11 @@
 #include "ProfileLoader.hpp"
 
+#include "util.hpp"
+
 #include <iostream>
 #include <fstream>
 #include <cstdlib>
 #include <stdexcept>
-#include <dirent.h>
 
 namespace avtranscoder
 {
@@ -201,35 +202,4 @@ bool ProfileLoader::checkAudioProfile( const Profile& profileToCheck )
 	return isValid;
 }
 
-void split( std::vector< std::string >& splitString, const std::string& inputString, const std::string& splitChars )
-{
-	char* part = strtok( const_cast<char*>( inputString.c_str() ), splitChars.c_str() );
-	while( part != NULL )
-	{
-		splitString.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/profile/ProfileLoader.hpp b/src/AvTranscoder/profile/ProfileLoader.hpp
@@ -4,7 +4,6 @@
 #include <AvTranscoder/common.hpp>
 
 #include <string>
-#include <cstring>
 #include <vector>
 #include <map>
 
@@ -73,10 +72,5 @@ class AvExport ProfileLoader
 	Profiles _profiles;
 };
 
-#ifndef SWIG
-void split( std::vector< std::string >& splitString, 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/profile/util.hpp b/src/AvTranscoder/profile/util.hpp
@@ -0,0 +1,44 @@
+#ifndef _AV_TRANSCODER_PROFILE_UTIL_HPP_
+#define _AV_TRANSCODER_PROFILE_UTIL_HPP_
+
+#include <string>
+#include <dirent.h>
+#include <iostream>
+
+namespace avtranscoder
+{
+
+void split( std::vector< std::string >& splitString, const std::string& inputString, const std::string& splitChars )
+{
+	char* part = strtok( const_cast<char*>( inputString.c_str() ), splitChars.c_str() );
+	while( part != NULL )
+	{
+		splitString.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;
+}
+
+}
+
+#endif
