Merge branch 'master' of https://github.com/olive-editor/olive

app/widget/viewer/footageviewer.cpp

@@ -75,20 +75,20 @@ void FootageViewerWidget::SetFootage(Footage *footage)
     sequence_.set_parameters_from_footage({footage_});
 
     // Use first of each stream
-    VideoStreamPtr video_stream = nullptr;
-    AudioStreamPtr audio_stream = nullptr;
+    VideoStream* video_stream = nullptr;
+    AudioStream* audio_stream = nullptr;
 
-    foreach (StreamPtr s, footage_->streams()) {
+    foreach (Stream* s, footage_->streams()) {
       if (!s->enabled()) {
         continue;
       }
 
       if (!audio_stream && s->type() == Stream::kAudio) {
-        audio_stream = std::static_pointer_cast<AudioStream>(s);
+        audio_stream = static_cast<AudioStream*>(s);
       }
 
       if (!video_stream && s->type() == Stream::kVideo) {
-        video_stream = std::static_pointer_cast<VideoStream>(s);
+        video_stream = static_cast<VideoStream*>(s);
       }
 
       if (audio_stream && video_stream) {
@@ -142,7 +142,7 @@ void FootageViewerWidget::StartFootageDragInternal(bool enable_video, bool enabl
   if (!enable_video || !enable_audio) {
     quint64 stream_disabler = 0x1;
 
-    foreach (StreamPtr s, GetFootage()->streams()) {
+    foreach (Stream* s, GetFootage()->streams()) {
       if ((s->type() == Stream::kVideo && !enable_video)
           || (s->type() == Stream::kAudio && !enable_audio)) {
         enabled_stream_flags &= ~stream_disabler;

app/widget/viewer/gizmotraverser.cpp

@@ -22,11 +22,11 @@
 
 namespace olive {
 
-QVariant GizmoTraverser::ProcessVideoFootage(StreamPtr stream, const rational &input_time)
+QVariant GizmoTraverser::ProcessVideoFootage(VideoStream *stream, const rational &input_time)
 {
   Q_UNUSED(input_time)
 
-  VideoStreamPtr image_stream = std::static_pointer_cast<VideoStream>(stream);
+  VideoStream* image_stream = static_cast<VideoStream*>(stream);
 
   return QVector2D(image_stream->width() * image_stream->pixel_aspect_ratio().toDouble(),
                    image_stream->height());

app/widget/viewer/gizmotraverser.h

@@ -34,7 +34,7 @@ public:
   }
 
 protected:
-  virtual QVariant ProcessVideoFootage(StreamPtr stream, const rational &input_time) override;
+  virtual QVariant ProcessVideoFootage(VideoStream* stream, const rational &input_time) override;
 
   virtual QVariant ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job) override;
 

app/widget/viewer/viewer.h

@@ -40,7 +40,7 @@
 #include "viewersizer.h"
 #include "viewerwindow.h"
 #include "widget/playbackcontrols/playbackcontrols.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {