Show monitor source edges

components/graph/index.js

@@ -25,7 +25,10 @@ const {
 	icons: iconsActions,
 } = require('../../actions');
 
-const { getPaiByTypeAndIndex } = require('../../selectors');
+const {
+	getPaiByTypeAndIndex,
+	getDerivedMonitorSources,
+} = require('../../selectors');
 
 const {
 	PA_VOLUME_NORM,
@@ -50,6 +53,9 @@ const dgoToPai = new WeakMap();
 const key = pao => `${pao.type}-${pao.index}`;
 
 const sourceKey = pai => {
+	if (pai.type === 'monitorSource') {
+		return `sink-${pai.sinkIndex}`;
+	}
 	if (pai.clientIndex === -1) {
 		return `module-${pai.moduleIndex}`;
 	}
@@ -57,6 +63,9 @@ const sourceKey = pai => {
 };
 
 const targetKey = pai => {
+	if (pai.type === 'monitorSource') {
+		return `source-${pai.sourceIndex}`;
+	}
 	if (pai.type === 'sinkInput') {
 		return `sink-${pai.sinkIndex}`;
 	}
@@ -377,28 +386,36 @@ const ModuleText = ({ dgo, pai, state }) => r.div([
 	r(DebugText, { dgo, pai, state }),
 ]);
 
-const renderNodeText = state => (dgo, i, selected) => r('foreignObject', {
+const renderNodeText = state => (dgo, i, selected) => {
-	x: -s2,
+	const pai = dgoToPai.get(dgo);
-	y: -s2,
-}, r.div({
-	className: 'node-text',
-	style: {
-		width: size,
-		height: size,
 
-		backgroundImage: (icon => icon && `url(${icon})`)(state.icons[getPaiIcon(dgoToPai.get(dgo))]),
+	if (!pai) {
-	},
+		return r(React.Fragment);
-}, r({
+	}
-	sink: SinkText,
+
-	source: SourceText,
+	return r('foreignObject', {
-	client: ClientText,
+		x: -s2,
-	module: ModuleText,
+		y: -s2,
-}[dgo.type] || ModuleText, {
+	}, r.div({
-	dgo,
+		className: 'node-text',
-	pai: dgoToPai.get(dgo),
+		style: {
-	state,
+			width: size,
-	selected,
+			height: size,
-})));
+
+			backgroundImage: (icon => icon && `url(${icon})`)(state.icons[getPaiIcon(pai)]),
+		},
+	}, r({
+		sink: SinkText,
+		source: SourceText,
+		client: ClientText,
+		module: ModuleText,
+	}[dgo.type] || ModuleText, {
+		dgo,
+		pai,
+		state,
+		selected,
+	})));
+};
 
 const renderEdge = props => r(Edge, {
 	classSet: {
@@ -529,6 +546,7 @@ class Graph extends React.Component {
 		let edges = map(paoToEdge, flatten(map(values, [
 			this.props.objects.sinkInputs,
 			this.props.objects.sourceOutputs,
+			this.props.derivations.monitorSources,
 		])));
 
 		const connectedNodeKeys = new Set();
@@ -581,6 +599,9 @@ class Graph extends React.Component {
 		]))));
 
 		edges = filter(edge => {
+			if (this.props.preferences.hideMonitorSourceEdges && edge.type === 'monitorSource') {
+				return false;
+			}
 			return filteredNodeKeys.has(edge.source) && filteredNodeKeys.has(edge.target);
 		}, edges);
 
@@ -641,6 +662,10 @@ module.exports = connect(
 		objects: state.pulse.objects,
 		infos: state.pulse.infos,
 
+		derivations: {
+			monitorSources: getDerivedMonitorSources(state),
+		},
+
 		icons: state.icons,
 
 		preferences: state.preferences,

components/preferences/index.js

@@ -71,6 +71,13 @@ const Preferences = withStateHandlers(
 
 	r.hr(),
 
+	r.div([
+		r(Checkbox, {
+			checked: props.preferences.hideMonitorSourceEdges,
+			onChange: () => props.actions.toggle('hideMonitorSourceEdges'),
+		}, 'Hide monitor source edges'),
+	]),
+
 	r.div([
 		r(Checkbox, {
 			checked: props.preferences.hideMonitors,

index.css

@@ -130,6 +130,14 @@ div {
 	marker-end: url(#my-sink-arrow-selected);
 }
 
+.view-wrapper .monitorSource {
+	stroke-dasharray: 40;
+	pointer-events: none;
+}
+.view-wrapper .monitorSource .edge-mouse-handler {
+	pointer-events: none;
+}
+
 #edge-custom-container .edge-path {
 	marker-end: none;
 	stroke: var(--themeSelectedBgColor);

reducers/preferences.js

@@ -13,6 +13,7 @@ const initialState = {
 	hideDisconnectedSources: false,
 	hideDisconnectedSinks: false,
 
+	hideMonitorSourceEdges: false,
 	hideMonitors: false,
 	hidePulseaudioApps: true,
 

selectors/index.js

@@ -2,15 +2,30 @@
 const {
 	map,
 	prop,
+	path,
+	filter,
 	indexBy,
 } = require('ramda');
 
+const { createSelector } = require('reselect');
+
 const { things } = require('../constants/pulse');
 
 const storeKeyByType = map(prop('key'), indexBy(prop('type'), things));
 
-const getPaiByTypeAndIndex = (type, index) => state => state.pulse.infos[storeKeyByType[type]][index];
+const getPaiByTypeAndIndex = (type, index) => state => path([ storeKeyByType[type], index ], state.pulse.infos);
+
+const getDerivedMonitorSources = createSelector(
+	state => state.pulse.infos.sources,
+	sources => map(source => ({
+		index: source.index,
+		type: 'monitorSource',
+		sinkIndex: source.monitorSourceIndex,
+		sourceIndex: source.index,
+	}), filter(source => source.monitorSourceIndex >= 0, sources)),
+);
 
 module.exports = {
 	getPaiByTypeAndIndex,
+	getDerivedMonitorSources,
 };