Move code into new folder. Move libraries into new folder. Make windows build files use directory locations that are relative to the solution directory. Add initial_window_size option to the json parser, update tests accordingly.

Author: bradleybauer

.gitignore

@@ -1,4 +1,6 @@
 *.o
+Debug
+Release
 main
 build
 .vs
@@ -16,3 +18,4 @@ musicVisualizer\.srctrlprj
 misc/
 \.editorconfig
 *shadertoys*
+tests/Debug

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "ffts"]
-	path = ffts
+	path = libs/ffts
 	url = https://github.com/xdaimon/ffts.git
 [submodule "rapidjson"]
-	path = rapidjson
+	path = libs/rapidjson
 	url = https://github.com/Tencent/rapidjson.git
 [submodule "SimpleFileWatcher"]
-	path = SimpleFileWatcher
+	path = libs/SimpleFileWatcher
 	url = https://github.com/xdaimon/SimpleFileWatcher.git

CMakeLists.txt

@@ -14,17 +14,17 @@ set(SOURCE_FILES
 
 include_directories(
     .
-    rapidjson/include/
-    SimpleFileWatcher/include/
+    libs/ffts/include/
+    libs/rapidjson/include/
+    libs/SimpleFileWatcher/include/
 )
 
-add_subdirectory(ffts)
+add_subdirectory(libs/ffts)
 #add_subdirectory(SimpleFileWatcher)
 
 add_executable(main ${SOURCE_FILES})
 
 LINK_DIRECTORIES(/usr/lib/x86_64-linux-gnu/)
 
-TARGET_LINK_LIBRARIES(main stdc++fs glfw GLEW GLU GL pulse-simple pulse pthread ffts ${CMAKE_SOURCE_DIR}/build/ffts/libffts.a ${CMAKE_SOURCE_DIR}/SimpleFileWatcher/lib/Debug/libSimpleFileWatcher.a)
-
+TARGET_LINK_LIBRARIES(main stdc++fs glfw GLEW GLU GL pulse-simple pulse pthread ffts ${CMAKE_SOURCE_DIR}/libs/ffts/build/ffts/libffts.a ${CMAKE_SOURCE_DIR}/libs/SimpleFileWatcher/lib/Debug/libSimpleFileWatcher.a)
 

SimpleFileWatcher

@@ -0,0 +1,4 @@
+## CUSTOM IGNORES
+bin
+buildcfg
+lib

ffts

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2009 James Wynn ([email protected])
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

libs/SimpleFileWatcher/.gitignore

@@ -0,0 +1,55 @@
+# FileWatcher
+
+## Description
+
+FileWatcher is a C++ wrapper for OS file monitoring systems. Currently
+it uses Win32 ReadDirectoryChangesW for monitoring changes in Windows,
+and inotify in linux. OSX is supported via kqueue and directory scans.
+
+
+## TODO
+
+ * Create a pure directory scan based fallback mode.
+ * Optimize the kqueue implementation.
+ * Thorough UnitTest
+ * Add proper Unicode support.
+
+
+## Compiling
+
+Use premake5 to generate a project for your build system.
+
+
+## SimpleDemo
+
+To run the demo, create a directory relative to the execution directory
+called "test". Start SimpleDemo, then create/change/delete files inside
+"test". If "test" does not exist when SimpleDemo starts, it will throw
+an exception and exit.
+
+
+## OgreDemo
+
+Check the OgreDemo directory for an example integration with Ogre.
+
+
+## Caveats
+
+When some programs write data in Win32, they will generate both an Add,
+and a Modify event. This is likely because the program is actually using
+two separate calls to write its data.
+
+Because of the time it takes to write the data to the file, it may be
+necessary in some cases to wait a few milliseconds after the event to be
+able to safely access the file's contents.
+
+
+## Credits
+Originally written by James Wynn
+Contact: [email protected]
+
+Fixes and Buffered/AsyncFileWatcher by Ian Diaz
+Contact: [email protected]
+
+James Wynn's original code can be located at:
+http://simplefilewatcher.googlecode.com

libs/SimpleFileWatcher/LICENSE

@@ -0,0 +1,75 @@
+/**
+	Demo app for FileWatcher. FileWatcher is a simple wrapper for the file
+	modification system in Windows and Linux.
+
+	@author James Wynn
+	@date 2/25/2009
+
+	Copyright (c) 2009 James Wynn ([email protected])
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in
+	all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	THE SOFTWARE.
+*/
+
+#include <FileWatcher/FileWatcher.h>
+#include <iostream>
+#include <stdio.h>
+
+/// Processes a file action
+class UpdateListener : public FW::FileWatchListener
+{
+public:
+	UpdateListener() {}
+	void handleFileAction(FW::WatchID watchid, const FW::String& dir, const FW::String& filename,
+		FW::Action action)
+	{
+		std::cout << "DIR (" << dir + ") FILE (" + filename + ") has event " << action << std::endl;
+	}
+};
+
+
+int main(int argc, char **argv)
+{
+	try 
+	{
+		// create the listener (before the file watcher - so it gets destroyed after the file watcher)
+		UpdateListener listener;
+		
+		// create the file watcher object
+		FW::FileWatcher fileWatcher;
+
+		// add a watch to the system
+		// the file watcher doesn't manage the pointer to the listener - so make sure you don't just
+		// allocate a listener here and expect the file watcher to manage it - there will be a leak!
+		FW::WatchID watchID = fileWatcher.addWatch("./test", &listener, true); 
+		
+		std::cout << "Press ^C to exit demo" << std::endl;
+
+		// loop until a key is pressed
+		while(1)
+		{
+			fileWatcher.update();
+		}
+	} 
+	catch( std::exception& e ) 
+	{
+		fprintf(stderr, "An exception has occurred: %s\n", e.what());
+	}
+
+	return 0;
+}