From eded24e8ff710619f5c6e1a6eab6f84b953b0a6a Mon Sep 17 00:00:00 2001
From: Arthur Moore <Arthur.Moore.git@cd-net.net>
Date: Wed, 18 Feb 2015 03:57:35 -0500
Subject: [PATCH] Moved filter enums from WX to filters.hpp

Eventual goal is to just get rid of them completely.
---
 src/filters/filters.hpp | 17 +++++++++++++++++
 src/wx/wxvbam.h         | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/filters/filters.hpp b/src/filters/filters.hpp
index 470695ef..40a260cd 100644
--- a/src/filters/filters.hpp
+++ b/src/filters/filters.hpp
@@ -13,6 +13,23 @@
 // Function pointer type for a filter function
 typedef void(*FilterFunc)(u8*, u32, u8*, u8*, u32, int, int);
 
+//WX
+enum wx_filtfunc {
+    // this order must match order of option enum and selector widget
+    FF_NONE, FF_2XSAI, FF_SUPER2XSAI, FF_SUPEREAGLE, FF_PIXELATE,
+    FF_ADVMAME, FF_BILINEAR, FF_BILINEARPLUS, FF_SCANLINES, FF_TV,
+    FF_HQ2X, FF_LQ2X, FF_SIMPLE2X, FF_SIMPLE3X, FF_HQ3X, FF_SIMPLE4X,
+    FF_HQ4X, FF_PLUGIN  // plugin must always be last
+};
+#define builtin_ff_scale(x) \
+    ((x == FF_HQ4X || x == FF_SIMPLE4X) ? 4 : \
+    (x == FF_HQ3X || x == FF_SIMPLE3X) ? 3 : \
+     x == FF_PLUGIN ? 0 : x == FF_NONE ? 1 : 2)
+enum ifbfunc {
+    // this order must match order of option enum and selector widget
+    IFB_NONE, IFB_SMART, IFB_MOTION_BLUR
+};
+
 typedef std::pair<FilterFunc,FilterFunc> filterpair;
 typedef std::pair<std::string,filterpair> namedfilter;
 
diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h
index 355fbaf6..706bb307 100644
--- a/src/wx/wxvbam.h
+++ b/src/wx/wxvbam.h
@@ -291,23 +291,6 @@ enum showspeed {
     SS_NONE, SS_PERCENT, SS_DETAILED
 };
 
-enum filtfunc {
-    // this order must match order of option enum and selector widget
-    FF_NONE, FF_2XSAI, FF_SUPER2XSAI, FF_SUPEREAGLE, FF_PIXELATE,
-    FF_ADVMAME, FF_BILINEAR, FF_BILINEARPLUS, FF_SCANLINES, FF_TV,
-    FF_HQ2X, FF_LQ2X, FF_SIMPLE2X, FF_SIMPLE3X, FF_HQ3X, FF_SIMPLE4X,
-    FF_HQ4X, FF_PLUGIN  // plugin must always be last
-};
-#define builtin_ff_scale(x) \
-    ((x == FF_HQ4X || x == FF_SIMPLE4X) ? 4 : \
-	(x == FF_HQ3X || x == FF_SIMPLE3X) ? 3 : \
-	 x == FF_PLUGIN ? 0 : x == FF_NONE ? 1 : 2)
-
-enum ifbfunc {
-    // this order must match order of option enum and selector widget
-    IFB_NONE, IFB_SMART, IFB_MOTION_BLUR
-};
-
 // make sure and keep this in sync with opts.cpp!
 enum renderer {
     RND_SIMPLE, RND_OPENGL, RND_CAIRO, RND_DIRECT3D