X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fbuttons.h;h=7d4153c1d39c47fe49b8dcc0dd7ec0c94ecf472a;hp=98ac5cafe6d8222d5eea9a5996e5ed3c49c12876;hb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56;hpb=c3d03cdffce070695ba0520d00667b42b8460087

diff --git a/src/buttons.h b/src/buttons.h
index 98ac5caf..7d4153c1 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -17,6 +17,11 @@
 
 #include "main.h"
 
+/* tags to draw video display labels or symbols only */
+#define VIDEO_DISPLAY_DEFAULT		0
+#define VIDEO_DISPLAY_LABEL_ONLY	1
+#define VIDEO_DISPLAY_SYMBOL_ONLY	2
+
 /* some positions in the video tape control window */
 #define VIDEO_DISPLAY1_XPOS	5
 #define VIDEO_DISPLAY1_YPOS	5
@@ -56,9 +61,9 @@
 #define VIDEO_PLAY_LABEL_YPOS	(VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PLAY_LABEL_XSIZE	22
 #define VIDEO_PLAY_LABEL_YSIZE	12
-#define VIDEO_PLAY_SYMBOL_XPOS	(VIDEO_DISPLAY2_XPOS+50)
+#define VIDEO_PLAY_SYMBOL_XPOS	(VIDEO_DISPLAY2_XPOS+52)
 #define VIDEO_PLAY_SYMBOL_YPOS	(VIDEO_DISPLAY2_YPOS)
-#define VIDEO_PLAY_SYMBOL_XSIZE	13
+#define VIDEO_PLAY_SYMBOL_XSIZE	11
 #define VIDEO_PLAY_SYMBOL_YSIZE	13
 #define VIDEO_PAUSE_LABEL_XPOS	(VIDEO_DISPLAY2_XPOS)
 #define VIDEO_PAUSE_LABEL_YPOS	(VIDEO_DISPLAY2_YPOS+20)
@@ -66,7 +71,7 @@
 #define VIDEO_PAUSE_LABEL_YSIZE	8
 #define VIDEO_PAUSE_SYMBOL_XPOS	(VIDEO_DISPLAY2_XPOS+35)
 #define VIDEO_PAUSE_SYMBOL_YPOS	(VIDEO_DISPLAY2_YPOS)
-#define VIDEO_PAUSE_SYMBOL_XSIZE 13
+#define VIDEO_PAUSE_SYMBOL_XSIZE 17
 #define VIDEO_PAUSE_SYMBOL_YSIZE 13
 #define VIDEO_TIME_XPOS		(VIDEO_DISPLAY2_XPOS+38)
 #define VIDEO_TIME_YPOS		(VIDEO_DISPLAY2_YPOS+14)
@@ -113,6 +118,11 @@
 #define VIDEO_PRESS_EJECT_OFF	(1L<<19)
 #define VIDEO_PRESS_EJECT	(VIDEO_PRESS_EJECT_OFF	| VIDEO_PRESS_EJECT_ON)
 
+/* special */
+#define VIDEO_STATE_FFWD_OFF	((1L<<20) | VIDEO_STATE_PAUSE_OFF)
+#define VIDEO_STATE_FFWD_ON	(1L<<21)
+#define VIDEO_STATE_FFWD	(VIDEO_STATE_FFWD_OFF	| VIDEO_STATE_FFWD_ON)
+
 #define BUTTON_VIDEO_EJECT	1
 #define BUTTON_VIDEO_STOP	2
 #define BUTTON_VIDEO_PAUSE	3
@@ -122,6 +132,7 @@
 #define VIDEO_STATE_OFF		(VIDEO_STATE_PLAY_OFF	|	\
 				 VIDEO_STATE_REC_OFF	|	\
 				 VIDEO_STATE_PAUSE_OFF	|	\
+				 VIDEO_STATE_FFWD_OFF	|	\
 				 VIDEO_STATE_DATE_OFF	|	\
 				 VIDEO_STATE_TIME_OFF)
 #define VIDEO_PRESS_OFF		(VIDEO_PRESS_PLAY_OFF	|	\
@@ -134,6 +145,7 @@
 #define VIDEO_STATE_ON		(VIDEO_STATE_PLAY_ON	|	\
 				 VIDEO_STATE_REC_ON	|	\
 				 VIDEO_STATE_PAUSE_ON	|	\
+				 VIDEO_STATE_FFWD_ON	|	\
 				 VIDEO_STATE_DATE_ON	|	\
 				 VIDEO_STATE_TIME_ON)
 #define VIDEO_PRESS_ON		(VIDEO_PRESS_PLAY_ON	|	\
@@ -154,11 +166,11 @@
 #define SOUND_CONTROL_XPOS	5
 #define SOUND_CONTROL_YPOS	245
 #define SOUND_CONTROL_XSIZE	90
-#define SOUND_CONTROL_YSIZE	(SOUND_BUTTON_YSIZE)
-#define SOUND_BUTTON_MUSIC_XPOS	(SOUND_CONTROL_XPOS + 0 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_LOOPS_XPOS	(SOUND_CONTROL_XPOS + 1 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_SOUND_XPOS	(SOUND_CONTROL_XPOS + 2 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_ANY_YPOS	(SOUND_CONTROL_YPOS)
+#define SOUND_CONTROL_YSIZE	 (SOUND_BUTTON_YSIZE)
+#define SOUND_BUTTON_MUSIC_XPOS	 (SOUND_CONTROL_XPOS + 0 * SOUND_BUTTON_XSIZE)
+#define SOUND_BUTTON_LOOPS_XPOS	 (SOUND_CONTROL_XPOS + 1 * SOUND_BUTTON_XSIZE)
+#define SOUND_BUTTON_SIMPLE_XPOS (SOUND_CONTROL_XPOS + 2 * SOUND_BUTTON_XSIZE)
+#define SOUND_BUTTON_ANY_YPOS	 (SOUND_CONTROL_YPOS)
 
 #define ON_SOUND_BUTTON(x,y)	((x)>=(DX+SOUND_CONTROL_XPOS) &&	\
 				 (x)< (DX+SOUND_CONTROL_XPOS +		\
@@ -171,17 +183,17 @@
 /* values for sound control */
 #define BUTTON_SOUND_MUSIC	(1L<<0)
 #define BUTTON_SOUND_LOOPS	(1L<<1)
-#define BUTTON_SOUND_SOUND	(1L<<2)
+#define BUTTON_SOUND_SIMPLE	(1L<<2)
 #define BUTTON_RELEASED		0
 #define BUTTON_PRESSED		(1L<<3)
 #define BUTTON_OFF		0
 #define BUTTON_ON		(1L<<4)
-#define BUTTON_SOUND_MUSIC_OFF	(BUTTON_SOUND_MUSIC | BUTTON_OFF)
-#define BUTTON_SOUND_LOOPS_OFF	(BUTTON_SOUND_LOOPS | BUTTON_OFF)
-#define BUTTON_SOUND_SOUND_OFF	(BUTTON_SOUND_SOUND | BUTTON_OFF)
-#define BUTTON_SOUND_MUSIC_ON	(BUTTON_SOUND_MUSIC | BUTTON_ON)
-#define BUTTON_SOUND_LOOPS_ON	(BUTTON_SOUND_LOOPS | BUTTON_ON)
-#define BUTTON_SOUND_SOUND_ON	(BUTTON_SOUND_SOUND | BUTTON_ON)
+#define BUTTON_SOUND_MUSIC_OFF	(BUTTON_SOUND_MUSIC  | BUTTON_OFF)
+#define BUTTON_SOUND_LOOPS_OFF	(BUTTON_SOUND_LOOPS  | BUTTON_OFF)
+#define BUTTON_SOUND_SIMPLE_OFF	(BUTTON_SOUND_SIMPLE | BUTTON_OFF)
+#define BUTTON_SOUND_MUSIC_ON	(BUTTON_SOUND_MUSIC  | BUTTON_ON)
+#define BUTTON_SOUND_LOOPS_ON	(BUTTON_SOUND_LOOPS  | BUTTON_ON)
+#define BUTTON_SOUND_SIMPLE_ON	(BUTTON_SOUND_SIMPLE | BUTTON_ON)
 
 
 /* some positions in the game control window */