Merge pull request #48 from JohnOberhauser/io

Adding input / output options

extension.js

@@ -19,7 +19,8 @@ function enable() {
         new Features.notifications.notificationsFeature(settings),
         new Features.volumeMixer.volumeMixerFeature(settings),
         new Features.dateMenu.dateMenuFeature(settings),
-        new Features.buttonRemover.buttonRemoverFeature(settings)
+        new Features.buttonRemover.buttonRemoverFeature(settings),
+        new Features.inputOutput.inputOutputFeature(settings)
     ]
 
     // Add timeout for waitting other extensions such as GSConnect

features/inputOutput.js

@@ -0,0 +1,185 @@
+const ExtensionUtils = imports.misc.extensionUtils
+const Me = ExtensionUtils.getCurrentExtension()
+
+const featureReloader = Me.imports.libs.featureReloader
+const { addChildWithIndex } = Me.imports.libs.utility
+const { QuickSettingsGrid } = Me.imports.libs.gnome
+const { Label } = imports.gi.St
+const Volume = imports.ui.status.volume
+const PopupMenu = imports.ui.popupMenu;
+
+var inputOutputFeature = class {
+    constructor(settings) {
+        this.settings = settings
+    }
+
+    load() {
+        // setup reloader
+        featureReloader.enableWithSettingKeys(this,[
+            "output-show-selected",
+            "input-show-selected",
+            "input-always-show"
+        ])
+
+        this._setupOutputChangedListener()
+        this._setupInputChangedListener()
+        this._setupInputVisibilityObserver()
+    }
+
+    unload() {
+        // disable feature reloader
+        featureReloader.disable(this)
+
+        this._detachOutputLabel()
+        Volume.getMixerControl().disconnect(this._outputListener)
+        this._outputListener = null
+
+        this._detachInputLabel()
+        Volume.getMixerControl().disconnect(this._inputListener)
+        this._inputListener = null
+
+        this._getInputStreamSlider().disconnect(this._inputVisibilityListener)
+        this._inputVisibilityListener = null
+        this._getInputStreamSlider().visible = this._getInputStreamSlider()._shouldBeVisible()
+    }
+
+    // =========================================== Ouput ===========================================
+    _setupOutputChangedListener() {
+        this._attachOutputLabel()
+        this._outputListener = Volume.getMixerControl().connect('active-output-update', (c, id) => this._onOutputDeviceChanged(id))
+    }
+
+    _onOutputDeviceChanged(deviceId) {
+        const device = Volume.getMixerControl().lookup_output_id(deviceId)
+        this.outputLabel.text = this._getDeviceName(device)
+    }
+
+    _attachOutputLabel() {
+        this.outputLabel = new Label()
+        this.outputLabel.style_class = "QSTWEAKS-volume-mixer-label"
+        addChildWithIndex(QuickSettingsGrid, this.outputLabel, this._getOutputStreamSliderIndex() - 1);
+        this._spanTwoColumns(this.outputLabel)
+        this.outputLabel.visible = this.settings.get_boolean("output-show-selected")
+        this.outputLabel.text = this._findActiveDevice(this._getOutputStreamSlider())
+    }
+
+    _detachOutputLabel() {
+        if (this.outputLabel && this.outputLabel.get_parent()) {
+            this.outputLabel.get_parent().remove_child(this.outputLabel)
+            this.outputLabel = null
+        }
+    }
+
+    // =========================================== Input ===========================================
+    _setupInputChangedListener() {
+        this._attachInputLabel()
+        this._outputListener = Volume.getMixerControl().connect('active-input-update', (c, id) => this._onInputDeviceChanged(id))
+    }
+
+    _attachInputLabel() {
+        this.inputLabel = new Label()
+        this.inputLabel.style_class = "QSTWEAKS-volume-mixer-label"
+        addChildWithIndex(QuickSettingsGrid, this.inputLabel, this._getInputStreamSliderIndex() - 1)
+        this._spanTwoColumns(this.inputLabel)
+        this._setInputLabelVisibility()
+        this.inputLabel.text = this._findActiveDevice(this._getInputStreamSlider())
+    }
+
+    _onInputDeviceChanged(deviceId) {
+        const device = Volume.getMixerControl().lookup_input_id(deviceId)
+        this.inputLabel.text = this._getDeviceName(device)
+    }
+
+    _detachInputLabel() {
+        if (this.inputLabel && this.inputLabel.get_parent()) {
+            this.inputLabel.visible = true
+            this.inputLabel.get_parent().remove_child(this.inputLabel)
+            this.inputLabel = null
+        }
+    }
+
+    // =========================================== Input Visbility ===========================================
+    _setupInputVisibilityObserver() {
+        this._inputVisibilityListener = this._getInputStreamSlider().connect("notify::visible", () => this._onInputStreamSliderSynced())
+        this._onInputStreamSliderSynced()
+    }
+
+    _onInputStreamSliderSynced() {
+        this._setInputStreamSliderVisibility()
+        this._setInputLabelVisibility()
+    }
+
+    _setInputStreamSliderVisibility() {
+        this._getInputStreamSlider().visible = this._getInputStreamSlider()._shouldBeVisible() || this.settings.get_boolean("input-always-show")
+    }
+
+    _setInputLabelVisibility() {
+        this.inputLabel.visible = this._getInputStreamSlider().visible && this.settings.get_boolean("input-show-selected")
+    }
+
+
+    // =========================================== Utils ===========================================
+    _getInputStreamSlider() {
+        return this._getUiObject("InputStreamSlider")
+    }
+
+    _getInputStreamSliderIndex() {
+        return this._getUiObjectIndex("InputStreamSlider")
+    }
+
+    _getOutputStreamSlider() {
+        return this._getUiObject("OutputStreamSlider")
+    }
+
+    _getOutputStreamSliderIndex() {
+        return this._getUiObjectIndex("OutputStreamSlider")
+    }
+
+    _getUiObject(constructorName) {
+        let gridChildren = QuickSettingsGrid.get_children()
+        let index = this._getUiObjectIndex(constructorName)
+        if (index) {
+            return gridChildren[index]
+        }
+        return null
+    }
+
+    _getUiObjectIndex(constructorName) {
+        let gridChildren = QuickSettingsGrid.get_children()
+        let outputSliderIndex
+        for (let index = 0; index<gridChildren.length; index++) {
+            if (gridChildren[index]?.constructor?.name == constructorName) {
+                return index
+            }
+        }
+        return null
+    }
+
+    _findActiveDevice(sliderObject) {
+        // find the current selected input and grab the input text from that
+        let menuChildren = sliderObject.menu.box.get_children()[1].get_children()
+        for (let index = 0; index<menuChildren.length; index++) {
+            let item = menuChildren[index]
+            if (item._ornament == PopupMenu.Ornament.CHECK) {
+                return item.label.text
+            }
+        }
+        return null
+    }
+
+    _getDeviceName(device) {
+        if (!device)
+            return
+
+        const {description, origin} = device;
+        const name = origin
+            ? `${description} – ${origin}`
+            : description
+
+        return name
+    }
+
+    _spanTwoColumns(object) {
+        QuickSettingsGrid.layout_manager.child_set_property(QuickSettingsGrid, object, 'column-span', 2)
+    }
+};

prefPages/inputOutput.js

@@ -0,0 +1,47 @@
+const ExtensionUtils = imports.misc.extensionUtils
+const Me = ExtensionUtils.getCurrentExtension()
+const { Adw, GObject } = imports.gi
+
+const {
+    baseGTypeName,
+    makeRow,
+    makeSwitch
+} = Me.imports.libs.prefComponents
+
+var inputOutputPage = GObject.registerClass({
+    GTypeName: baseGTypeName+'inputOutputPage',
+}, class inputOutputPage extends Adw.PreferencesPage {
+    constructor(settings) {
+        // group config
+        super({
+            name: 'inputOutput',
+            title: 'Input/Output',
+            iconName: 'audio-input-microphone-symbolic'
+        })
+
+        const group = new Adw.PreferencesGroup()
+        makeSwitch({
+            parent: group,
+            title: "Show current audio output selection",
+            value: settings.get_boolean("output-show-selected"),
+            subtitle: "Always show the current audio output selection above the volume slider",
+            bind: [settings, "output-show-selected"]
+        })
+        makeSwitch({
+            parent: group,
+            title: "Show current audio input selection",
+            value: settings.get_boolean("input-show-selected"),
+            subtitle: "Always show the current audio input selection above the volume slider",
+            bind: [settings, "input-show-selected"]
+        })
+        makeSwitch({
+            parent: group,
+            title: "Always show input",
+            value: settings.get_boolean("input-always-show"),
+            subtitle: "Always show the audio input volume slider, even when there is no audio input stream.",
+            bind: [settings, "input-always-show"]
+        })
+
+        this.add(group)
+    }
+})

prefs.js

@@ -4,6 +4,7 @@ const Me = ExtensionUtils.getCurrentExtension()
 
 var pageList = [
     Me.imports.prefPages.volumeMixer.volumeMixerPage,
+    Me.imports.prefPages.inputOutput.inputOutputPage,
     Me.imports.prefPages.notifications.notificationsPage,
     Me.imports.prefPages.mediaControl.mediaControlPage,
     Me.imports.prefPages.quickToggles.quickTogglesPage,

schemas/org.gnome.shell.extensions.quick-settings-tweaks.gschema.xml

@@ -87,5 +87,16 @@
       </choices>
       <default>'block'</default>
     </key>
+
+    <!-- input output -->
+    <key name="output-show-selected" type="b">
+      <default>false</default>
+    </key>
+    <key name="input-show-selected" type="b">
+      <default>false</default>
+    </key>
+    <key name="input-always-show" type="b">
+      <default>false</default>
+    </key>
   </schema>
 </schemalist>

stylesheet.css

@@ -214,3 +214,8 @@
     .quick-settings .QSTWEAKS-media.QSTWEAKS-remove-shadow .message {
         box-shadow: none;
     }
+
+/* input output labels */
+    .QSTWEAWKS-input-output-label {
+        width: auto;
+    }