Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Heiko Becker
kdenlive
Commits
26fdc09a
Commit
26fdc09a
authored
Apr 10, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some qml startup warnings
parent
a972c153
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
src/monitor/glwidget.cpp
src/monitor/glwidget.cpp
+3
-1
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+2
-1
src/monitor/qmlmanager.cpp
src/monitor/qmlmanager.cpp
+2
-2
No files found.
src/monitor/glwidget.cpp
View file @
26fdc09a
...
...
@@ -130,7 +130,7 @@ GLWidget::GLWidget(int id, QObject *parent)
m_blackClip
->
set
(
"out"
,
3
);
connect
(
&
m_refreshTimer
,
&
QTimer
::
timeout
,
this
,
&
GLWidget
::
refresh
);
m_producer
=
m_blackClip
;
rootContext
()
->
setContextProperty
(
"markersModel"
,
0
);
if
(
!
initGPUAccel
())
{
disableGPUAccel
();
}
...
...
@@ -956,6 +956,8 @@ int GLWidget::setProducer(const std::shared_ptr<Mlt::Producer> &producer, bool i
removeAudioOverlay
();
}
m_producer
=
m_blackClip
;
// Reset markersModel
rootContext
()
->
setContextProperty
(
"markersModel"
,
0
);
}
// redundant check. postcondition of above is m_producer != null
if
(
m_producer
)
{
...
...
src/monitor/monitor.cpp
View file @
26fdc09a
...
...
@@ -1353,7 +1353,6 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
disconnect
(
m_controller
->
getMarkerModel
().
get
(),
SIGNAL
(
rowsRemoved
(
const
QModelIndex
&
,
int
,
int
)),
this
,
SLOT
(
checkOverlay
()));
}
m_controller
=
controller
;
loadQmlScene
(
MonitorSceneDefault
);
m_snaps
.
reset
(
new
SnapModel
());
m_glMonitor
->
getControllerProxy
()
->
resetZone
();
if
(
controller
)
{
...
...
@@ -1367,6 +1366,7 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
return
;
}
m_glMonitor
->
setRulerInfo
((
int
)
m_controller
->
frameDuration
(),
controller
->
getMarkerModel
());
loadQmlScene
(
MonitorSceneDefault
);
m_timePos
->
setRange
(
0
,
(
int
)
m_controller
->
frameDuration
());
updateMarkers
();
connect
(
m_glMonitor
->
getControllerProxy
(),
&
MonitorProxy
::
addSnap
,
this
,
&
Monitor
::
addSnapPoint
,
Qt
::
DirectConnection
);
...
...
@@ -1389,6 +1389,7 @@ void Monitor::slotOpenClip(const std::shared_ptr<ProjectClip> &controller, int i
m_glMonitor
->
getControllerProxy
()
->
setClipHasAV
(
controller
->
hasAudioAndVideo
());
// hasEffects = controller->hasEffects();
}
else
{
loadQmlScene
(
MonitorSceneDefault
);
m_glMonitor
->
setProducer
(
nullptr
,
isActive
());
m_glMonitor
->
setAudioThumb
();
m_audioMeterWidget
->
audioChannels
=
0
;
...
...
src/monitor/qmlmanager.cpp
View file @
26fdc09a
...
...
@@ -62,6 +62,8 @@ void QmlManager::setScene(Kdenlive::MonitorId id, MonitorSceneType type, QSize p
}
m_sceneType
=
type
;
QQuickItem
*
root
=
nullptr
;
const
QFont
ft
=
QFontDatabase
::
systemFont
(
QFontDatabase
::
FixedFont
);
m_view
->
rootContext
()
->
setContextProperty
(
"fixedFont"
,
ft
);
switch
(
type
)
{
case
MonitorSceneGeometry
:
m_view
->
setSource
(
QUrl
(
QStringLiteral
(
"qrc:/qml/kdenlivemonitoreffectscene.qml"
)));
...
...
@@ -117,8 +119,6 @@ void QmlManager::setScene(Kdenlive::MonitorId id, MonitorSceneType type, QSize p
if
(
root
&&
duration
>
0
)
{
root
->
setProperty
(
"duration"
,
duration
);
}
const
QFont
ft
=
QFontDatabase
::
systemFont
(
QFontDatabase
::
FixedFont
);
m_view
->
rootContext
()
->
setContextProperty
(
"fixedFont"
,
ft
);
}
void
QmlManager
::
effectRectChanged
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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