Skip to content

Commit 95ed954

Browse files
samuelweisamuelwei
authored
Fix hideVerificationButtons
1 parent 975902e commit 95ed954

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎appliance-application/packages/main/src/StreamDeckHID.ts‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ import BaseStreamDeckHID from '/@/BaseStreamDeckHID';
88
const __filename = fileURLToPath(import.meta.url);
99
const __dirname = path.dirname(__filename);
1010

11-
export default class StreamDeckMiniHID extends BaseStreamDeckHID {
11+
export default class StreamDeckHID extends BaseStreamDeckHID {
1212
static SCREEN_PIXEL_WIDTH = 240;
1313
static SCREEN_PIXEL_HEIGHT = 160;
1414
static BUTTON_PIXEL_WIDTH = 80;
1515
static BUTTON_PIXEL_HEIGHT = 80;
1616

1717
static BUTTONS = {
18-
accept: { index: 0, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
19-
reject: { index: 1, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
20-
mute: { index: 0, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
21-
unmute: { index: 1, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
18+
accept: { index: 0, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
19+
reject: { index: 1, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
20+
mute: { index: 0, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
21+
unmute: { index: 1, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
2222

23-
layout_0: {index: 5, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
24-
layout_1: { index: 6, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
25-
layout_2: { index: 7, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
26-
layout_3: { index: 8, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
27-
layout_4: { index: 9, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
23+
layout_0: {index: 5, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
24+
layout_1: { index: 6, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
25+
layout_2: { index: 7, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
26+
layout_3: { index: 8, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
27+
layout_4: { index: 9, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
2828

29-
leave: { index: 14, width: StreamDeckMiniHID.BUTTON_PIXEL_WIDTH, height: StreamDeckMiniHID.BUTTON_PIXEL_HEIGHT },
29+
leave: { index: 14, width: StreamDeckHID.BUTTON_PIXEL_WIDTH, height: StreamDeckHID.BUTTON_PIXEL_HEIGHT },
3030

3131
};
3232

@@ -46,39 +46,39 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
4646

4747
if (this.hasVerificationPending) {
4848
switch (button.index) {
49-
case StreamDeckMiniHID.BUTTONS.accept.index:
49+
case StreamDeckHID.BUTTONS.accept.index:
5050
this.acceptCallback();
5151
break;
52-
case StreamDeckMiniHID.BUTTONS.reject.index:
52+
case StreamDeckHID.BUTTONS.reject.index:
5353
this.rejectCallback();
5454
break;
5555
}
5656
}
5757

5858
if (this.isConnected) {
5959
switch (button.index) {
60-
case StreamDeckMiniHID.BUTTONS.mute.index:
60+
case StreamDeckHID.BUTTONS.mute.index:
6161
this.actions.mute();
6262
break;
63-
case StreamDeckMiniHID.BUTTONS.unmute.index:
63+
case StreamDeckHID.BUTTONS.unmute.index:
6464
this.actions.unmute();
6565
break;
66-
case StreamDeckMiniHID.BUTTONS.leave.index:
66+
case StreamDeckHID.BUTTONS.leave.index:
6767
this.actions.leave();
6868
break;
69-
case StreamDeckMiniHID.BUTTONS.layout_0.index:
69+
case StreamDeckHID.BUTTONS.layout_0.index:
7070
this.changeLayout(0);
7171
break;
72-
case StreamDeckMiniHID.BUTTONS.layout_1.index:
72+
case StreamDeckHID.BUTTONS.layout_1.index:
7373
this.changeLayout(1);
7474
break;
75-
case StreamDeckMiniHID.BUTTONS.layout_2.index:
75+
case StreamDeckHID.BUTTONS.layout_2.index:
7676
this.changeLayout(2);
7777
break;
78-
case StreamDeckMiniHID.BUTTONS.layout_3.index:
78+
case StreamDeckHID.BUTTONS.layout_3.index:
7979
this.changeLayout(3);
8080
break;
81-
case StreamDeckMiniHID.BUTTONS.layout_4.index:
81+
case StreamDeckHID.BUTTONS.layout_4.index:
8282
this.changeLayout(4);
8383
break;
8484
}
@@ -111,8 +111,8 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
111111
showVerificationButtons(): void {
112112
super.showVerificationButtons();
113113

114-
this.setButtonImage(StreamDeckMiniHID.BUTTONS.accept, 'accept.png');
115-
this.setButtonImage(StreamDeckMiniHID.BUTTONS.reject, 'reject.png');
114+
this.setButtonImage(StreamDeckHID.BUTTONS.accept, 'accept.png');
115+
this.setButtonImage(StreamDeckHID.BUTTONS.reject, 'reject.png');
116116
}
117117

118118
async showBBBScreen(): void {
@@ -121,8 +121,8 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
121121
this.streamDeck.fillPanelBuffer(await sharp(path.resolve(__dirname, '../assets/bbb.png'))
122122
.flatten()
123123
.resize(
124-
StreamDeckMiniHID.SCREEN_PIXEL_WIDTH,
125-
StreamDeckMiniHID.SCREEN_PIXEL_HEIGHT,
124+
StreamDeckHID.SCREEN_PIXEL_WIDTH,
125+
StreamDeckHID.SCREEN_PIXEL_HEIGHT,
126126
{
127127
fit: 'contain',
128128
background: {r: 0, g: 0, b: 0},
@@ -133,18 +133,18 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
133133
}
134134

135135
hideVerificationButtons(): void {
136-
this.streamDeck.clearKey(this.ACCEPT_BUTTON.index);
137-
this.streamDeck.clearKey(this.REJECT_BUTTON.index);
136+
this.streamDeck.clearKey(StreamDeckHID.BUTTONS.accept.index);
137+
this.streamDeck.clearKey(StreamDeckHID.BUTTONS.reject.index);
138138
}
139139

140140
async showLayoutButtons(): void {
141141

142142
// Get list of all buttons starting with "layout_"
143-
const layoutButtons = Object.keys(StreamDeckMiniHID.BUTTONS).filter(key => key.startsWith('layout_'));
143+
const layoutButtons = Object.keys(StreamDeckHID.BUTTONS).filter(key => key.startsWith('layout_'));
144144

145145
// Loop through all layout buttons and set the image for the selected layout to black and white and the others to white and black
146146
for (const key of layoutButtons) {
147-
const button = StreamDeckMiniHID.BUTTONS[key];
147+
const button = StreamDeckHID.BUTTONS[key];
148148

149149
const layoutIndex = parseInt(key.split('_')[1]);
150150

@@ -172,9 +172,9 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
172172
connected(actions: HIDActions): void {
173173
this.streamDeck.clearPanel();
174174

175-
this.setButtonImage(StreamDeckMiniHID.BUTTONS.mute, 'mute.png');
176-
this.setButtonImage(StreamDeckMiniHID.BUTTONS.unmute, 'unmute.png');
177-
this.setButtonImage(StreamDeckMiniHID.BUTTONS.leave, 'leave.png');
175+
this.setButtonImage(StreamDeckHID.BUTTONS.mute, 'mute.png');
176+
this.setButtonImage(StreamDeckHID.BUTTONS.unmute, 'unmute.png');
177+
this.setButtonImage(StreamDeckHID.BUTTONS.leave, 'leave.png');
178178

179179
this.showLayoutButtons(0);
180180

‎appliance-application/packages/main/src/StreamDeckMiniHID.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ export default class StreamDeckMiniHID extends BaseStreamDeckHID {
122122
}
123123

124124
hideVerificationButtons(): void {
125-
this.streamDeck.clearKey(this.ACCEPT_BUTTON.index);
126-
this.streamDeck.clearKey(this.REJECT_BUTTON.index);
125+
this.streamDeck.clearKey(StreamDeckMiniHID.BUTTONS.accept.index);
126+
this.streamDeck.clearKey(StreamDeckMiniHID.BUTTONS.reject.index);
127127
}
128128

129129
async showLayoutButtons(): void {

0 commit comments

Comments
 (0)