Resolve conflicts

src/UI/DocumentViews/AudioVisualizer/TimingAxis.hh

@@ -6,6 +6,7 @@
 #endif
 
 #include "PreCompiledHeaders.hh"
+#include <cmath>
 
 namespace Vivy
 {

src/UI/DocumentViews/AudioVisualizer/TimingScene.cc

 #include "TimingScene.hh"
 
+#include "TimingUtils.hh"
+
 using namespace Vivy;
 
 //TimingScene::TimingScene(QWidget *parent) noexcept

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
 {

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;