added skindata store.

changed function calls to macro proc calls.

removed useless define and replaced it with proper PAL call.

1 files changed, 8 insertions, 8 deletions

diff --git a/Graphic_Equalizer/src/main.hcc b/Graphic_Equalizer/src/main.hcc
index b460a0e..3bb1dca 100644
--- a/Graphic_Equalizer/src/main.hcc
+++ b/Graphic_Equalizer/src/main.hcc
@@ -32,6 +32,7 @@
 #include "mouse.hch"

 #include "eventhandler_shared.hch"

 #include "eventhandler.hch"

+#include "display_shared.hch"

 #include "display.hch"

 #include "smartmedia.hch"

 

@@ -42,10 +43,8 @@
 	#include "debug.hch"

 #endif

 

-

-

 /*! \fn		void main(void);

- * \brief	Main User Input/Ouput loop.

+ * \brief	Main Application Loop.

  * 

  * \param	void

  *

@@ -65,6 +64,7 @@ void main(void) {
 	mousedata_t mousedata;

 	events_t events;

 	audiodata_t audiodata;

+	skindata_t skindata;

 	unsigned 1 result;

 

 	/*

@@ -125,7 +125,7 @@ void main(void) {
 			print_string("Graphic Equalizer 2");

 			print_eol();

 #endif

-			display_init(ClockRate);

+			PalVideoOutEnable(VideoOut);

 			PalAudioInEnable(AudioIn);

 			PalAudioOutEnable(AudioOut);

 			audio_init(6, LINE_IN, SR_44100, AudioIn, AudioOut);

@@ -134,13 +134,13 @@ void main(void) {
 			 * Once we properly setup the SmartMedia we load our

 			 * data folowed by our main program loop.

 			 */

-			result = smartmedia_init();

+			smartmedia_init(result);

 			if (!result) {

 #endif

 #if HAVE_DEBUG

 				print_string("Loading Skin ...");

 #endif

-				smartmedia_loaddata(RAM_BANK0);

+				smartmedia_loaddata(skindata, RAM_BANK0);

 #if HAVE_DEBUG

 				print_eol();

 				print_string("Done Loading Skin ...");

@@ -159,8 +159,8 @@ void main(void) {
 					 * should ever return.

 					 */

 					mouse_main(mousedata);

-					display_main(audiodata, events, mousedata, ClockRate, VideoOut, RAM_BANK0);

-					eventhandler_main(&audiodata, &events, &mousedata);

+					display_main(skindata, audiodata, events, mousedata, ClockRate, VideoOut, RAM_BANK0);

+					eventhandler_main(audiodata, events, mousedata);

 					audio_main(audiodata, AudioIn, AudioOut);

 				}

 #if HAVE_SMARTMEDIA