* changed taseditlib folder name to taseditor

src/drivers/win/config.cpp

@@ -38,7 +38,7 @@
 #include "movieoptions.h"
 #include "ramwatch.h"
 #include "debugger.h"
-#include "taseditlib/taseditor_config.h"
+#include "taseditor/taseditor_config.h"
 
 #include "../../state.h"	//adelikat: For bool backupSavestates
 

src/drivers/win/main.cpp

@@ -70,7 +70,7 @@
 #include "video.h"
 #include "utils/xstring.h"
 #include <string.h>
-#include "taseditlib/taseditor_window.h"
+#include "taseditor/taseditor_window.h"
 
 //---------------------------
 //mbg merge 6/29/06 - new aboutbox

src/drivers/win/taseditor.cpp

@@ -1,5 +1,5 @@
 #include <fstream>
-#include "taseditlib/taseditor_project.h"
+#include "taseditor/taseditor_project.h"
 #include "utils/xstring.h"
 #include "keyboard.h"
 #include "joystick.h"
@@ -848,7 +848,6 @@ bool ExitTasEditor()
 	history.free();
 	playback.SeekingStop();
 	selection.free();
-	splicer.free();
 
 	ClearTaseditInput();
 	// restore "eoptions"

src/fceu.cpp

@@ -53,7 +53,7 @@
 #ifdef WIN32
 #include "drivers/win/pref.h"
 
-#include "drivers/win/taseditlib/greenzone.h"
+#include "drivers/win/taseditor/greenzone.h"
 extern GREENZONE greenzone;
 #endif
 

src/input.cpp

@@ -52,10 +52,10 @@
 #include "drivers/win/window.h"
 #include "drivers/win/ntview.h"
 
-#include "./drivers/win/taseditlib/taseditor_window.h"
+#include "./drivers/win/taseditor/taseditor_window.h"
-#include "./drivers/win/taseditlib/markers.h"
+#include "./drivers/win/taseditor/markers.h"
-#include "./drivers/win/taseditlib/inputsnapshot.h"
+#include "./drivers/win/taseditor/inputsnapshot.h"
-#include "./drivers/win/taseditlib/bookmarks.h"
+#include "./drivers/win/taseditor/bookmarks.h"
 extern bool Taseditor_rewind_now;
 extern BOOKMARKS bookmarks;
 extern TASEDITOR_WINDOW taseditor_window;

src/lua-engine.cpp

@@ -40,7 +40,7 @@
 
 #ifdef WIN32
 #include "drivers/win/common.h"
-#include "drivers/win/taseditlib/taseditor_lua.h"
+#include "drivers/win/taseditor/taseditor_lua.h"
 extern TASEDITOR_LUA taseditor_lua;
 #endif
 

src/movie.cpp

@@ -40,8 +40,8 @@
 #include "./drivers/win/window.h"
 extern void AddRecentMovieFile(const char *filename);
 
-#include "./drivers/win/taseditlib/playback.h"
+#include "./drivers/win/taseditor/playback.h"
-#include "./drivers/win/taseditlib/recorder.h"
+#include "./drivers/win/taseditor/recorder.h"
 extern PLAYBACK playback;
 extern RECORDER recorder;
 #endif

vc/vc10_fceux.vcxproj

@@ -420,23 +420,23 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
     </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\bookmark.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\bookmarks.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\greenzone.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\inputhistory.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\inputsnapshot.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\markers.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\playback.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\popup_display.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\recorder.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\splicer.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_config.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_list.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_lua.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_project.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_sel.cpp" />
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_window.cpp" />
     <ClCompile Include="..\src\drivers\win\taseditor.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\bookmark.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\bookmarks.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\greenzone.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\inputhistory.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\inputsnapshot.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\markers.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\playback.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\popup_display.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\recorder.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\splicer.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_config.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_list.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_lua.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_project.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_sel.cpp" />
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_window.cpp" />
     <ClCompile Include="..\src\drivers\win\texthook.cpp" />
     <ClCompile Include="..\src\drivers\win\throttle.cpp" />
     <ClCompile Include="..\src\drivers\win\timing.cpp" />
@@ -746,22 +746,23 @@
     <ClInclude Include="..\src\drivers\win\resource.h" />
     <ClInclude Include="..\src\drivers\win\sound.h" />
     <ClInclude Include="..\src\drivers\win\state.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\bookmark.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\bookmarks.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\inputhistory.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\inputsnapshot.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\markers.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\playback.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\popup_display.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\recorder.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\splicer.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_config.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_list.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_lua.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_project.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_sel.h" />
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_window.h" />
     <ClInclude Include="..\src\drivers\win\taseditor.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\bookmark.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\bookmarks.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\greenzone.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\inputhistory.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\inputsnapshot.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\markers.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\playback.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\popup_display.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\recorder.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\splicer.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_config.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_list.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_lua.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_project.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_sel.h" />
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_window.h" />
     <ClInclude Include="..\src\drivers\win\texthook.h" />
     <ClInclude Include="..\src\drivers\win\throttle.h" />
     <ClInclude Include="..\src\drivers\win\timing.h" />

vc/vc10_fceux.vcxproj.filters

@@ -25,9 +25,6 @@
     <Filter Include="drivers\win\res">
       <UniqueIdentifier>{008e1f62-e23f-4235-bee7-a45a466678e9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="drivers\win\taseditlib">
-      <UniqueIdentifier>{cfac36a2-cdfd-4c0a-be8e-353b1303a909}</UniqueIdentifier>
-    </Filter>
     <Filter Include="drivers\win\zlib">
       <UniqueIdentifier>{7279627e-c72f-441f-bb8b-48ef8412f051}</UniqueIdentifier>
     </Filter>
@@ -52,6 +49,9 @@
     <Filter Include="pix">
       <UniqueIdentifier>{19ba9ddc-37b7-4962-a3d7-9eb69929a8dc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="drivers\win\taseditor">
+      <UniqueIdentifier>{cfac36a2-cdfd-4c0a-be8e-353b1303a909}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\asm.cpp" />
@@ -904,56 +904,56 @@
     <ClCompile Include="..\src\boards\onebus.cpp">
       <Filter>boards</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\bookmark.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\bookmarks.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\greenzone.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\inputhistory.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\inputsnapshot.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\markers.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\playback.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\recorder.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_config.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_list.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_lua.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_project.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_sel.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\taseditor_window.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\popup_display.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\drivers\win\taseditor.cpp">
       <Filter>drivers\win</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\drivers\win\taseditlib\splicer.cpp">
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_config.cpp">
-      <Filter>drivers\win\taseditlib</Filter>
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_list.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_lua.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_project.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_sel.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\taseditor_window.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\recorder.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\splicer.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\bookmark.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\bookmarks.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\greenzone.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\inputhistory.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\inputsnapshot.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\markers.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\playback.cpp">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\drivers\win\taseditor\popup_display.cpp">
+      <Filter>drivers\win\taseditor</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1393,53 +1393,56 @@
     <ClInclude Include="..\src\drivers\common\nes_ntsc_impl.h">
       <Filter>drivers\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\inputhistory.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\bookmark.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\bookmarks.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\inputsnapshot.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\markers.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\playback.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\recorder.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_window.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_config.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_list.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_lua.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_project.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\taseditor_sel.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\popup_display.h">
-      <Filter>drivers\win\taseditlib</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\drivers\win\taseditor.h">
       <Filter>drivers\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\drivers\win\taseditlib\splicer.h">
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_config.h">
-      <Filter>drivers\win\taseditlib</Filter>
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_list.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_lua.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_project.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_sel.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\taseditor_window.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\popup_display.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\recorder.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\splicer.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\bookmark.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\bookmarks.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\greenzone.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\inputhistory.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\inputsnapshot.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\markers.h">
+      <Filter>drivers\win\taseditor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\drivers\win\taseditor\playback.h">
+      <Filter>drivers\win\taseditor</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>