From: Holger Schemel Date: Thu, 2 Jun 2016 05:15:12 +0000 (+0200) Subject: changed order of tape controls X-Git-Tag: 4.0.0.0-rc3~34 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=5dfaa039ed3cb9de43f565346ee4b18b03ec2961;hp=0a906ece8d19e328623741f13c181e73308fcd02 changed order of tape controls --- diff --git a/src/tape.c b/src/tape.c index cd9fa88b..70e6272a 100644 --- a/src/tape.c +++ b/src/tape.c @@ -229,16 +229,16 @@ static void DrawVideoDisplay_Graphics(unsigned int state, unsigned int value) { IMG_GFX_TAPE_SYMBOL_FAST_FORWARD, &tape.symbol.fast_forward }, }, { - { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END, &tape.label.pause_before_end }, - { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END, &tape.symbol.pause_before_end }, + { IMG_GFX_TAPE_LABEL_WARP_FORWARD, &tape.label.warp_forward }, + { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD, &tape.symbol.warp_forward }, }, { { IMG_GFX_TAPE_LABEL_WARP_FORWARD_BLIND, &tape.label.warp_forward_blind}, { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD_BLIND, &tape.symbol.warp_forward_blind}, }, { - { IMG_GFX_TAPE_LABEL_WARP_FORWARD, &tape.label.warp_forward }, - { IMG_GFX_TAPE_SYMBOL_WARP_FORWARD, &tape.symbol.warp_forward }, + { IMG_GFX_TAPE_LABEL_PAUSE_BEFORE_END, &tape.label.pause_before_end }, + { IMG_GFX_TAPE_SYMBOL_PAUSE_BEFORE_END, &tape.symbol.pause_before_end }, }, { { IMG_GFX_TAPE_LABEL_SINGLE_STEP, &tape.label.single_step }, diff --git a/src/tape.h b/src/tape.h index 2eb089e5..03849d0a 100644 --- a/src/tape.h +++ b/src/tape.h @@ -49,14 +49,15 @@ #define VIDEO_STATE_FRAME_ON (1 << 11) #define VIDEO_STATE_FFWD_OFF (1 << 12) #define VIDEO_STATE_FFWD_ON (1 << 13) -#define VIDEO_STATE_PBEND_OFF (1 << 14) -#define VIDEO_STATE_PBEND_ON (1 << 15) -#define VIDEO_STATE_WARP_OFF (1 << 16) -#define VIDEO_STATE_WARP_ON (1 << 17) -#define VIDEO_STATE_WARP2_OFF (1 << 18) -#define VIDEO_STATE_WARP2_ON (1 << 19) +#define VIDEO_STATE_WARP_OFF (1 << 14) +#define VIDEO_STATE_WARP_ON (1 << 15) +#define VIDEO_STATE_WARP2_OFF (1 << 16) +#define VIDEO_STATE_WARP2_ON (1 << 17) +#define VIDEO_STATE_PBEND_OFF (1 << 18) +#define VIDEO_STATE_PBEND_ON (1 << 19) #define VIDEO_STATE_1STEP_OFF (1 << 20) #define VIDEO_STATE_1STEP_ON (1 << 21) + #define VIDEO_PRESS_PLAY_ON (1 << 22) #define VIDEO_PRESS_PLAY_OFF (1 << 23) #define VIDEO_PRESS_REC_ON (1 << 24) @@ -75,10 +76,11 @@ #define VIDEO_STATE_TIME(x) ((x) ? VIDEO_STATE_TIME_ON : VIDEO_STATE_TIME_OFF) #define VIDEO_STATE_FRAME(x) ((x) ? VIDEO_STATE_FRAME_ON: VIDEO_STATE_FRAME_OFF) #define VIDEO_STATE_FFWD(x) ((x) ? VIDEO_STATE_FFWD_ON : VIDEO_STATE_FFWD_OFF) -#define VIDEO_STATE_PBEND(x) ((x) ? VIDEO_STATE_PBEND_ON: VIDEO_STATE_PBEND_OFF) #define VIDEO_STATE_WARP(x) ((x) ? VIDEO_STATE_WARP_ON : VIDEO_STATE_WARP_OFF) #define VIDEO_STATE_WARP2(x) ((x) ? VIDEO_STATE_WARP2_ON: VIDEO_STATE_WARP2_OFF) +#define VIDEO_STATE_PBEND(x) ((x) ? VIDEO_STATE_PBEND_ON: VIDEO_STATE_PBEND_OFF) #define VIDEO_STATE_1STEP(x) ((x) ? VIDEO_STATE_1STEP_ON: VIDEO_STATE_1STEP_OFF) + #define VIDEO_PRESS_PLAY(x) ((x) ? VIDEO_PRESS_PLAY_ON : VIDEO_PRESS_PLAY_OFF) #define VIDEO_PRESS_REC(x) ((x) ? VIDEO_PRESS_REC_ON : VIDEO_PRESS_REC_OFF) #define VIDEO_PRESS_PAUSE(x) ((x) ? VIDEO_PRESS_PAUSE_ON: VIDEO_PRESS_PAUSE_OFF)