Reorganize files

m-labs · Nov 21, 2011 · d7d1b37 · d7d1b37
1 parent e750a56
commit d7d1b37
Show file tree

Hide file tree

Showing 87 changed files with 106 additions and 119 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -12,29 +12,16 @@ LIBS=-lnfs -lftpd -ltelnetd -lyaffs2 -lmtk -llop -lfpvm -lpng -lcurl -lexpat -lz
 OBJDIR=obj
 BINDIR=bin
 
-# base
-OBJS=yaffs.o version.o shellext.o sysconfig.o config.o fb.o input.o keymap.o fbgrab.o shortcuts.o osc.o pngwrite.o flashvalid.o main.o
-
-# pixbuf
-OBJS+=pixbuf/dither.o pixbuf/loaderjpeg.o pixbuf/loaderpng.o pixbuf/manager.o
-
-# GUI
-OBJS+=messagebox.o filedialog.o resmgr.o guirender.o performance.o cp.o keyboard.o ir.o audio.o midi.o oscsettings.o dmxspy.o dmxdesk.o dmx.o videoin.o rsswall.o patcheditor.o monitor.o firstpatch.o filemanager.o sysettings.o about.o patchpool.o flash.o shutdown.o
-
-# translations
-OBJS+=french.o german.o
-
-# PDF
+OBJS=yaffs.o version.o shellext.o sysconfig.o config.o fb.o input.o keymap.o fbgrab.o shortcuts.o osc.o pngwrite.o patchpool.o flashvalid.o main.o
+OBJS+=$(addprefix pixbuf/,dither.o loaderjpeg.o loaderpng.o manager.o)
+OBJS+=$(addprefix gui/,messagebox.o filedialog.o resmgr.o guirender.o performance.o cp.o keyboard.o ir.o audio.o midi.o oscsettings.o dmxspy.o dmxdesk.o dmx.o videoin.o rsswall.o patcheditor.o monitor.o firstpatch.o filemanager.o sysettings.o about.o flash.o shutdown.o)
 ifeq ($(WITH_PDF),1)
-	OBJS+=pdfreader.o
+	OBJS+=$(addprefix gui/,pdfreader.o)
 	CFLAGS+=-DWITH_PDF
 	LIBS:=-lmupdf -lfreetype -ljbig2dec -lopenjpeg -ljpeg $(LIBS)
 endif
-
-# renderer
-OBJS+=framedescriptor.o analyzer.o sampler.o compiler.o eval.o line.o wave.o font.o osd.o raster.o renderer.o videoinreconf.o
-
-#
+OBJS+=$(addprefix translations/,french.o german.o)
+OBJS+=$(addprefix renderer/,framedescriptor.o analyzer.o sampler.o compiler.o eval.o line.o wave.o font.o osd.o raster.o renderer.o videoinreconf.o)
 
 POBJS=$(addprefix $(OBJDIR)/,$(OBJS))
 

diff --git a/src/about.c → src/gui/about.c b/src/about.c → src/gui/about.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <mtklib.h>
 
-#include "version.h"
+#include "../version.h"
 #include "flash.h"
 #include "about.h"
 

diff --git a/src/about.h → src/gui/about.h b/src/about.h → src/gui/about.h
diff --git a/src/audio.c → src/gui/audio.c b/src/audio.c → src/gui/audio.c
@@ -26,10 +26,10 @@
 #include <mtklib.h>
 #include <bsp/milkymist_ac97.h>
 
-#include "config.h"
+#include "../config.h"
 #include "cp.h"
-#include "util.h"
-#include "version.h"
+#include "../util.h"
+#include "../version.h"
 #include "flash.h"
 #include "about.h"
 #include "audio.h"

diff --git a/src/audio.h → src/gui/audio.h b/src/audio.h → src/gui/audio.h
diff --git a/src/cp.c → src/gui/cp.c b/src/cp.c → src/gui/cp.c
@@ -22,7 +22,7 @@
 #include "performance.h"
 #include "keyboard.h"
 #include "ir.h"
-#include "fb.h"
+#include "../fb.h"
 #include "audio.h"
 #include "midi.h"
 #include "oscsettings.h"
@@ -41,10 +41,10 @@
 #include "flash.h"
 #include "shutdown.h"
 
-#include "config.h"
+#include "../config.h"
 #include "filedialog.h"
 #include "messagebox.h"
-#include "sysconfig.h"
+#include "../sysconfig.h"
 
 #include "cp.h"
 

diff --git a/src/cp.h → src/gui/cp.h b/src/cp.h → src/gui/cp.h
diff --git a/src/dmx.c → src/gui/dmx.c b/src/dmx.c → src/gui/dmx.c
@@ -28,10 +28,10 @@
 
 #include <mtklib.h>
 
-#include "config.h"
-#include "framedescriptor.h"
+#include "../config.h"
+#include "../renderer/framedescriptor.h"
 #include "cp.h"
-#include "util.h"
+#include "../util.h"
 #include "resmgr.h"
 #include "monitor.h"
 #include "dmxspy.h"

diff --git a/src/dmx.h → src/gui/dmx.h b/src/dmx.h → src/gui/dmx.h
diff --git a/src/dmxdesk.c → src/gui/dmxdesk.c b/src/dmxdesk.c → src/gui/dmxdesk.c
@@ -24,7 +24,7 @@
 
 #include <mtklib.h>
 
-#include "util.h"
+#include "../util.h"
 #include "resmgr.h"
 #include "dmxdesk.h"
 

diff --git a/src/dmxdesk.h → src/gui/dmxdesk.h b/src/dmxdesk.h → src/gui/dmxdesk.h
diff --git a/src/dmxspy.c → src/gui/dmxspy.c b/src/dmxspy.c → src/gui/dmxspy.c
@@ -1,6 +1,6 @@
 /*
  * Flickernoise
- * Copyright (C) 2010 Sebastien Bourdeauducq
+ * Copyright (C) 2010, 2011 Sebastien Bourdeauducq
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "cp.h"
 
 #include "resmgr.h"
-#include "input.h"
+#include "../input.h"
 #include "dmxspy.h"
 
 static int appid;

diff --git a/src/dmxspy.h → src/gui/dmxspy.h b/src/dmxspy.h → src/gui/dmxspy.h
diff --git a/src/filedialog.c → src/gui/filedialog.c b/src/filedialog.c → src/gui/filedialog.c
diff --git a/src/filedialog.h → src/gui/filedialog.h b/src/filedialog.h → src/gui/filedialog.h
diff --git a/src/filemanager.c → src/gui/filemanager.c b/src/filemanager.c → src/gui/filemanager.c
diff --git a/src/filemanager.h → src/gui/filemanager.h b/src/filemanager.h → src/gui/filemanager.h
diff --git a/src/firstpatch.c → src/gui/firstpatch.c b/src/firstpatch.c → src/gui/firstpatch.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <mtklib.h>
 
-#include "config.h"
+#include "../config.h"
 #include "cp.h"
 #include "filedialog.h"
 

diff --git a/src/firstpatch.h → src/gui/firstpatch.h b/src/firstpatch.h → src/gui/firstpatch.h
diff --git a/src/flash.c → src/gui/flash.c b/src/flash.c → src/gui/flash.c
@@ -33,12 +33,12 @@
 
 #include "filedialog.h"
 #include "messagebox.h"
-#include "input.h"
-#include "flashvalid.h"
-#include "version.h"
-#include "sysconfig.h"
+#include "../input.h"
+#include "../flashvalid.h"
+#include "../version.h"
+#include "../sysconfig.h"
 #include "performance.h"
-#include "patchpool.h"
+#include "../patchpool.h"
 
 #include "flash.h"
 

diff --git a/src/flash.h → src/gui/flash.h b/src/flash.h → src/gui/flash.h
diff --git a/src/guirender.c → src/gui/guirender.c b/src/guirender.c → src/gui/guirender.c
@@ -25,14 +25,14 @@
 #include <mtkeycodes.h>
 #include <bsp/milkymist_video.h>
 
-#include "compiler.h"
-#include "renderer.h"
+#include "../renderer/compiler.h"
+#include "../renderer/renderer.h"
 #include "resmgr.h"
-#include "fb.h"
-#include "input.h"
-#include "config.h"
+#include "../fb.h"
+#include "../input.h"
+#include "../config.h"
 #include "cp.h"
-#include "videoinreconf.h"
+#include "../renderer/videoinreconf.h"
 
 #include "guirender.h"
 

diff --git a/src/guirender.h → src/gui/guirender.h b/src/guirender.h → src/gui/guirender.h
@@ -18,7 +18,7 @@
 #ifndef __GUIRENDER_H
 #define __GUIRENDER_H
 
-#include "compiler.h"
+#include "../renderer/compiler.h"
 
 typedef void (*guirender_stop_callback)();
 

diff --git a/src/ir.c → src/gui/ir.c b/src/ir.c → src/gui/ir.c
@@ -25,9 +25,9 @@
 #include <unistd.h>
 #include <mtklib.h>
 
-#include "util.h"
-#include "input.h"
-#include "config.h"
+#include "../util.h"
+#include "../input.h"
+#include "../config.h"
 #include "cp.h"
 #include "messagebox.h"
 #include "filedialog.h"

diff --git a/src/ir.h → src/gui/ir.h b/src/ir.h → src/gui/ir.h
diff --git a/src/keyboard.c → src/gui/keyboard.c b/src/keyboard.c → src/gui/keyboard.c
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <mtklib.h>
 
-#include "util.h"
-#include "config.h"
+#include "../util.h"
+#include "../config.h"
 #include "cp.h"
 #include "messagebox.h"
 #include "filedialog.h"

diff --git a/src/keyboard.h → src/gui/keyboard.h b/src/keyboard.h → src/gui/keyboard.h
diff --git a/src/messagebox.c → src/gui/messagebox.c b/src/messagebox.c → src/gui/messagebox.c
diff --git a/src/messagebox.h → src/gui/messagebox.h b/src/messagebox.h → src/gui/messagebox.h
diff --git a/src/midi.c → src/gui/midi.c b/src/midi.c → src/gui/midi.c
@@ -26,14 +26,14 @@
 #include <assert.h>
 #include <mtklib.h>
 
-#include "util.h"
-#include "input.h"
-#include "config.h"
+#include "../util.h"
+#include "../input.h"
+#include "../config.h"
 #include "cp.h"
 #include "messagebox.h"
 #include "filedialog.h"
 #include "performance.h"
-#include "framedescriptor.h"
+#include "../renderer/framedescriptor.h"
 
 #include "midi.h"
 

diff --git a/src/midi.h → src/gui/midi.h b/src/midi.h → src/gui/midi.h
diff --git a/src/monitor.c → src/gui/monitor.c b/src/monitor.c → src/gui/monitor.c
@@ -20,10 +20,10 @@
 #include <rtems.h>
 #include <mtklib.h>
 
-#include "input.h"
+#include "../input.h"
 #include "resmgr.h"
-#include "framedescriptor.h"
-#include "sampler.h"
+#include "../renderer/framedescriptor.h"
+#include "../renderer/sampler.h"
 
 #include "monitor.h"
 

diff --git a/src/monitor.h → src/gui/monitor.h b/src/monitor.h → src/gui/monitor.h
diff --git a/src/oscsettings.c → src/gui/oscsettings.c b/src/oscsettings.c → src/gui/oscsettings.c
@@ -25,8 +25,8 @@
 #include <unistd.h>
 #include <mtklib.h>
 
-#include "util.h"
-#include "config.h"
+#include "../util.h"
+#include "../config.h"
 #include "cp.h"
 #include "messagebox.h"
 #include "filedialog.h"

diff --git a/src/oscsettings.h → src/gui/oscsettings.h b/src/oscsettings.h → src/gui/oscsettings.h
diff --git a/src/patcheditor.c → src/gui/patcheditor.c b/src/patcheditor.c → src/gui/patcheditor.c
@@ -26,9 +26,9 @@
 
 #include "filedialog.h"
 #include "patcheditor.h"
-#include "framedescriptor.h"
-#include "compiler.h"
-#include "input.h"
+#include "../renderer/framedescriptor.h"
+#include "../renderer/compiler.h"
+#include "../input.h"
 #include "guirender.h"
 
 static int appid;

diff --git a/src/patcheditor.h → src/gui/patcheditor.h b/src/patcheditor.h → src/gui/patcheditor.h
diff --git a/src/pdfreader.c → src/gui/pdfreader.c b/src/pdfreader.c → src/gui/pdfreader.c
diff --git a/src/pdfreader.h → src/gui/pdfreader.h b/src/pdfreader.h → src/gui/pdfreader.h
diff --git a/src/performance.c → src/gui/performance.c b/src/performance.c → src/gui/performance.c
@@ -29,15 +29,15 @@
 #include <mtkeycodes.h>
 #include <bsp/milkymist_video.h>
 
-#include "input.h"
-#include "fb.h"
+#include "../input.h"
+#include "../fb.h"
 #include "messagebox.h"
-#include "config.h"
-#include "compiler.h"
-#include "renderer.h"
+#include "../config.h"
+#include "../renderer/compiler.h"
+#include "../renderer/renderer.h"
 #include "guirender.h"
 #include "performance.h"
-#include "osd.h"
+#include "../renderer/osd.h"
 
 #define FILENAME_LEN 384
 

diff --git a/src/performance.h → src/gui/performance.h b/src/performance.h → src/gui/performance.h
diff --git a/src/resmgr.c → src/gui/resmgr.c b/src/resmgr.c → src/gui/resmgr.c
diff --git a/src/resmgr.h → src/gui/resmgr.h b/src/resmgr.h → src/gui/resmgr.h
diff --git a/src/rsswall.c → src/gui/rsswall.c b/src/rsswall.c → src/gui/rsswall.c
@@ -25,11 +25,11 @@
 #include <expat.h>
 #include <mtklib.h>
 
-#include "version.h"
-#include "util.h"
-#include "osd.h"
+#include "../version.h"
+#include "../util.h"
+#include "../renderer/osd.h"
 #include "cp.h"
-#include "config.h"
+#include "../config.h"
 #include "rsswall.h"
 
 static int appid;

diff --git a/src/rsswall.h → src/gui/rsswall.h b/src/rsswall.h → src/gui/rsswall.h
diff --git a/src/shutdown.c → src/gui/shutdown.c b/src/shutdown.c → src/gui/shutdown.c
diff --git a/src/shutdown.h → src/gui/shutdown.h b/src/shutdown.h → src/gui/shutdown.h
diff --git a/src/sysettings.c → src/gui/sysettings.c b/src/sysettings.c → src/gui/sysettings.c
@@ -20,8 +20,8 @@
 #include <arpa/inet.h>
 #include <mtklib.h>
 
-#include "input.h"
-#include "sysconfig.h"
+#include "../input.h"
+#include "../sysconfig.h"
 #include "filedialog.h"
 #include "sysettings.h"
 

diff --git a/src/sysettings.h → src/gui/sysettings.h b/src/sysettings.h → src/gui/sysettings.h
diff --git a/src/videoin.c → src/gui/videoin.c b/src/videoin.c → src/gui/videoin.c
@@ -26,11 +26,11 @@
 #include <mtklib.h>
 #include <bsp/milkymist_video.h>
 
-#include "config.h"
+#include "../config.h"
 #include "resmgr.h"
-#include "util.h"
+#include "../util.h"
 #include "cp.h"
-#include "input.h"
+#include "../input.h"
 #include "videoin.h"
 
 static int appid;

diff --git a/src/videoin.h → src/gui/videoin.h b/src/videoin.h → src/gui/videoin.h
diff --git a/src/main.c b/src/main.c
@@ -51,38 +51,38 @@
 
 #include "yaffs.h"
 #include "version.h"
-#include "videoinreconf.h"
+#include "renderer/videoinreconf.h"
 #include "shellext.h"
 #include "sysconfig.h"
 #include "fb.h"
 #include "input.h"
 #include "shortcuts.h"
 #include "osc.h"
-#include "messagebox.h"
-#include "performance.h"
-#include "cp.h"
-#include "keyboard.h"
-#include "ir.h"
-#include "audio.h"
-#include "midi.h"
-#include "oscsettings.h"
-#include "dmxspy.h"
-#include "dmxdesk.h"
-#include "dmx.h"
-#include "videoin.h"
-#include "rsswall.h"
-#include "patcheditor.h"
-#include "firstpatch.h"
-#include "monitor.h"
-#include "filemanager.h"
+#include "gui/messagebox.h"
+#include "gui/performance.h"
+#include "gui/cp.h"
+#include "gui/keyboard.h"
+#include "gui/ir.h"
+#include "gui/audio.h"
+#include "gui/midi.h"
+#include "gui/oscsettings.h"
+#include "gui/dmxspy.h"
+#include "gui/dmxdesk.h"
+#include "gui/dmx.h"
+#include "gui/videoin.h"
+#include "gui/rsswall.h"
+#include "gui/patcheditor.h"
+#include "gui/firstpatch.h"
+#include "gui/monitor.h"
+#include "gui/filemanager.h"
 #ifdef WITH_PDF
-#include "pdfreader.h"
+#include "gui/pdfreader.h"
 #endif
-#include "sysettings.h"
-#include "shutdown.h"
-#include "about.h"
-#include "flash.h"
-#include "filedialog.h"
+#include "gui/sysettings.h"
+#include "gui/shutdown.h"
+#include "gui/about.h"
+#include "gui/flash.h"
+#include "gui/filedialog.h"
 
 static rtems_task gui_task(rtems_task_argument argument)
 {

diff --git a/src/obj/gui/.keep_me b/src/obj/gui/.keep_me
diff --git a/src/obj/renderer/.keep_me b/src/obj/renderer/.keep_me
diff --git a/src/obj/translations/.keep_me b/src/obj/translations/.keep_me
diff --git a/src/osc.c b/src/osc.c
@@ -27,8 +27,8 @@
 #include <lop/lop_lowlevel.h>
 
 #include "input.h"
-#include "framedescriptor.h"
-#include "osd.h"
+#include "renderer/framedescriptor.h"
+#include "renderer/osd.h"
 
 #include "osc.h"
 

diff --git a/src/analyzer.c → src/renderer/analyzer.c b/src/analyzer.c → src/renderer/analyzer.c
diff --git a/src/analyzer.h → src/renderer/analyzer.h b/src/analyzer.h → src/renderer/analyzer.h
diff --git a/src/bandfilters.h → src/renderer/bandfilters.h b/src/bandfilters.h → src/renderer/bandfilters.h
diff --git a/src/bandfilters.sce → src/renderer/bandfilters.sce b/src/bandfilters.sce → src/renderer/bandfilters.sce
diff --git a/src/compiler.c → src/renderer/compiler.c b/src/compiler.c → src/renderer/compiler.c
diff --git a/src/compiler.h → src/renderer/compiler.h b/src/compiler.h → src/renderer/compiler.h
diff --git a/src/eval.c → src/renderer/eval.c b/src/eval.c → src/renderer/eval.c
diff --git a/src/eval.h → src/renderer/eval.h b/src/eval.h → src/renderer/eval.h