UI: Rename MediaSlider to AbsoluteSlider

UI/media-slider.cpp → UI/absolute-slider.cpp

@@ -1,8 +1,8 @@
 #include "slider-absoluteset-style.hpp"
-#include "media-slider.hpp"
+#include "absolute-slider.hpp"
 #include <QStyleFactory>
 
-MediaSlider::MediaSlider(QWidget *parent) : SliderIgnoreScroll(parent)
+AbsoluteSlider::AbsoluteSlider(QWidget *parent) : SliderIgnoreScroll(parent)
 {
 	installEventFilter(this);
 	setMouseTracking(true);
@@ -20,7 +20,7 @@ MediaSlider::MediaSlider(QWidget *parent) : SliderIgnoreScroll(parent)
 	this->setStyle(style);
 }
 
-void MediaSlider::mouseMoveEvent(QMouseEvent *event)
+void AbsoluteSlider::mouseMoveEvent(QMouseEvent *event)
 {
 	int val = minimum() +
 		  ((maximum() - minimum()) * event->pos().x()) / width();
@@ -30,12 +30,12 @@ void MediaSlider::mouseMoveEvent(QMouseEvent *event)
 	else if (val < minimum())
 		val = minimum();
 
-	emit mediaSliderHovered(val);
+	emit absoluteSliderHovered(val);
 	event->accept();
 	QSlider::mouseMoveEvent(event);
 }
 
-bool MediaSlider::eventFilter(QObject *obj, QEvent *event)
+bool AbsoluteSlider::eventFilter(QObject *obj, QEvent *event)
 {
 	if (event->type() == QEvent::KeyPress) {
 		QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);

UI/media-slider.hpp → UI/absolute-slider.hpp

@@ -3,14 +3,14 @@
 #include <QMouseEvent>
 #include "slider-ignorewheel.hpp"
 
-class MediaSlider : public SliderIgnoreScroll {
+class AbsoluteSlider : public SliderIgnoreScroll {
 	Q_OBJECT
 
 public:
-	MediaSlider(QWidget *parent = nullptr);
+	AbsoluteSlider(QWidget *parent = nullptr);
 
 signals:
-	void mediaSliderHovered(int value);
+	void absoluteSliderHovered(int value);
 
 protected:
 	virtual void mouseMoveEvent(QMouseEvent *event) override;

UI/cmake/legacy.cmake

@@ -160,7 +160,9 @@ target_sources(
 
 target_sources(
   obs
-  PRIVATE adv-audio-control.cpp
+  PRIVATE absolute-slider.cpp
+          absolute-slider.hpp
+          adv-audio-control.cpp
           adv-audio-control.hpp
           audio-encoders.cpp
           audio-encoders.hpp
@@ -184,8 +186,6 @@ target_sources(
           log-viewer.hpp
           media-controls.cpp
           media-controls.hpp
-          media-slider.cpp
-          media-slider.hpp
           menu-button.cpp
           menu-button.hpp
           mute-checkbox.hpp

UI/cmake/ui-elements.cmake

@@ -31,6 +31,8 @@ target_link_libraries(obs-studio PRIVATE OBS::ui-support)
 target_sources(
   obs-studio
   PRIVATE # cmake-format: sortable
+          absolute-slider.cpp
+          absolute-slider.hpp
           adv-audio-control.cpp
           adv-audio-control.hpp
           audio-encoders.cpp
@@ -50,8 +52,6 @@ target_sources(
           log-viewer.hpp
           media-controls.cpp
           media-controls.hpp
-          media-slider.cpp
-          media-slider.hpp
           menu-button.cpp
           menu-button.hpp
           mute-checkbox.hpp

UI/forms/source-toolbar/media-controls.ui

@@ -203,7 +203,7 @@
     </widget>
    </item>
    <item>
-    <widget class="MediaSlider" name="slider">
+    <widget class="AbsoluteSlider" name="slider">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -300,9 +300,9 @@
    <header>clickable-label.hpp</header>
   </customwidget>
   <customwidget>
-   <class>MediaSlider</class>
+   <class>AbsoluteSlider</class>
    <extends>QSlider</extends>
-   <header>media-slider.hpp</header>
+   <header>absolute-slider.hpp</header>
   </customwidget>
  </customwidgets>
  <resources>

UI/media-controls.cpp

@@ -58,14 +58,14 @@ MediaControls::MediaControls(QWidget *parent)
 		&MediaControls::SetSliderPosition);
 	connect(&seekTimer, &QTimer::timeout, this,
 		&MediaControls::SeekTimerCallback);
-	connect(ui->slider, &MediaSlider::sliderPressed, this,
-		&MediaControls::MediaSliderClicked);
-	connect(ui->slider, &MediaSlider::mediaSliderHovered, this,
-		&MediaControls::MediaSliderHovered);
-	connect(ui->slider, &MediaSlider::sliderReleased, this,
-		&MediaControls::MediaSliderReleased);
-	connect(ui->slider, &MediaSlider::sliderMoved, this,
-		&MediaControls::MediaSliderMoved);
+	connect(ui->slider, &AbsoluteSlider::sliderPressed, this,
+		&MediaControls::AbsoluteSliderClicked);
+	connect(ui->slider, &AbsoluteSlider::absoluteSliderHovered, this,
+		&MediaControls::AbsoluteSliderHovered);
+	connect(ui->slider, &AbsoluteSlider::sliderReleased, this,
+		&MediaControls::AbsoluteSliderReleased);
+	connect(ui->slider, &AbsoluteSlider::sliderMoved, this,
+		&MediaControls::AbsoluteSliderMoved);
 
 	countDownTimer = config_get_bool(App()->GlobalConfig(), "BasicWindow",
 					 "MediaControlsCountdownTimer");
@@ -126,7 +126,7 @@ int64_t MediaControls::GetSliderTime(int val)
 	return seekTo;
 }
 
-void MediaControls::MediaSliderClicked()
+void MediaControls::AbsoluteSliderClicked()
 {
 	OBSSource source = OBSGetStrongRef(weakSource);
 	if (!source) {
@@ -147,7 +147,7 @@ void MediaControls::MediaSliderClicked()
 	seekTimer.start(100);
 }
 
-void MediaControls::MediaSliderReleased()
+void MediaControls::AbsoluteSliderReleased()
 {
 	OBSSource source = OBSGetStrongRef(weakSource);
 	if (!source) {
@@ -170,13 +170,13 @@ void MediaControls::MediaSliderReleased()
 	}
 }
 
-void MediaControls::MediaSliderHovered(int val)
+void MediaControls::AbsoluteSliderHovered(int val)
 {
 	float seconds = ((float)GetSliderTime(val) / 1000.0f);
 	QToolTip::showText(QCursor::pos(), FormatSeconds((int)seconds), this);
 }
 
-void MediaControls::MediaSliderMoved(int val)
+void MediaControls::AbsoluteSliderMoved(int val)
 {
 	if (seekTimer.isActive()) {
 		seek = val;

UI/media-controls.hpp

@@ -45,10 +45,10 @@ private slots:
 	void on_previousButton_clicked();
 	void on_durationLabel_clicked();
 
-	void MediaSliderClicked();
-	void MediaSliderReleased();
-	void MediaSliderHovered(int val);
-	void MediaSliderMoved(int val);
+	void AbsoluteSliderClicked();
+	void AbsoluteSliderReleased();
+	void AbsoluteSliderHovered(int val);
+	void AbsoluteSliderMoved(int val);
 	void SetSliderPosition();
 	void SetPlayingState();
 	void SetPausedState();