UI: Add tracks buttons to source meters

Setting the tracks for an audio source is done through the Advanced Audio Panel, which is not very handy. This commit adds track selection buttons to the source meter. The tracks buttons are hidden on default and are displayed through the mixer context menu.
obsproject · Feb 3, 2019 · fc36404 · fc36404
1 parent 017f6ce
commit fc36404
Show file tree

Hide file tree

Showing 23 changed files with 494 additions and 8 deletions.
diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
@@ -85,6 +85,7 @@ StudioMode.Program="Program"
 ShowInMultiview="Show in Multiview"
 VerticalLayout="Vertical Layout"
 VerticalLayoutMaster="Vertical Layout"
+ShowTracksButtons="Show Tracks buttons"
 Group="Group"
 
 # warning if program already open

diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
@@ -926,6 +926,78 @@ SendsCheckBox::indicator:unchecked:focus {
 	image: url(:/res/images/sendsOFF.png);
 }
 
+TracksCheckBox#track1 {
+    outline: none;
+}
+
+TracksCheckBox#track1::indicator:checked {
+    image: url(:/res/images/track1.png);
+}
+
+TracksCheckBox#track1::indicator:unchecked {
+    image: url(:/res/images/track1OFF.png);
+}
+
+TracksCheckBox#track2 {
+    outline: none;
+}
+
+TracksCheckBox#track2::indicator:checked {
+    image: url(:/res/images/track2.png);
+}
+
+TracksCheckBox#track2::indicator:unchecked {
+    image: url(:/res/images/track2OFF.png);
+}
+
+TracksCheckBox#track3 {
+    outline: none;
+}
+
+TracksCheckBox#track3::indicator:checked {
+    image: url(:/res/images/track3.png);
+}
+
+TracksCheckBox#track3::indicator:unchecked {
+    image: url(:/res/images/track3OFF.png);
+}
+
+TracksCheckBox#track4 {
+    outline: none;
+}
+
+TracksCheckBox#track4::indicator:checked {
+    image: url(:/res/images/track4.png);
+}
+
+TracksCheckBox#track4::indicator:unchecked {
+    image: url(:/res/images/track4OFF.png);
+}
+
+TracksCheckBox#track5 {
+    outline: none;
+}
+
+TracksCheckBox#track5::indicator:checked {
+    image: url(:/res/images/track5.png);
+}
+
+TracksCheckBox#track5::indicator:unchecked {
+    image: url(:/res/images/track5OFF.png);
+}
+
+TracksCheckBox#track6 {
+    outline: none;
+}
+
+TracksCheckBox#track6::indicator:checked {
+    image: url(:/res/images/track6.png);
+}
+
+TracksCheckBox#track6::indicator:unchecked {
+    image: url(:/res/images/track6OFF.png);
+}
+
 OBSHotkeyLabel[hotkeyPairHover=true] {
 	color: rgba(27, 96, 166);
 }

diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss
@@ -664,6 +664,78 @@ SendsCheckBox::indicator:unchecked {
     image: url(:/res/images/sendsOFF.png);
 }
 
+TracksCheckBox#track1 {
+    outline: none;
+}
+
+TracksCheckBox#track1::indicator:checked {
+    image: url(:/res/images/track1.png);
+}
+
+TracksCheckBox#track1::indicator:unchecked {
+    image: url(:/res/images/track1OFF.png);
+}
+
+TracksCheckBox#track2 {
+    outline: none;
+}
+
+TracksCheckBox#track2::indicator:checked {
+    image: url(:/res/images/track2.png);
+}
+
+TracksCheckBox#track2::indicator:unchecked {
+    image: url(:/res/images/track2OFF.png);
+}
+
+TracksCheckBox#track3 {
+    outline: none;
+}
+
+TracksCheckBox#track3::indicator:checked {
+    image: url(:/res/images/track3.png);
+}
+
+TracksCheckBox#track3::indicator:unchecked {
+    image: url(:/res/images/track3OFF.png);
+}
+
+TracksCheckBox#track4 {
+    outline: none;
+}
+
+TracksCheckBox#track4::indicator:checked {
+    image: url(:/res/images/track4.png);
+}
+
+TracksCheckBox#track4::indicator:unchecked {
+    image: url(:/res/images/track4OFF.png);
+}
+
+TracksCheckBox#track5 {
+    outline: none;
+}
+
+TracksCheckBox#track5::indicator:checked {
+    image: url(:/res/images/track5.png);
+}
+
+TracksCheckBox#track5::indicator:unchecked {
+    image: url(:/res/images/track5OFF.png);
+}
+
+TracksCheckBox#track6 {
+    outline: none;
+}
+
+TracksCheckBox#track6::indicator:checked {
+    image: url(:/res/images/track6.png);
+}
+
+TracksCheckBox#track6::indicator:unchecked {
+    image: url(:/res/images/track6OFF.png);
+}
+
 /* Group Collapse Checkbox */
 
 SourceTreeSubItemCheckBox {

diff --git a/UI/data/themes/Default.qss b/UI/data/themes/Default.qss
@@ -99,6 +99,78 @@ SendsCheckBox::indicator:unchecked {
     image: url(:/res/images/sendsOFF.png);
 }
 
+TracksCheckBox#track1 {
+    outline: none;
+}
+
+TracksCheckBox#track1::indicator:checked {
+    image: url(:/res/images/track1.png);
+}
+
+TracksCheckBox#track1::indicator:unchecked {
+    image: url(:/res/images/track1OFF.png);
+}
+
+TracksCheckBox#track2 {
+    outline: none;
+}
+
+TracksCheckBox#track2::indicator:checked {
+    image: url(:/res/images/track2.png);
+}
+
+TracksCheckBox#track2::indicator:unchecked {
+    image: url(:/res/images/track2OFF.png);
+}
+
+TracksCheckBox#track3 {
+    outline: none;
+}
+
+TracksCheckBox#track3::indicator:checked {
+    image: url(:/res/images/track3.png);
+}
+
+TracksCheckBox#track3::indicator:unchecked {
+    image: url(:/res/images/track3OFF.png);
+}
+
+TracksCheckBox#track4 {
+    outline: none;
+}
+
+TracksCheckBox#track4::indicator:checked {
+    image: url(:/res/images/track4.png);
+}
+
+TracksCheckBox#track4::indicator:unchecked {
+    image: url(:/res/images/track4OFF.png);
+}
+
+TracksCheckBox#track5 {
+    outline: none;
+}
+
+TracksCheckBox#track5::indicator:checked {
+    image: url(:/res/images/track5.png);
+}
+
+TracksCheckBox#track5::indicator:unchecked {
+    image: url(:/res/images/track5OFF.png);
+}
+
+TracksCheckBox#track6 {
+    outline: none;
+}
+
+TracksCheckBox#track6::indicator:checked {
+    image: url(:/res/images/track6.png);
+}
+
+TracksCheckBox#track6::indicator:unchecked {
+    image: url(:/res/images/track6OFF.png);
+}
+
 SourceTreeSubItemCheckBox {
     background: transparent;
     outline: none;

diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
@@ -885,6 +885,78 @@ SendsCheckBox::indicator:unchecked:focus {
 	image: url(:/res/images/sendsOFF.png);
 }
 
+TracksCheckBox#track1 {
+    outline: none;
+}
+
+TracksCheckBox#track1::indicator:checked {
+    image: url(:/res/images/track1.png);
+}
+
+TracksCheckBox#track1::indicator:unchecked {
+    image: url(:/res/images/track1OFF.png);
+}
+
+TracksCheckBox#track2 {
+    outline: none;
+}
+
+TracksCheckBox#track2::indicator:checked {
+    image: url(:/res/images/track2.png);
+}
+
+TracksCheckBox#track2::indicator:unchecked {
+    image: url(:/res/images/track2OFF.png);
+}
+
+TracksCheckBox#track3 {
+    outline: none;
+}
+
+TracksCheckBox#track3::indicator:checked {
+    image: url(:/res/images/track3.png);
+}
+
+TracksCheckBox#track3::indicator:unchecked {
+    image: url(:/res/images/track3OFF.png);
+}
+
+TracksCheckBox#track4 {
+    outline: none;
+}
+
+TracksCheckBox#track4::indicator:checked {
+    image: url(:/res/images/track4.png);
+}
+
+TracksCheckBox#track4::indicator:unchecked {
+    image: url(:/res/images/track4OFF.png);
+}
+
+TracksCheckBox#track5 {
+    outline: none;
+}
+
+TracksCheckBox#track5::indicator:checked {
+    image: url(:/res/images/track5.png);
+}
+
+TracksCheckBox#track5::indicator:unchecked {
+    image: url(:/res/images/track5OFF.png);
+}
+
+TracksCheckBox#track6 {
+    outline: none;
+}
+
+TracksCheckBox#track6::indicator:checked {
+    image: url(:/res/images/track6.png);
+}
+
+TracksCheckBox#track6::indicator:unchecked {
+    image: url(:/res/images/track6OFF.png);
+}
+
 
 /****************************/
 /* --- Group Checkboxes --- */

diff --git a/UI/forms/images/track1.png b/UI/forms/images/track1.png
diff --git a/UI/forms/images/track1OFF.png b/UI/forms/images/track1OFF.png
diff --git a/UI/forms/images/track2.png b/UI/forms/images/track2.png
diff --git a/UI/forms/images/track2OFF.png b/UI/forms/images/track2OFF.png
diff --git a/UI/forms/images/track3.png b/UI/forms/images/track3.png
diff --git a/UI/forms/images/track3OFF.png b/UI/forms/images/track3OFF.png
diff --git a/UI/forms/images/track4.png b/UI/forms/images/track4.png
diff --git a/UI/forms/images/track4OFF.png b/UI/forms/images/track4OFF.png
diff --git a/UI/forms/images/track5.png b/UI/forms/images/track5.png
diff --git a/UI/forms/images/track5OFF.png b/UI/forms/images/track5OFF.png
diff --git a/UI/forms/images/track6.png b/UI/forms/images/track6.png
diff --git a/UI/forms/images/track6OFF.png b/UI/forms/images/track6OFF.png
diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc
@@ -33,6 +33,18 @@
     <file>images/monOFF.png</file>
     <file>images/sendsON.png</file>
     <file>images/sendsOFF.png</file>
+    <file>images/track1.png</file>
+    <file>images/track1OFF.png</file>
+    <file>images/track2.png</file>
+    <file>images/track2OFF.png</file>
+    <file>images/track3.png</file>
+    <file>images/track3OFF.png</file>
+    <file>images/track4.png</file>
+    <file>images/track4OFF.png</file>
+    <file>images/track5.png</file>
+    <file>images/track5OFF.png</file>
+    <file>images/track6.png</file>
+    <file>images/track6OFF.png</file>
   </qresource>
   <qresource prefix="/settings">
     <file>images/settings/advanced.png</file>

diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
@@ -430,6 +430,9 @@ bool OBSApp::InitGlobalConfigDefaults()
 	config_set_default_bool(globalConfig, "BasicWindow",
 			"VerticalMasterVolControl", true);
 
+	config_set_default_bool(globalConfig, "BasicWindow",
+			"ShowTracksButtons", false);
+
 	config_set_default_bool(globalConfig, "BasicWindow",
 			"MultiviewMouseSwitch", true);