oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use shared ptrs on streams

Browse Source
This commit is contained in:
itsmattkc
2020-12-16 13:46:19 +11:00
parent e12013e2fb
commit 6cb6407bd8
47 changed files with 192 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/conform/conform.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
namespace olive {
ConformTask::ConformTask(AudioStreamPtr stream, const AudioParams& params) :
ConformTask::ConformTask(AudioStream *stream, const AudioParams& params) :
stream_(stream),
params_(params)
{
app/task/conform/conform.h
+2 -2
View File
@@ -31,13 +31,13 @@ class ConformTask : public Task
{
Q_OBJECT
public:
ConformTask(AudioStreamPtr stream, const AudioParams& params);
ConformTask(AudioStream* stream, const AudioParams& params);
protected:
virtual bool Run() override;
private:
AudioStreamPtr stream_;
AudioStream* stream_;
AudioParams params_;
app/task/precache/precachetask.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
namespace olive {
PreCacheTask::PreCacheTask(VideoStreamPtr footage, Sequence* sequence) :
PreCacheTask::PreCacheTask(VideoStream *footage, Sequence* sequence) :
RenderTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params()),
footage_(footage)
{
app/task/precache/precachetask.h
+2 -2
View File
@@ -32,7 +32,7 @@ class PreCacheTask : public RenderTask
{
Q_OBJECT
public:
PreCacheTask(VideoStreamPtr footage, Sequence* sequence);
PreCacheTask(VideoStream* footage, Sequence* sequence);
virtual ~PreCacheTask() override;
@@ -44,7 +44,7 @@ protected:
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) override;
private:
VideoStreamPtr footage_;
VideoStream* footage_;
MediaInput* video_node_;
app/task/project/import/import.cpp
+3 -3
View File
@@ -142,7 +142,7 @@ void ProjectImportTask::Import(Folder *folder, QFileInfoList import, int &counte
void ProjectImportTask::ValidateImageSequence(Footage *footage, QFileInfoList& info_list, int index)
{
// Heuristically determine whether this file is part of an image sequence or not
VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(footage->streams().first());
VideoStream* video_stream = static_cast<VideoStream*>(footage->streams().first());
// By this point we've established that video contains a single still image stream. Now we'll
// see if it ends with numbers.
@@ -229,7 +229,7 @@ bool ProjectImportTask::ItemIsStillImageFootageOnly(Footage* footage)
return false;
}
VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(footage->streams().first());
VideoStream* video_stream = static_cast<VideoStream*>(footage->streams().first());
if (video_stream->video_type() != VideoStream::kVideoTypeStill) {
// If video type is not a still, this definitely isn't a video stream
@@ -245,7 +245,7 @@ bool ProjectImportTask::CompareStillImageSize(Footage* footage, const QSize &sz)
return false;
}
VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(footage->streams().first());
VideoStream* video_stream = static_cast<VideoStream*>(footage->streams().first());
return video_stream->width() == sz.width() && video_stream->height() == sz.height();
}