diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2004-12-13 13:44:25 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2004-12-13 13:44:25 (GMT) |
| commit | 2c5dd3b51c018ce3ceb032f9cf8e7f79a4b87be5 (patch) | |
| tree | 7e0154027c8755a050e2e2be75374d79056b1394 /Graphic_Equalizer/include | |
| parent | a36eb1eea6a1eec3d3a269f235b2f9d169dfa4fb (diff) | |
| download | TASS-2c5dd3b51c018ce3ceb032f9cf8e7f79a4b87be5.zip TASS-2c5dd3b51c018ce3ceb032f9cf8e7f79a4b87be5.tar.gz TASS-2c5dd3b51c018ce3ceb032f9cf8e7f79a4b87be5.tar.bz2 | |
Fixed merge bug with preset defines.
Replaced skin struct with more advanced struct.
It is still a typedef however. FIXME: Should be changed to 'regular' struct.
Diffstat (limited to 'Graphic_Equalizer/include')
| -rw-r--r-- | Graphic_Equalizer/include/display_shared.hch | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/Graphic_Equalizer/include/display_shared.hch b/Graphic_Equalizer/include/display_shared.hch index 11d6edc..103cc9f 100644 --- a/Graphic_Equalizer/include/display_shared.hch +++ b/Graphic_Equalizer/include/display_shared.hch @@ -22,28 +22,29 @@ +/*! \struct skin_info_t
+ * \brief Structure containing the four boundry limits of an area and
+ * maximal two colors per area.
+ */
+typedef struct {
+ unsigned 10 bottom; /*!< lowest point registerd in the area */
+ unsigned 10 top; /*!< highest point registerd in the area */
+ unsigned 10 left; /*!< leftmost point registerd in the area */
+ unsigned 10 right; /*!< rightmost point registerd in the area */
+ unsigned 24 color_primary; /*!< primary color for this area */
+ unsigned 24 color_secondary; /*!< optionally an area can have a second color */
+} skininfo_t;
+
/*! \struct skindata_t
* \brief This struct contains all area- dimensions and color information
* for the skin.
*/
-struct skindata_t {
- /*! \struct skin_info_t
- * \brief Structure containing the four boundry limits of an area and
- * maximal two colors per area.
- */
- struct skin_info_t {
- unsigned 10 area_bottom; /*!< lowest point registerd in the area */
- unsigned 10 area_top; /*!< highest point registerd in the area */
- unsigned 10 area_left; /*!< leftmost point registerd in the area */
- unsigned 10 area_right; /*!< rightmost point registerd in the area */
- unsigned 24 color_primary; /*!< primary color for this area */
- unsigned 24 color_secondary; /*!< optionally an area can have a second color */
- };
- struct skin_info_t waveform; /*!< We store all information about the waveform area here. */
- struct skin_info_t spectrum; /*!< We store all information about the spectrum analyzer area here. */
- struct skin_info_t volume; /*!< We store all information about the volume control area here. */
- struct skin_info_t equalizer; /*!< We store all information about the equalizerbars here. */
-};
+typedef struct {
+ skininfo_t waveform; /*!< We store all information about the waveform area here. */
+ skininfo_t spectrum; /*!< We store all information about the spectrum analyzer area here. */
+ skininfo_t volume; /*!< We store all information about the volume control area here. */
+ skininfo_t equalizer; /*!< We store all information about the equalizerbars here. */
+} skindata_t;
@@ -62,11 +63,9 @@ struct skindata_t { #define BUTTON_PRESET_5 0x0b /*!< Button for switching to preset 5 */
#define BUTTON_PRESET_6 0x0c /*!< Button for switching to preset 6 */
-#define BUTTON_CONVEX_FULL 0x0d /*!< / - \ 'Convex' mode Button*/
-#define BUTTON_CONVEX_HALF 0x0e /*!< /\ 'Convex' mode Button */
-#define BUTTON_PRECISE 0x0f /*!< | 'Precise' selection Button */
-#define BUTTON_CONCAVE_HALF 0x10 /*!< \/ 'Concave' mode Button */
-#define BUTTON_CONCAVE_FULL 0x11 /*!< \ _ / 'Concave' mode Button */
+#define BUTTON_PRECISE 0x0d /*!< | 'Precise' selection Button */
+#define BUTTON_CONVEX_HALF 0x0f /*!< /\ 'Convex' mode Button */
+#define BUTTON_CONVEX_FULL 0x11 /*!< / - \ 'Convex' mode Button*/
#define BUTTON_HELP 0x12 /*!< Button to display help screen. */
#define BUTTON_MODE 0x13 /*!< Button to change operation mode. */
|