From 6511a353236bcee1b3797cd9e92f2011c73f6881 Mon Sep 17 00:00:00 2001
From: Elliu <elliu@hashi.re>
Date: Fri, 22 Jul 2022 22:33:28 +0200
Subject: [PATCH] Resolve conflicts
---
src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh | 1 +
src/UI/DocumentViews/AudioVisualizer/TimingScene.cc | 2 ++
src/UI/DocumentViews/AudioVisualizer/TimingView.hh | 4 ++--
src/UI/DocumentViews/MpvControls.hh | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh b/src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh
index 040f75a9..d2cfd923 100644
--- a/src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh
+++ b/src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh
@@ -6,6 +6,7 @@
#endif
#include "PreCompiledHeaders.hh"
+#include <cmath>
namespace Vivy
{
diff --git a/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc b/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
index 247774a8..ea47784c 100644
--- a/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
+++ b/src/UI/DocumentViews/AudioVisualizer/TimingScene.cc
@@ -1,5 +1,7 @@
#include "TimingScene.hh"
+#include "TimingUtils.hh"
+
using namespace Vivy;
//TimingScene::TimingScene(QWidget *parent) noexcept
diff --git a/src/UI/DocumentViews/AudioVisualizer/TimingView.hh b/src/UI/DocumentViews/AudioVisualizer/TimingView.hh
index 1942a7cc..26f718a3 100644
--- a/src/UI/DocumentViews/AudioVisualizer/TimingView.hh
+++ b/src/UI/DocumentViews/AudioVisualizer/TimingView.hh
@@ -7,8 +7,8 @@
#include "PreCompiledHeaders.hh"
#include "Lib/Utils.hh"
#include "Lib/Audio.hh"
-#include "UI/DocumentViews/TimingBar.hh"
-#include "UI/DocumentViews/TimingScene.hh"
+#include "TimingBar.hh"
+#include "TimingScene.hh"
namespace Vivy
{
diff --git a/src/UI/DocumentViews/MpvControls.hh b/src/UI/DocumentViews/MpvControls.hh
index 8f4e6dbd..2db4b61d 100644
--- a/src/UI/DocumentViews/MpvControls.hh
+++ b/src/UI/DocumentViews/MpvControls.hh
@@ -24,6 +24,7 @@ private:
const QIcon playIcon{ VIVY_ICON_PLAY };
const QIcon pauseIcon{ VIVY_ICON_PAUSE };
+ const QIcon reCreateMpvIcon{ VIVY_ICON_RUN };
public:
explicit MpvControls(MpvContainer *mpv, QWidget *parent) noexcept;
--
GitLab