win32 crtmpserver r395

gistfile1.diff

Index: builders/VS2010/rtmpserver/rtmpserver.vcxproj
===================================================================
--- builders/VS2010/rtmpserver/rtmpserver.vcxproj	(revision 395)
+++ builders/VS2010/rtmpserver/rtmpserver.vcxproj	(working copy)
@@ -14,6 +14,7 @@
     <ProjectGuid>{263CEFE6-3D6C-4F9F-9FE0-DA8A9A2FA996}</ProjectGuid>
     <RootNamespace>rtmpserver</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <ProjectName>crtmpserver</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -61,6 +62,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -71,7 +73,7 @@
     </Link>
     <PostBuildEvent>
       <Message>Copy the config file</Message>
-      <Command>copy ..\..\..\builders\cmake\rtmpserver\rtmpserver.lua "$(SolutionDir)$(Configuration)\rtmpserver.lua"
+      <Command>copy ..\..\..\builders\cmake\crtmpserver\crtmpserver.lua "$(SolutionDir)$(Configuration)\crtmpserver.lua"
 
 </Command>
     </PostBuildEvent>
@@ -89,6 +91,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -101,7 +104,7 @@
     </Link>
     <PostBuildEvent>
       <Message>Copy the config file</Message>
-      <Command>copy ..\..\..\builders\cmake\rtmpserver\rtmpserver.lua "$(SolutionDir)$(Configuration)\rtmpserver.lua"
+      <Command>copy ..\..\..\builders\cmake\crtmpserver\crtmpserver.lua "$(SolutionDir)$(Configuration)\crtmpserver.lua"
 
 </Command>
     </PostBuildEvent>
@@ -139,7 +142,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\sources\rtmpserver\src\rtmpserver.cpp" />
+    <ClCompile Include="..\..\..\sources\crtmpserver\src\crtmpserver.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
Index: builders/VS2010/rtmpserver/rtmpserver.vcxproj.filters
===================================================================
--- builders/VS2010/rtmpserver/rtmpserver.vcxproj.filters	(revision 395)
+++ builders/VS2010/rtmpserver/rtmpserver.vcxproj.filters	(working copy)
@@ -11,7 +11,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\sources\rtmpserver\src\rtmpserver.cpp">
+    <ClCompile Include="..\..\..\sources\crtmpserver\src\crtmpserver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
Index: builders/VS2010/thelib/thelib.vcxproj
===================================================================
--- builders/VS2010/thelib/thelib.vcxproj	(revision 395)
+++ builders/VS2010/thelib/thelib.vcxproj	(working copy)
@@ -64,6 +64,7 @@
       <DisableSpecificWarnings>4996;4251;4800;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;Mswsock.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -89,6 +90,7 @@
       <DisableSpecificWarnings>4996;4251;4800;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;Mswsock.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -141,6 +143,7 @@
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmfp\inboundrtmfpprotocol.cpp" />
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmfp\outboundrtmfpprotocol.cpp" />
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmp\inboundrtmpsdiscriminatorprotocol.cpp" />
+    <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmp\streaming\infilertmpnsvstream.cpp" />
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmp\streaming\outfilertmpflvstream.cpp" />
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtp\basertpappprotocolhandler.cpp" />
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtp\basertspappprotocolhandler.cpp" />
Index: builders/VS2010/thelib/thelib.vcxproj.filters
===================================================================
--- builders/VS2010/thelib/thelib.vcxproj.filters	(revision 395)
+++ builders/VS2010/thelib/thelib.vcxproj.filters	(working copy)
@@ -641,6 +641,9 @@
     <ClCompile Include="..\..\..\sources\thelib\src\protocols\cli\inboundjsoncliprotocol.cpp">
       <Filter>Source Files\protocols\cli</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\sources\thelib\src\protocols\rtmp\streaming\infilertmpnsvstream.cpp">
+      <Filter>Source Files\protocols\rtmp\streaming</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\sources\thelib\include\application\baseappprotocolhandler.h">
Index: sources/common/include/platform/windows/win32platform.h
===================================================================
--- sources/common/include/platform/windows/win32platform.h	(revision 395)
+++ sources/common/include/platform/windows/win32platform.h	(working copy)
@@ -165,7 +165,7 @@
 DLLEXP void splitFileName(string fileName, string &name, string &extension, char separator = '.');
 DLLEXP double GetFileModificationDate(string path);
 DLLEXP string normalizePath(string base, string file);
-DLLEXP bool ListFolder(string path, vector<string> &result);
+DLLEXP bool ListFolder(string root, string path, vector<string> &result);
 DLLEXP bool MoveFile(string src, string dst);
 DLLEXP void InstallQuitSignal(SignalFnc pQuitSignalFnc);
 DLLEXP void InstallConfRereadSignal(SignalFnc pConfRereadSignalFnc);
Index: sources/common/src/platform/windows/win32platform.cpp
===================================================================
--- sources/common/src/platform/windows/win32platform.cpp	(revision 395)
+++ sources/common/src/platform/windows/win32platform.cpp	(working copy)
@@ -383,7 +383,7 @@
 	}
 }
 
-bool ListFolder(string path, vector<string> &result) {
+bool ListFolder(string root, string path, vector<string> &result) {
 	WIN32_FIND_DATA ffd;
 	//LARGE_INTEGER filesize;
 	TCHAR szDir[MAX_PATH];
Index: sources/common/src/utils/logging/fileloglocation.cpp
===================================================================
--- sources/common/src/utils/logging/fileloglocation.cpp	(revision 395)
+++ sources/common/src/utils/logging/fileloglocation.cpp	(working copy)
@@ -45,8 +45,8 @@
 	if (_level < 0 || level > _level) {
 		return;
 	}
-	string logEntry = format("%d:%d:%s:%d:%s:%s\n",
-			time(NULL), level, STR(fileName), lineNumber, STR(functionName),
+	string logEntry = format("%d:%s\n",
+			time(NULL), /*level, STR(fileName), lineNumber, STR(functionName),*/
 			STR(message));
 	_fileStream.write(STR(logEntry), logEntry.size());
 	_fileStream.flush();
Index: sources/crtmpserver/src/crtmpserver.cpp
===================================================================
--- sources/crtmpserver/src/crtmpserver.cpp	(revision 395)
+++ sources/crtmpserver/src/crtmpserver.cpp	(working copy)
@@ -54,7 +54,7 @@
 void NormalizeCommandLine(string configFile);
 bool ApplyUIDGID();
 
-RunningStatus gRs = {0};
+RunningStatus gRs;
 
 #ifdef COMPILE_STATIC
 BaseClientApplication *SpawnApplication(Variant configuration);
@@ -69,11 +69,11 @@
 		cout << "Invalid command line. Use --help" << endl;
 		return -1;
 	}
-
 	if (!Variant::DeserializeFromCmdLineArgs(argc, argv, gRs.commandLine)) {
 		PrintHelp();
 		return -1;
 	}
+	
 	string configFile = argv[argc - 1];
 	if (configFile.find("--") == 0)
 		configFile = "";
Index: sources/thelib/include/configuration/configfile.h
===================================================================
--- sources/thelib/include/configuration/configfile.h	(revision 395)
+++ sources/thelib/include/configuration/configfile.h	(working copy)
@@ -66,8 +66,8 @@
 		@brief Loads the xml configuration file.
 		@param path: The true path to the xml configuration file.
 	 */
-	bool LoadXmlFile(string path, bool forceDaemon);
-	bool LoadXmlString(string xmlContent, bool forceDaemon);
+	bool LoadXmlFile(string path, bool forceDaemon = false);
+	bool LoadXmlString(string xmlContent, bool forceDaemon = false);
 	/*!
 		@brief Fetches the logAppenders attribute in the configuration file. 
 	 */
Index: sources/thelib/src/mediaformats/basemediadocument.cpp
===================================================================
--- sources/thelib/src/mediaformats/basemediadocument.cpp	(revision 395)
+++ sources/thelib/src/mediaformats/basemediadocument.cpp	(working copy)
@@ -99,8 +99,10 @@
 	MoveFile(_seekFilePath + ".tmp", _seekFilePath);
 	MoveFile(_metaFilePath + ".tmp", _metaFilePath);
 
+#ifndef WIN32
 	chmod(STR(_seekFilePath), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
 	chmod(STR(_metaFilePath), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+#endif
 
 	return true;
 }
Index: sources/win32service/win32service/src/rtmpserver/rtmpserver.cpp
===================================================================
--- sources/win32service/win32service/src/rtmpserver/rtmpserver.cpp	(revision 395)
+++ sources/win32service/win32service/src/rtmpserver/rtmpserver.cpp	(working copy)
@@ -89,13 +89,13 @@
     splitFileName(configFilePath, fileName, extension);
 
     if (lowercase(extension) == "xml") {
-        if (!gRs.pConfigFile->LoadXmlFile(configFilePath)) {
+        if (!gRs.pConfigFile->LoadXmlFile(configFilePath, true)) {
             FATAL("Unable to load file %s", STR(configFilePath));
            return false;
         }
     } else if (lowercase(extension) == "lua") {
 #ifdef HAS_LUA
-        if (!gRs.pConfigFile->LoadLuaFile(configFilePath)) {
+        if (!gRs.pConfigFile->LoadLuaFile(configFilePath, true)) {
             FATAL("Unable to load file %s", STR(configFilePath));
             return false;
         }