Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
69972249
Commit
69972249
authored
Sep 07, 2009
by
Hugo Beauzee-Luyssen
Browse files
Fixed some bugs
parent
16c7b14f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Library/Library.cpp
View file @
69972249
...
...
@@ -103,9 +103,9 @@ void Library::loadProject( const QDomElement& medias )
uuid
=
mediaProperty
.
text
();
else
qWarning
()
<<
"Unknown field"
<<
tagName
;
Library
::
getInstance
()
->
newMediaLoadingAsked
(
path
,
uuid
);
mediaProperty
=
mediaProperty
.
nextSibling
().
toElement
();
}
newMediaLoadingAsked
(
path
,
uuid
);
elem
=
elem
.
nextSibling
().
toElement
();
}
}
...
...
src/Workflow/MainWorkflow.cpp
View file @
69972249
...
...
@@ -71,12 +71,11 @@ MainWorkflow::~MainWorkflow()
delete
[]
blackOutput
;
}
void
MainWorkflow
::
addClip
(
Clip
*
clip
,
unsigned
int
trackId
,
qint64
start
)
void
MainWorkflow
::
addClip
(
Clip
*
clip
,
unsigned
int
trackId
,
qint64
start
)
{
Q_ASSERT_X
(
trackId
<
m_trackCount
,
"MainWorkflow::addClip"
,
"The specified trackId isn't valid, for it's higher than the number of tracks"
);
m_tracks
[
trackId
]
->
addClip
(
clip
,
start
);
//if the track is deactivated, we need to reactivate it.
if
(
m_tracks
[
trackId
].
deactivated
()
==
true
)
...
...
@@ -409,7 +408,6 @@ void MainWorkflow::loadProject( const QDomElement& project )
Q_ASSERT
(
elem
.
tagName
()
==
"track"
);
unsigned
int
trackId
=
elem
.
attribute
(
"id"
).
toUInt
(
&
ok
);
qDebug
()
<<
"Got track"
<<
trackId
;
if
(
ok
==
false
)
{
qWarning
()
<<
"Invalid track number in project file"
;
...
...
@@ -466,12 +464,13 @@ void MainWorkflow::loadProject( const QDomElement& project )
}
Clip
*
c
=
new
Clip
(
parent
,
begin
,
end
);
m_tracks
[
trackId
]
->
addClip
(
c
,
startPos
);
addClip
(
c
,
trackId
,
startPos
);
clip
=
clip
.
nextSibling
().
toElement
();
}
elem
=
elem
.
nextSibling
().
toElement
();
}
qDebug
()
<<
"Workflow length:"
<<
getLength
();
}
void
MainWorkflow
::
saveProject
(
QDomDocument
&
doc
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment