Replaced skin struct with more advanced struct.

It is still a typedef however. FIXME: Should be changed to 'regular' struct.

2 files changed, 33 insertions, 27 deletions

diff --git a/Graphic_Equalizer/src/display.hcc b/Graphic_Equalizer/src/display.hcc
index 1aeb9d9..1207db8 100644
--- a/Graphic_Equalizer/src/display.hcc
+++ b/Graphic_Equalizer/src/display.hcc
@@ -77,6 +77,7 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 	macro expr SCANX = PalVideoOutGetX(VIDEOOUT);

 	macro expr SCANY = PalVideoOutGetY(VIDEOOUT);

 	

+	unsigned 10 image_counter[24];

 	unsigned DW pixeldata;

 	unsigned 24 visual_graph_color;

 	unsigned AW address, address_offset;

@@ -145,8 +146,8 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 					/*

 					 */

 					case AREA_WAVEFORM:

-						if (SCANY == 0 @ skindata->area_waveform_bottom -(0 @ (audiodata->ifft_info.read[((SCANX -(0 @ skindata->area_waveform_left)) <-8)]))) {

-							PalVideoOutWrite(VIDEOOUT, skindata->color_area_waveform);

+						if (SCANY == 0 @ skindata->waveform.bottom -(0 @ (audiodata->ifft_info.read[((SCANX -(0 @ skindata->waveform.left)) <-8)]))) {

+							PalVideoOutWrite(VIDEOOUT, skindata->waveform.color_primary);

 						} else {

 							PalVideoOutWrite(VIDEOOUT, PIXEL);

 						}

@@ -162,7 +163,7 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 						 * pixel after this point is drawn.

 						 */

 						if (SCANY >= 0 @ events->volume_position) {

-							PalVideoOutWrite(VIDEOOUT, skindata->color_area_volume);

+							PalVideoOutWrite(VIDEOOUT, skindata->volume.color_primary);

 						} else {

 							PalVideoOutWrite(VIDEOOUT, PIXEL);

 						}

@@ -175,7 +176,7 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 						/*

 						 * We draw every pixel that is smaller TODO

 						 */

-						if ((SCANY >= (0 @ skindata->area_spectrum_bottom) -(0 @ audiodata->fft_info.read[(SCANX -(0 @ skindata->area_spectrum_left))[9:2]])) && ((SCANX -(0 @ skindata->area_spectrum_left)) <- 2)) {

+						if ((SCANY >= (0 @ skindata->spectrum.bottom) -(0 @ audiodata->fft_info.read[(SCANX -(0 @ skindata->spectrum.left))[9:2]])) && ((SCANX -(0 @ skindata->spectrum.left)) <- 2)) {

 							PalVideoOutWrite(VIDEOOUT, PIXEL_SPECTRUM);

 						} else {

 							PalVideoOutWrite(VIDEOOUT, PIXEL);

@@ -203,11 +204,9 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 						draw_button((events->active_preset +BUTTON_PRESET_1) <- 8);

 						break;

 

-					case BUTTON_PRECISE: 		/* fall through */

-					case BUTTON_CONCAVE_HALF: 	/* fall through */

-					case BUTTON_CONVEX_HALF: 	/* fall through */

-					case BUTTON_CONCAVE_FULL:	/* fall through */

-					case BUTTON_CONVEX_FULL: 

+					case BUTTON_PRECISE:		/* fall through */

+					case BUTTON_CONVEX_HALF:	/* fall through */

+					case BUTTON_CONVEX_FULL:

 						/*

 						 * equalizer mode tells us what button

 						 * is currently enabled. By adding the

@@ -239,7 +238,7 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 					/* (pixeldata[31:24] <= AREA_EQUALIZER_MAX) &&  */

 						if ((AREA_EQUALIZER_MIN <= pixeldata[31:24]) && (!events->locked_display)) {

 							if ((SCANY == 0 @ events->equalizer_display[(pixeldata[31:24] -AREA_EQUALIZER_MIN) <- 7]) || ((SCANY +1) == 0 @ events->equalizer_display[(pixeldata[31:24] -AREA_EQUALIZER_MIN) <- 7])) {

-								PalVideoOutWrite(VIDEOOUT, skindata->color_equalizer);

+								PalVideoOutWrite(VIDEOOUT, skindata->equalizer.color_primary);

 							} else {

 								PalVideoOutWrite(VIDEOOUT, PIXEL);

 							}

@@ -272,6 +271,10 @@ void display_main(skindata_t *skindata, audiodata_t *audiodata, events_t *events
 			}

 

 			/*

+			 */

+			image_counter[(pixeldata[31:24] \\ 1) <- 5]++;

+

+			/*

 			 * The current position of the screen can lay in an

 			 * area called the blanking area. We don't have data

 			 * for this area as it is not drawn. We therefor have

diff --git a/Graphic_Equalizer/src/smartmedia.hcc b/Graphic_Equalizer/src/smartmedia.hcc
index ff405c1..308e3a5 100644
--- a/Graphic_Equalizer/src/smartmedia.hcc
+++ b/Graphic_Equalizer/src/smartmedia.hcc
@@ -213,21 +213,24 @@ void smartmedia_loaddata(skindata_t *skindata) {
 	 * This block needs to probably move up into the fore loop where we

 	 * calculate these settings later.

 	 */

-	skindata->area_spectrum_top = 200;

-	skindata->area_spectrum_bottom = 335;

-	skindata->area_spectrum_left = 77;

-	skindata->area_spectrum_right = 575;

-	skindata->area_waveform_top = 46;

-	skindata->area_waveform_bottom = 118;

-	skindata->area_waveform_left = 76;

-	skindata->area_waveform_right = 413;

-	skindata->area_volume_top = 112;

-	skindata->area_volume_bottom = 66;

-	skindata->area_volume_left = 439;

-	skindata->area_volume_right = 455;

-	skindata->color_area_volume = PIXEL_VOLUME;

-	skindata->color_area_waveform = PIXEL_WAVEFORM;

-//	skindata->color_area_spectrum_top = PIXEL_SPECTRUM;

-//	skindata->color_area_spectrum_bottom = PIXEL_SPECTRUM;

-	skindata->color_equalizer = PIXEL_EQUALIZER;

+	skindata->spectrum.top = 200;

+	skindata->spectrum.bottom = 335;

+	skindata->spectrum.left = 77;

+	skindata->spectrum.right = 575;

+//	skindata->spectrum.color_primary = PIXEL_SPECTRUM;

+//	skindata->spectrum.color_secondary = PIXEL_SPECTRUM;

+

+	skindata->waveform.top = 46;

+	skindata->waveform.bottom = 118;

+	skindata->waveform.left = 76;

+	skindata->waveform.right = 413;

+	skindata->waveform.color_primary = PIXEL_WAVEFORM;

+

+	skindata->volume.top = 112;

+	skindata->volume.bottom = 66;

+	skindata->volume.left = 439;

+	skindata->volume.right = 455;

+	skindata->volume.color_primary = PIXEL_VOLUME;

+

+	skindata->equalizer.color_primary = PIXEL_EQUALIZER;

 } /* --- smartmedia_loaddata() --- */