<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>
<div>
<div>Hi,</div>
<div> </div>
<div>I registered to this list because I am fascinated by the project.</div>
<div> </div>
<div>But how can I get a better feel of what is being worked ?</div>
<div> </div>
<div>Where is the code available ?</div>
<div>How can I find out more ?</div>
<div> </div>
<div>Steve</div>
<div> </div>
<div> </div>
<div> </div>
<div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div style="margin:0 0 10px 0;"><b>Sent:</b> Thursday, June 22, 2017 at 11:00 AM<br/>
<b>From:</b> vlmc-devel-request@videolan.org<br/>
<b>To:</b> vlmc-devel@videolan.org<br/>
<b>Subject:</b> Vlmc-devel Digest, Vol 59, Issue 8</div>
<div name="quoted-content">Send Vlmc-devel mailing list submissions to<br/>
vlmc-devel@videolan.org<br/>
<br/>
To subscribe or unsubscribe via the World Wide Web, visit<br/>
<a href="https://mailman.videolan.org/listinfo/vlmc-devel" target="_blank">https://mailman.videolan.org/listinfo/vlmc-devel</a><br/>
or, via email, send a message with subject or body 'help' to<br/>
vlmc-devel-request@videolan.org<br/>
<br/>
You can reach the person managing the list at<br/>
vlmc-devel-owner@videolan.org<br/>
<br/>
When replying, please edit your Subject line so it is more specific<br/>
than "Re: Contents of Vlmc-devel digest..."<br/>
<br/>
<br/>
Today's Topics:<br/>
<br/>
1. ClipLibraryView: Try to add a sub clip when its parent is<br/>
actually created (Yikai Lu)<br/>
2. ClipLibraryView: Fix not updating onTimeline (Yikai Lu)<br/>
3. qml: Don't declare a varible twice (Yikai Lu)<br/>
4. Media: Fix saving/loading sub clips (Yikai Lu)<br/>
<br/>
<br/>
----------------------------------------------------------------------<br/>
<br/>
Message: 1<br/>
Date: Wed, 21 Jun 2017 12:56:40 +0200<br/>
From: Yikai Lu <git@videolan.org><br/>
To: vlmc-devel@videolan.org<br/>
Subject: [vlmc-devel] ClipLibraryView: Try to add a sub clip when its<br/>
parent is actually created<br/>
Message-ID: <20170621105641.C15F41022@albiero.videolan.org><br/>
Content-Type: text/plain; charset=UTF-8<br/>
<br/>
vlmc | branch: master | Yikai Lu <luyikei.qmltu@gmail.com> | Wed Jun 21 19:52:23 2017 +0900| [94f0398ba0f07ea25289669132440e050620b5ae] | committer: Yikai Lu<br/>
<br/>
ClipLibraryView: Try to add a sub clip when its parent is actually created<br/>
<br/>
Because otherwise clipItems might not have its parent<br/>
<br/>
> <a href="https://code.videolan.org/videolan/vlmc/commit/94f0398ba0f07ea25289669132440e050620b5ae" target="_blank">https://code.videolan.org/videolan/vlmc/commit/94f0398ba0f07ea25289669132440e050620b5ae</a><br/>
---<br/>
<br/>
src/Gui/library/ui/ClipItem.qml | 10 +++++++++-<br/>
src/Gui/library/ui/ClipLibraryView.qml | 8 --------<br/>
2 files changed, 9 insertions(+), 9 deletions(-)<br/>
<br/>
diff --git a/src/Gui/library/ui/ClipItem.qml b/src/Gui/library/ui/ClipItem.qml<br/>
index 3236bbc7..df4ac7a6 100644<br/>
--- a/src/Gui/library/ui/ClipItem.qml<br/>
+++ b/src/Gui/library/ui/ClipItem.qml<br/>
@@ -48,7 +48,15 @@ Rectangle {<br/>
}<br/>
<br/>
Component.onCompleted: {<br/>
- clipLibraryView.clipItems.push( this )<br/>
+ clipLibraryView.clipItems.push( this );<br/>
+ if ( !isBaseClip ) {<br/>
+ for ( var i = 0; i < clipItems.length; ++i ) {<br/>
+ if ( clipItems[i].mediaId === mediaId && clipItems[i].isBaseClip ) {<br/>
+ clipItems[i].addSubClip( uuid );<br/>
+ break;<br/>
+ }<br/>
+ }<br/>
+ }<br/>
}<br/>
<br/>
Component.onDestruction: {<br/>
diff --git a/src/Gui/library/ui/ClipLibraryView.qml b/src/Gui/library/ui/ClipLibraryView.qml<br/>
index c42d2c0e..e90e54e2 100644<br/>
--- a/src/Gui/library/ui/ClipLibraryView.qml<br/>
+++ b/src/Gui/library/ui/ClipLibraryView.qml<br/>
@@ -46,14 +46,6 @@ Rectangle {<br/>
onClipAdded: {<br/>
var clip = view.clip( uuid );<br/>
clips.append( clip );<br/>
- if ( !clip.isBaseClip ) {<br/>
- for ( var i = 0; i < clipItems.length; ++i ) {<br/>
- if ( clipItems[i].mediaId === clip.mediaId && clipItems[i].isBaseClip ) {<br/>
- clipItems[i].addSubClip( uuid );<br/>
- break;<br/>
- }<br/>
- }<br/>
- }<br/>
}<br/>
<br/>
onClipOnTimelineChanged: {<br/>
<br/>
<br/>
<br/>
------------------------------<br/>
<br/>
Message: 2<br/>
Date: Wed, 21 Jun 2017 12:56:41 +0200<br/>
From: Yikai Lu <git@videolan.org><br/>
To: vlmc-devel@videolan.org<br/>
Subject: [vlmc-devel] ClipLibraryView: Fix not updating onTimeline<br/>
Message-ID: <20170621105642.D31E5153886@albiero.videolan.org><br/>
Content-Type: text/plain; charset=UTF-8<br/>
<br/>
vlmc | branch: master | Yikai Lu <luyikei.qmltu@gmail.com> | Wed Jun 21 19:53:53 2017 +0900| [d871ed0364375cc783042a4e2a618f130c96702a] | committer: Yikai Lu<br/>
<br/>
ClipLibraryView: Fix not updating onTimeline<br/>
<br/>
> <a href="https://code.videolan.org/videolan/vlmc/commit/d871ed0364375cc783042a4e2a618f130c96702a" target="_blank">https://code.videolan.org/videolan/vlmc/commit/d871ed0364375cc783042a4e2a618f130c96702a</a><br/>
---<br/>
<br/>
src/Gui/library/ui/ClipLibraryView.qml | 6 +++---<br/>
1 file changed, 3 insertions(+), 3 deletions(-)<br/>
<br/>
diff --git a/src/Gui/library/ui/ClipLibraryView.qml b/src/Gui/library/ui/ClipLibraryView.qml<br/>
index e90e54e2..9b47dbde 100644<br/>
--- a/src/Gui/library/ui/ClipLibraryView.qml<br/>
+++ b/src/Gui/library/ui/ClipLibraryView.qml<br/>
@@ -49,9 +49,9 @@ Rectangle {<br/>
}<br/>
<br/>
onClipOnTimelineChanged: {<br/>
- for ( var i = 0; i < clipItems.length; ++i ) {<br/>
- if ( clipItems[i].uuid === uuid ) {<br/>
- clipItems[i].onTimeline = onTimeline;<br/>
+ for ( var i = 0; i < clips.count; ++i ) {<br/>
+ if ( clips.get(i)["uuid"] === uuid ) {<br/>
+ clips.get(i)["onTimeline"] = onTimeline;<br/>
break;<br/>
}<br/>
}<br/>
<br/>
<br/>
<br/>
------------------------------<br/>
<br/>
Message: 3<br/>
Date: Wed, 21 Jun 2017 12:56:42 +0200<br/>
From: Yikai Lu <git@videolan.org><br/>
To: vlmc-devel@videolan.org<br/>
Subject: [vlmc-devel] qml: Don't declare a varible twice<br/>
Message-ID: <20170621105643.F34F8151DAA@albiero.videolan.org><br/>
Content-Type: text/plain; charset=UTF-8<br/>
<br/>
vlmc | branch: master | Yikai Lu <luyikei.qmltu@gmail.com> | Wed Jun 21 19:54:33 2017 +0900| [963f7edfad9e37543e33f3e7c0b088c218c36208] | committer: Yikai Lu<br/>
<br/>
qml: Don't declare a varible twice<br/>
<br/>
> <a href="https://code.videolan.org/videolan/vlmc/commit/963f7edfad9e37543e33f3e7c0b088c218c36208" target="_blank">https://code.videolan.org/videolan/vlmc/commit/963f7edfad9e37543e33f3e7c0b088c218c36208</a><br/>
---<br/>
<br/>
src/Gui/library/ui/ClipLibraryView.qml | 2 +-<br/>
src/Gui/timeline/Track.qml | 2 +-<br/>
2 files changed, 2 insertions(+), 2 deletions(-)<br/>
<br/>
diff --git a/src/Gui/library/ui/ClipLibraryView.qml b/src/Gui/library/ui/ClipLibraryView.qml<br/>
index 9b47dbde..a2704769 100644<br/>
--- a/src/Gui/library/ui/ClipLibraryView.qml<br/>
+++ b/src/Gui/library/ui/ClipLibraryView.qml<br/>
@@ -67,7 +67,7 @@ Rectangle {<br/>
}<br/>
}<br/>
}<br/>
- for ( var i = 0; i < clips.count; ++i ) {<br/>
+ for ( i = 0; i < clips.count; ++i ) {<br/>
if ( clips[i].uuid === uuid ) {<br/>
clips.remove( i );<br/>
break;<br/>
diff --git a/src/Gui/timeline/Track.qml b/src/Gui/timeline/Track.qml<br/>
index f102f521..407c458c 100644<br/>
--- a/src/Gui/timeline/Track.qml<br/>
+++ b/src/Gui/timeline/Track.qml<br/>
@@ -143,7 +143,7 @@ Item {<br/>
vClipInfo = findClipFromTrack( "Video", trackId, "videoUuid" );<br/>
var pos = 0;<br/>
if ( aClipInfo ) {<br/>
- var pos = aClipInfo["position"];<br/>
+ pos = aClipInfo["position"];<br/>
removeClipFromTrack( "Audio", trackId, "audioUuid" );<br/>
}<br/>
if ( vClipInfo ) {<br/>
<br/>
<br/>
<br/>
------------------------------<br/>
<br/>
Message: 4<br/>
Date: Wed, 21 Jun 2017 12:56:43 +0200<br/>
From: Yikai Lu <git@videolan.org><br/>
To: vlmc-devel@videolan.org<br/>
Subject: [vlmc-devel] Media: Fix saving/loading sub clips<br/>
Message-ID: <20170621105645.0EB55169283@albiero.videolan.org><br/>
Content-Type: text/plain; charset=UTF-8<br/>
<br/>
vlmc | branch: master | Yikai Lu <luyikei.qmltu@gmail.com> | Wed Jun 21 19:55:18 2017 +0900| [3f797e4d2a15a70f60c717b75bd32d403c5eacf4] | committer: Yikai Lu<br/>
<br/>
Media: Fix saving/loading sub clips<br/>
<br/>
Somehow we changed the saving format and didn't update it<br/>
<br/>
> <a href="https://code.videolan.org/videolan/vlmc/commit/3f797e4d2a15a70f60c717b75bd32d403c5eacf4" target="_blank">https://code.videolan.org/videolan/vlmc/commit/3f797e4d2a15a70f60c717b75bd32d403c5eacf4</a><br/>
---<br/>
<br/>
src/Library/Library.cpp | 9 ++++++---<br/>
src/Media/Media.cpp | 4 ++--<br/>
2 files changed, 8 insertions(+), 5 deletions(-)<br/>
<br/>
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp<br/>
index 5b50220d..8430d08a 100644<br/>
--- a/src/Library/Library.cpp<br/>
+++ b/src/Library/Library.cpp<br/>
@@ -83,11 +83,14 @@ Library::postLoad()<br/>
for ( const auto& var : m_settings->value( "medias" )->get().toList() )<br/>
{<br/>
auto map = var.toMap();<br/>
- auto subClipsMap = map["clips"].toMap();<br/>
- map["clips"] = QVariant();<br/>
auto m = Media::fromVariant( map );<br/>
addMedia( m );<br/>
- m->loadSubclip( subClipsMap );<br/>
+ if ( map.contains( "clips" ) == true )<br/>
+ {<br/>
+ const auto& subClipsList = map["clips"].toList();<br/>
+ for ( const auto& subClip : subClipsList )<br/>
+ m->loadSubclip( subClip.toMap() );<br/>
+ }<br/>
}<br/>
}<br/>
<br/>
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp<br/>
index fdf7e55d..c5a28b90 100644<br/>
--- a/src/Media/Media.cpp<br/>
+++ b/src/Media/Media.cpp<br/>
@@ -211,12 +211,12 @@ Media::snapshot()<br/>
QSharedPointer<Clip><br/>
Media::loadSubclip( const QVariantMap& m )<br/>
{<br/>
- if ( m.contains( "uuid" ) == false || m.contains( "begin" ) == false || m.contains( "end" ) == false )<br/>
+ if ( m.contains( "libraryUuid" ) == false || m.contains( "begin" ) == false || m.contains( "end" ) == false )<br/>
{<br/>
vlmcWarning() << "Invalid clip provided:" << m;<br/>
return {};<br/>
}<br/>
- const auto& uuid = m["uuid"].toUuid();<br/>
+ const auto& uuid = m["libraryUuid"].toUuid();<br/>
const auto begin = m["begin"].toLongLong();<br/>
const auto end = m["end"].toLongLong();<br/>
auto clip = QSharedPointer<Clip>::create( sharedFromThis(), begin, end, uuid );<br/>
<br/>
<br/>
<br/>
------------------------------<br/>
<br/>
Subject: Digest Footer<br/>
<br/>
_______________________________________________<br/>
Vlmc-devel mailing list<br/>
Vlmc-devel@videolan.org<br/>
<a href="https://mailman.videolan.org/listinfo/vlmc-devel" target="_blank">https://mailman.videolan.org/listinfo/vlmc-devel</a><br/>
<br/>
<br/>
------------------------------<br/>
<br/>
End of Vlmc-devel Digest, Vol 59, Issue 8<br/>
*****************************************</div>
</div>
</div>
</div></div></body></html>