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
252
Issues
252
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
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
Multimedia
Kdenlive
Commits
8f788c1d
Commit
8f788c1d
authored
May 13, 2017
by
Vincent Pinon
Committed by
Vincent Pinon
May 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more Windows rendering fixes
parent
4d7a3a6d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
src/dialogs/renderwidget.cpp
src/dialogs/renderwidget.cpp
+9
-3
src/mltconnection.cpp
src/mltconnection.cpp
+0
-4
src/monitor/glwidget.cpp
src/monitor/glwidget.cpp
+0
-5
No files found.
src/dialogs/renderwidget.cpp
View file @
8f788c1d
...
...
@@ -93,7 +93,7 @@ enum JOBSTATUS {
#ifdef Q_OS_WIN
const
QLatin1String
ScriptFormat
(
".bat"
);
QString
ScriptSetVar
(
const
QString
name
,
const
QString
value
)
{
return
QString
(
"set "
)
+
name
+
"=
"
+
value
;
}
QString
ScriptSetVar
(
const
QString
name
,
const
QString
value
)
{
return
QString
(
"set "
)
+
name
+
"=
\"
"
+
value
+
'\"'
;
}
QString
ScriptGetVar
(
const
QString
varName
)
{
return
QString
(
'%'
)
+
varName
+
'%'
;
}
#else
const
QLatin1String
ScriptFormat
(
".sh"
);
...
...
@@ -2526,14 +2526,16 @@ bool RenderWidget::startWaitingRenderJobs()
}
QTextStream
outStream
(
&
file
);
#ifndef Q_OS_WIN
outStream
<<
"#! /bin/sh"
<<
'\n'
<<
'\n'
;
#endif
RenderJobItem
*
item
=
static_cast
<
RenderJobItem
*>
(
m_view
.
running_jobs
->
topLevelItem
(
0
));
while
(
item
)
{
if
(
item
->
status
()
==
WAITINGJOB
)
{
if
(
item
->
type
()
==
DirectRenderType
)
{
// Add render process for item
const
QString
params
=
item
->
data
(
1
,
ParametersRole
).
toStringList
().
join
(
QLatin1Char
(
' '
));
outStream
<<
m_renderer
<<
' '
<<
params
<<
'\n'
;
outStream
<<
'\"'
<<
m_renderer
<<
"
\"
"
<<
params
<<
'\n'
;
}
else
if
(
item
->
type
()
==
ScriptRenderType
)
{
// Script item
outStream
<<
item
->
data
(
1
,
ParametersRole
).
toString
()
<<
'\n'
;
...
...
@@ -2542,7 +2544,11 @@ bool RenderWidget::startWaitingRenderJobs()
item
=
static_cast
<
RenderJobItem
*>
(
m_view
.
running_jobs
->
itemBelow
(
item
));
}
// erase itself when rendering is finished
outStream
<<
"rm "
<<
autoscriptFile
<<
'\n'
<<
'\n'
;
#ifndef Q_OS_WIN
outStream
<<
"rm
\"
"
<<
autoscriptFile
<<
"
\"\n
"
;
#else
outStream
<<
"del
\"
"
<<
autoscriptFile
<<
"
\"\n
"
;
#endif
if
(
file
.
error
()
!=
QFile
::
NoError
)
{
KMessageBox
::
error
(
nullptr
,
i18n
(
"Cannot write to file %1"
,
autoscriptFile
));
file
.
close
();
...
...
src/mltconnection.cpp
View file @
8f788c1d
...
...
@@ -97,11 +97,7 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
// Cannot find MLT path, try finding melt
if
(
!
meltPath
.
isEmpty
())
{
if
(
meltPath
.
contains
(
QLatin1Char
(
'/'
)))
{
#ifdef Q_OS_WIN
profilePath
=
meltPath
.
section
(
QLatin1Char
(
'/'
),
0
,
-
2
)
+
QStringLiteral
(
"/share/mlt/profiles/"
);
#else
profilePath
=
meltPath
.
section
(
QLatin1Char
(
'/'
),
0
,
-
2
)
+
QStringLiteral
(
"/share/mlt/profiles/"
);
#endif
}
else
{
profilePath
=
qApp
->
applicationDirPath
()
+
QStringLiteral
(
"/share/mlt/profiles/"
);
}
...
...
src/monitor/glwidget.cpp
View file @
8f788c1d
...
...
@@ -1020,11 +1020,6 @@ int GLWidget::reconfigure(Mlt::Profile *profile)
int
volume
=
KdenliveSettings
::
volume
();
if
(
serviceName
==
QLatin1String
(
"sdl_audio"
))
{
/*#ifdef Q_OS_WIN
m_consumer->set("audio_buffer", 2048);
#else
m_consumer->set("audio_buffer", 512);
#endif*/
QString
audioDevice
=
KdenliveSettings
::
audiodevicename
();
if
(
!
audioDevice
.
isEmpty
())
{
m_consumer
->
set
(
"audio_device"
,
audioDevice
.
toUtf8
().
constData
());
...
...
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