simplify internal headers

svn path=/trunk/libnsfb/; revision=9801

9 files changed, 17 insertions, 14 deletions

diff --git a/src/16bpp_plotters.c b/src/16bpp_plotters.c
index a223e23..b9ff186 100644
--- a/src/16bpp_plotters.c
+++ b/src/16bpp_plotters.c
@@ -15,8 +15,7 @@
 #include "libnsfb_plot_util.h"
 
 #include "nsfb.h"
-#include "nsfb_plot.h"
-#include "plotters.h"
+#include "plot.h"
 
 static inline uint16_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
 {
diff --git a/src/32bpp_plotters.c b/src/32bpp_plotters.c
index d86821c..243cdb4 100644
--- a/src/32bpp_plotters.c
+++ b/src/32bpp_plotters.c
@@ -15,8 +15,7 @@
 #include "libnsfb_plot_util.h"
 
 #include "nsfb.h"
-#include "nsfb_plot.h"
-#include "plotters.h"
+#include "plot.h"
 
 static inline uint32_t *
 get_xy_loc(nsfb_t *nsfb, int x, int y)
diff --git a/src/8bpp_plotters.c b/src/8bpp_plotters.c
index ec72174..b29d241 100644
--- a/src/8bpp_plotters.c
+++ b/src/8bpp_plotters.c
@@ -17,8 +17,7 @@
 #include "libnsfb_plot_util.h"
 
 #include "nsfb.h"
-#include "nsfb_plot.h"
-#include "plotters.h"
+#include "plot.h"
 
 static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
 {
diff --git a/src/cursor.c b/src/cursor.c
index 98bd07b..f1a3b58 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -7,7 +7,7 @@
 
 #include "nsfb.h"
 #include "cursor.h"
-#include "nsfb_plot.h"
+#include "plot.h"
 #include "frontend.h"
 
 bool nsfb_cursor_init(nsfb_t *nsfb)
diff --git a/src/frontend.c b/src/frontend.c
index 630def9..17d6113 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "frontend.h"
-#include "plotters.h"
+#include "plot.h"
 
 #define MAX_FRONTENDS 16
 
diff --git a/src/frontend_linux.c b/src/frontend_linux.c
index d80fc43..e65c888 100644
--- a/src/frontend_linux.c
+++ b/src/frontend_linux.c
@@ -12,9 +12,11 @@
 #include "libnsfb.h"
 #include "libnsfb_event.h"
 #include "libnsfb_plot.h"
+
 #include "nsfb.h"
+#include "plot.h"
 #include "frontend.h"
-#include "plotters.h"
+
 
 #define UNUSED(x) ((x) = (x))
 
diff --git a/src/frontend_sdl.c b/src/frontend_sdl.c
index 359728c..cc83a4e 100644
--- a/src/frontend_sdl.c
+++ b/src/frontend_sdl.c
@@ -17,8 +17,7 @@
 
 #include "nsfb.h"
 #include "frontend.h"
-#include "plotters.h"
-#include "nsfb_plot.h"
+#include "plot.h"
 #include "cursor.h"
 
 enum nsfb_key_code_e sdl_nsfb_map[] = {
diff --git a/src/plot.c b/src/plot.c
index 90404cc..4de25c9 100644
--- a/src/plot.c
+++ b/src/plot.c
@@ -4,8 +4,9 @@
 
 #include "libnsfb.h"
 #include "libnsfb_plot.h"
+
 #include "nsfb.h"
-#include "nsfb_plot.h"
+#include "plot.h"
 
 /** Sets a clip rectangle for subsequent plots.
  *
@@ -161,3 +162,8 @@ bool nsfb_plot_quadratic_bezier(nsfb_t *nsfb, nsfb_bbox_t *curve, nsfb_point_t *
 {
     return nsfb->plotter_fns->quadratic(nsfb, curve, ctrla, c);
 }
+
+bool nsfb_plot_path(nsfb_t *nsfb, int pathc, nsfb_plot_pathop_t *pathop, nsfb_plot_pen_t *pen)
+{
+    return nsfb->plotter_fns->path(nsfb, pathc, pathop, pen);
+}
diff --git a/src/plotters.c b/src/plotters.c
index 91c3b7b..d04559e 100644
--- a/src/plotters.c
+++ b/src/plotters.c
@@ -21,8 +21,7 @@
 #include "libnsfb_plot_util.h"
 
 #include "nsfb.h"
-#include "nsfb_plot.h"
-#include "plotters.h"
+#include "plot.h"
 #include "frontend.h"
 
 extern const nsfb_plotter_fns_t _nsfb_1bpp_plotters;