frontend-tools: Add option to pause output timer when rec is paused

UI/frontend-plugins/frontend-tools/data/locale/en-US.ini

@@ -24,6 +24,7 @@ OutputTimer.Stream.StoppingIn="Streaming stopping in:"
 OutputTimer.Record.StoppingIn="Recording stopping in:"
 OutputTimer.Stream.EnableEverytime="Enable streaming timer every time"
 OutputTimer.Record.EnableEverytime="Enable recording timer every time"
+OutputTimer.Record.PauseTimer="Pause timer when recording is paused"
 
 Scripts="Scripts"
 LoadedScripts="Loaded Scripts"

UI/frontend-plugins/frontend-tools/forms/output-timer.ui

@@ -1,215 +1,231 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OutputTimer</class>
-   <widget class="QDialog" name="OutputTimer">
-    <property name="geometry">
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>600</width>
-        <height>200</height>
-      </rect>
-    </property>
-    <property name="windowTitle">
-      <string>OutputTimer</string>
-    </property>
-    <layout class="QGridLayout" name="timerLayout">
-      <item row="0" column="1">
-        <widget class="QLabel" name="streamingLabel">
-          <property name="text">
-            <string>OutputTimer.Stream</string>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="2">
-        <widget class="QSpinBox" name="streamingTimerHours">
-          <property name="minimum">
-            <number>0</number>
-          </property>
-          <property name="maximum">
-            <number>24</number>
-          </property>
-          <property name="value">
-            <number>0</number>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="3">
-        <widget class="QLabel" name="hoursLabel">
-          <property name="text">
-            <string>Hours</string>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="4">
-        <widget class="QSpinBox" name="streamingTimerMinutes">
-          <property name="maximum">
-            <number>59</number>
-          </property>
-          <property name="value">
-            <number>0</number>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="5">
-        <widget class="QLabel" name="minutesLabel">
-          <property name="text">
-            <string>Minutes</string>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="6">
-        <widget class="QSpinBox" name="streamingTimerSeconds">
-          <property name="minimum">
-            <number>0</number>
-          </property>
-          <property name="maximum">
-            <number>59</number>
-          </property>
-          <property name="value">
-            <number>30</number>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="7">
-        <widget class="QLabel" name="secondsLabel">
-          <property name="text">
-            <string>Seconds</string>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="8">
-        <widget class="QPushButton" name="outputTimerStream">
-          <property name="text">
-            <string>Start</string>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="1">
-        <widget class="QLabel" name="streamStoppingIn">
-          <property name="text">
-            <string>OutputTimer.Stream.StoppingIn</string>
-          </property>
-        </widget>
-      </item>
-      <item row="2" column="2">
-        <widget class="QLabel" name="streamTime">
-          <property name="text">
-            <string>00:00:00</string>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="1">
-        <widget class="QLabel" name="recordingLabel">
-          <property name="text">
-            <string>OutputTimer.Record</string>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="2">
-        <widget class="QSpinBox" name="recordingTimerHours">
-          <property name="minimum">
-            <number>0</number>
-          </property>
-          <property name="maximum">
-            <number>24</number>
-          </property>
-          <property name="value">
-            <number>0</number>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="3">
-        <widget class="QLabel" name="hoursLabel_2">
-          <property name="text">
-            <string>Hours</string>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="4">
-        <widget class="QSpinBox" name="recordingTimerMinutes">
-          <property name="minimum">
-            <number>0</number>
-          </property>
-          <property name="maximum">
-            <number>59</number>
-          </property>
-          <property name="value">
-            <number>0</number>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="5">
-        <widget class="QLabel" name="minutesLabel_2">
-          <property name="text">
-            <string>Minutes</string>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="6">
-        <widget class="QSpinBox" name="recordingTimerSeconds">
-          <property name="minimum">
-            <number>0</number>
-          </property>
-          <property name="maximum">
-            <number>59</number>
-          </property>
-          <property name="value">
-            <number>30</number>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="7">
-        <widget class="QLabel" name="secondsLabel_2">
-          <property name="text">
-            <string>Seconds</string>
-          </property>
-        </widget>
-      </item>
-      <item row="3" column="8">
-        <widget class="QPushButton" name="outputTimerRecord">
-          <property name="text">
-            <string>Start</string>
-          </property>
-        </widget>
-      </item>
-      <item row="5" column="1">
-        <widget class="QLabel" name="recordStoppingIn">
-          <property name="text">
-            <string>OutputTimer.Record.StoppingIn</string>
-          </property>
-        </widget>
-      </item>
-      <item row="5" column="2">
-        <widget class="QLabel" name="recordTime">
-          <property name="text">
-            <string>00:00:00</string>
-          </property>
-        </widget>
-      </item>
-      <item row="1" column="1" colspan="3">
-        <widget class="QCheckBox" name="autoStartStreamTimer">
-          <property name="text">
-            <string>OutputTimer.Stream.EnableEverytime</string>
-          </property>
-        </widget>
-      </item>
-      <item row="4" column="1" colspan="3">
-        <widget class="QCheckBox" name="autoStartRecordTimer">
-          <property name="text">
-            <string>OutputTimer.Record.EnableEverytime</string>
-          </property>
-        </widget>
-      </item>
-      <item row="6" column="8">
-        <widget class="QDialogButtonBox" name="buttonBox">
-          <property name="standardButtons">
-            <set>QDialogButtonBox::Close</set>
-          </property>
-        </widget>
-      </item>
-    </layout>
-  </widget>
-  <resources />
-  <connections />
+ <widget class="QDialog" name="OutputTimer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>697</width>
+    <height>240</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>OutputTimer</string>
+  </property>
+  <layout class="QGridLayout" name="timerLayout">
+   <item row="0" column="3">
+    <widget class="QLabel" name="hoursLabel">
+     <property name="text">
+      <string>Hours</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QSpinBox" name="recordingTimerHours">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>24</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="6">
+    <widget class="QSpinBox" name="streamingTimerSeconds">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>59</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="8">
+    <widget class="QPushButton" name="outputTimerStream">
+     <property name="text">
+      <string>Start</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4">
+    <widget class="QSpinBox" name="recordingTimerMinutes">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>59</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="streamingLabel">
+     <property name="text">
+      <string>OutputTimer.Stream</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QSpinBox" name="streamingTimerMinutes">
+     <property name="maximum">
+      <number>59</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="8">
+    <widget class="QPushButton" name="outputTimerRecord">
+     <property name="text">
+      <string>Start</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QLabel" name="recordStoppingIn">
+     <property name="text">
+      <string>OutputTimer.Record.StoppingIn</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="7">
+    <widget class="QLabel" name="secondsLabel_2">
+     <property name="text">
+      <string>Seconds</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QLabel" name="streamTime">
+     <property name="text">
+      <string>00:00:00</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="5">
+    <widget class="QLabel" name="minutesLabel_2">
+     <property name="text">
+      <string>Minutes</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QSpinBox" name="streamingTimerHours">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>24</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QLabel" name="recordTime">
+     <property name="text">
+      <string>00:00:00</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="5">
+    <widget class="QLabel" name="minutesLabel">
+     <property name="text">
+      <string>Minutes</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="recordingLabel">
+     <property name="text">
+      <string>OutputTimer.Record</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="6">
+    <widget class="QSpinBox" name="recordingTimerSeconds">
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>59</number>
+     </property>
+     <property name="value">
+      <number>30</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="3">
+    <widget class="QCheckBox" name="autoStartStreamTimer">
+     <property name="text">
+      <string>OutputTimer.Stream.EnableEverytime</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLabel" name="streamStoppingIn">
+     <property name="text">
+      <string>OutputTimer.Stream.StoppingIn</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" colspan="3">
+    <widget class="QCheckBox" name="autoStartRecordTimer">
+     <property name="text">
+      <string>OutputTimer.Record.EnableEverytime</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="8">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3">
+    <widget class="QLabel" name="hoursLabel_2">
+     <property name="text">
+      <string>Hours</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="7">
+    <widget class="QLabel" name="secondsLabel">
+     <property name="text">
+      <string>Seconds</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="3">
+    <widget class="QCheckBox" name="pauseRecordTimer">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>OutputTimer.Record.PauseTimer</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
 </ui>

UI/frontend-plugins/frontend-tools/output-timer.cpp

@@ -181,7 +181,13 @@ void OutputTimer::UpdateStreamTimerDisplay()
 
 void OutputTimer::UpdateRecordTimerDisplay()
 {
-	int remainingTime = recordingTimer->remainingTime() / 1000;
+	int remainingTime = 0;
+
+	if (obs_frontend_recording_paused() &&
+	    ui->pauseRecordTimer->isChecked())
+		remainingTime = recordingTimeLeft / 1000;
+	else
+		remainingTime = recordingTimer->remainingTime() / 1000;
 
 	int seconds = remainingTime % 60;
 	int minutes = (remainingTime % 3600) / 60;
@@ -192,6 +198,26 @@ void OutputTimer::UpdateRecordTimerDisplay()
 	ui->recordTime->setText(text);
 }
 
+void OutputTimer::PauseRecordingTimer()
+{
+	if (!ui->pauseRecordTimer->isChecked())
+		return;
+
+	if (recordingTimer->isActive()) {
+		recordingTimeLeft = recordingTimer->remainingTime();
+		recordingTimer->stop();
+	}
+}
+
+void OutputTimer::UnpauseRecordingTimer()
+{
+	if (!ui->pauseRecordTimer->isChecked())
+		return;
+
+	if (!recordingTimer->isActive())
+		recordingTimer->start(recordingTimeLeft);
+}
+
 void OutputTimer::ShowHideDialog()
 {
 	if (!isVisible()) {
@@ -239,6 +265,9 @@ static void SaveOutputTimer(obs_data_t *save_data, bool saving, void *)
 		obs_data_set_bool(obj, "autoStartRecordTimer",
 				  ot->ui->autoStartRecordTimer->isChecked());
 
+		obs_data_set_bool(obj, "pauseRecordTimer",
+				  ot->ui->pauseRecordTimer->isChecked());
+
 		obs_data_set_obj(save_data, "output-timer", obj);
 
 		obs_data_release(obj);
@@ -267,6 +296,9 @@ static void SaveOutputTimer(obs_data_t *save_data, bool saving, void *)
 		ot->ui->autoStartRecordTimer->setChecked(
 			obs_data_get_bool(obj, "autoStartRecordTimer"));
 
+		ot->ui->pauseRecordTimer->setChecked(
+			obs_data_get_bool(obj, "pauseRecordTimer"));
+
 		obs_data_release(obj);
 	}
 }
@@ -286,6 +318,10 @@ static void OBSEvent(enum obs_frontend_event event, void *)
 		ot->RecordTimerStart();
 	} else if (event == OBS_FRONTEND_EVENT_RECORDING_STOPPING) {
 		ot->RecordTimerStop();
+	} else if (event == OBS_FRONTEND_EVENT_RECORDING_PAUSED) {
+		ot->PauseRecordingTimer();
+	} else if (event == OBS_FRONTEND_EVENT_RECORDING_UNPAUSED) {
+		ot->UnpauseRecordingTimer();
 	}
 }
 

UI/frontend-plugins/frontend-tools/output-timer.hpp

@@ -15,6 +15,8 @@ public:
 	OutputTimer(QWidget *parent);
 
 	void closeEvent(QCloseEvent *event) override;
+	void PauseRecordingTimer();
+	void UnpauseRecordingTimer();
 
 public slots:
 	void StreamingTimerButton();
@@ -37,4 +39,6 @@ private:
 	QTimer *recordingTimer;
 	QTimer *streamingTimerDisplay;
 	QTimer *recordingTimerDisplay;
+
+	int recordingTimeLeft;
 };