Clarify file naming

Author: jserv

Makefile

@@ -73,7 +73,7 @@ endif
 # Applications
 
 libapps.a_files-y := apps/dummy.c
-libapps.a_files-$(CONFIG_DEMO_MULTI) += apps/demo.c
+libapps.a_files-$(CONFIG_DEMO_MULTI) += apps/multi.c
 libapps.a_files-$(CONFIG_DEMO_HELLO) += apps/hello.c
 libapps.a_files-$(CONFIG_DEMO_CLOCK) += apps/clock.c
 libapps.a_files-$(CONFIG_DEMO_CALCULATOR) += apps/calc.c

apps/apps_demo.h

@@ -0,0 +1,19 @@
+/*
+ * Twin - A Tiny Window System
+ * Copyright (c) 2004 Keith Packard <keithp@keithp.com>
+ * All rights reserved.
+ */
+
+#ifndef _APPS_MULTI_H_
+#define _APPS_MULTI_H_
+
+#include <twin.h>
+
+void apps_multi_start(twin_screen_t *screen,
+                      const char *name,
+                      int x,
+                      int y,
+                      int w,
+                      int h);
+
+#endif /* _APPS_MULTI_H_ */

apps/apps_multi.h

@@ -15,9 +15,9 @@
 
 #include "apps_calc.h"
 #include "apps_clock.h"
-#include "apps_demo.h"
 #include "apps_hello.h"
 #include "apps_line.h"
+#include "apps_multi.h"
 #include "apps_spline.h"
 
 #define WIDTH 640
@@ -105,7 +105,7 @@ int main(void)
         tx->screen, load_background(tx->screen, ASSET_PATH "/tux.png"));
 
 #if defined(CONFIG_DEMO_MULTI)
-    apps_demo_start(tx->screen, "Demo", 100, 100, 400, 400);
+    apps_multi_start(tx->screen, "Demo", 100, 100, 400, 400);
 #endif
 #if defined(CONFIG_DEMO_HELLO)
     apps_hello_start(tx->screen, "Hello, World", 0, 0, 200, 200);

apps/main.c

@@ -4,7 +4,7 @@
  * All rights reserved.
  */
 
-#include "apps_demo.h"
+#include "apps_multi.h"
 
 #define D(x) twin_double_to_fixed(x)
 
@@ -219,12 +219,12 @@ static void apps_jelly_start(twin_screen_t *screen, int x, int y, int w, int h)
     twin_window_show(window);
 }
 
-void apps_demo_start(twin_screen_t *screen,
-                     const char *name,
-                     int x,
-                     int y,
-                     int w,
-                     int h)
+void apps_multi_start(twin_screen_t *screen,
+                      const char *name,
+                      int x,
+                      int y,
+                      int w,
+                      int h)
 {
     (void) name;
     apps_circletext_start(screen, x, y, w, h);