Discussion:
[vlmc-devel] SequenceWorkflow: Use qint64 for position
Yikai Lu
2017-08-07 17:18:29 UTC
Permalink
vlmc | branch: master | Yikai Lu <***@gmail.com> | Tue Aug 8 01:14:52 2017 +0900| [b8ef77aae1232dd7e36e18e23ee69be003ccb974] | committer: Yikai Lu

SequenceWorkflow: Use qint64 for position
https://code.videolan.org/videolan/vlmc/commit/b8ef77aae1232dd7e36e18e23ee69be003ccb974
---

src/Workflow/SequenceWorkflow.cpp | 4 ++--
src/Workflow/SequenceWorkflow.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Workflow/SequenceWorkflow.cpp b/src/Workflow/SequenceWorkflow.cpp
index dad9a1f8..a46b0d6a 100644
--- a/src/Workflow/SequenceWorkflow.cpp
+++ b/src/Workflow/SequenceWorkflow.cpp
@@ -65,7 +65,7 @@ SequenceWorkflow::~SequenceWorkflow()
}

QUuid
-SequenceWorkflow::addClip( QSharedPointer<::Clip> clip, quint32 trackId, qint32 pos, const QUuid& uuid, bool isAudioClip )
+SequenceWorkflow::addClip( QSharedPointer<::Clip> clip, quint32 trackId, qint64 pos, const QUuid& uuid, bool isAudioClip )
{
auto t = track( trackId, isAudioClip );
auto ret = t->insertAt( *clip->input(), pos );
@@ -306,7 +306,7 @@ SequenceWorkflow::trackId( const QUuid& uuid )
return it.value()->trackId;
}

-qint32
+qint64
SequenceWorkflow::position( const QUuid& uuid )
{
auto it = m_clips.find( uuid );
diff --git a/src/Workflow/SequenceWorkflow.h b/src/Workflow/SequenceWorkflow.h
index 4986b9ef..184c16dd 100644
--- a/src/Workflow/SequenceWorkflow.h
+++ b/src/Workflow/SequenceWorkflow.h
@@ -91,7 +91,7 @@ class SequenceWorkflow : public QObject
* clip instance in the sequence workflow.
* This instance UUID must be used to manipulate this new clip instance
*/
- QUuid addClip( QSharedPointer<::Clip> clip, quint32 trackId, qint32 pos,
+ QUuid addClip( QSharedPointer<::Clip> clip, quint32 trackId, qint64 pos,
const QUuid& uuid, bool isAudioClip );
bool moveClip( const QUuid& uuid, quint32 trackId, qint64 pos );
bool resizeClip( const QUuid& uuid, qint64 newBegin,
@@ -106,7 +106,7 @@ class SequenceWorkflow : public QObject

QSharedPointer<ClipInstance> clip( const QUuid& uuid );
quint32 trackId( const QUuid& uuid );
- qint32 position( const QUuid& uuid );
+ qint64 position( const QUuid& uuid );

Backend::IInput* input();
Backend::IInput* trackInput( quint32 trackId );

Loading...