feat: channel strip follows PFL

olzzon · Jun 18, 2020 · 3f3b867 · 3f3b867
1 parent 4ae5cac
commit 3f3b867
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/client/components/Channel.tsx b/client/components/Channel.tsx
@@ -82,6 +82,13 @@ class Channel extends React.Component<
 
     handlePfl() {
         window.socketIoClient.emit(SOCKET_TOGGLE_PFL, this.faderIndex)
+        if (
+            this.props.settings.chanStripFollowsPFL &&
+            !this.props.fader.pflOn &&
+            this.props.settings.showChanStrip !== this.faderIndex
+        ) {
+            this.handleShowChanStrip()
+        }
     }
 
     handleMute() {

diff --git a/client/components/Channels.tsx b/client/components/Channels.tsx
@@ -127,7 +127,8 @@ class Channels extends React.Component<IChannelsInjectProps & Store> {
                         this.handlePages(PageType.NumberedPage, i)
                     }}
                 >
-                    CH{i * pageLength + 1}-{(i + 1) * pageLength}
+                    CH{i * pageLength + 1}-
+                    {Math.min((i + 1) * pageLength, numberOfFaders)}
                 </button>
             )
         }

diff --git a/client/components/Settings.tsx b/client/components/Settings.tsx
@@ -424,6 +424,16 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
                     />
                 </label>
                 <br />
+                <label className="settings-input-field">
+                    CHANNEL STRIP FOLLOWS PFL:
+                    <input
+                        type="checkbox"
+                        name="chanStripFollowsPFL"
+                        checked={this.state.settings.chanStripFollowsPFL}
+                        onChange={this.handleChange}
+                    />
+                </label>
+                <br />
                 {window.mixerProtocol.protocol === 'MIDI'
                     ? this.renderMixerMidiSettings()
                     : ''}

diff --git a/server/reducers/settingsReducer.ts b/server/reducers/settingsReducer.ts
@@ -64,6 +64,7 @@ export interface ISettings {
     showPfl: boolean
     enablePages: boolean
     pageLength: number
+    chanStripFollowsPFL: boolean
 
     /** Connection state */
     mixerOnline: boolean
@@ -105,6 +106,7 @@ const defaultSettingsReducerState: Array<ISettings> = [
         showPfl: false,
         enablePages: true,
         pageLength: 16,
+        chanStripFollowsPFL: true,
 
         mixerOnline: false,
         serverOnline: true,