Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
63718973
Commit
63718973
authored
Jun 10, 2017
by
luyikei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't insert extra spaces for QDebug functions
Because spaces will be automatically inserted
parent
9062a204
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
18 deletions
+18
-18
src/Gui/library/ClipLibraryView.cpp
src/Gui/library/ClipLibraryView.cpp
+1
-1
src/Library/Library.cpp
src/Library/Library.cpp
+3
-3
src/Main/main.cpp
src/Main/main.cpp
+1
-1
src/Renderer/ConsoleRenderer.cpp
src/Renderer/ConsoleRenderer.cpp
+1
-1
src/Services/YouTube/YouTubeAuthenticator.cpp
src/Services/YouTube/YouTubeAuthenticator.cpp
+1
-1
src/Services/YouTube/YouTubeService.cpp
src/Services/YouTube/YouTubeService.cpp
+2
-2
src/Services/YouTube/YouTubeUploader.cpp
src/Services/YouTube/YouTubeUploader.cpp
+1
-1
src/Settings/Settings.cpp
src/Settings/Settings.cpp
+2
-2
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+1
-1
src/Workflow/SequenceWorkflow.cpp
src/Workflow/SequenceWorkflow.cpp
+5
-5
No files found.
src/Gui/library/ClipLibraryView.cpp
View file @
63718973
...
...
@@ -74,7 +74,7 @@ ClipLibraryView::startDrag( const QString& uuid )
auto
clip
=
Core
::
instance
()
->
library
()
->
clip
(
uuid
);
if
(
!
clip
)
{
vlmcCritical
()
<<
"Couldn't find a clip
"
<<
uuid
;
vlmcCritical
()
<<
"Couldn't find a clip
:
"
<<
uuid
;
return
;
}
...
...
src/Library/Library.cpp
View file @
63718973
...
...
@@ -105,17 +105,17 @@ Library::addMedia( QSharedPointer<Media> media )
m_media
[
media
->
id
()]
=
media
;
m_clips
[
media
->
baseClip
()
->
uuid
()]
=
media
->
baseClip
();
emit
clipAdded
(
media
->
baseClip
()
->
uuid
().
toString
()
);
vlmcDebug
()
<<
"Clip
"
<<
media
->
baseClip
()
->
uuid
().
toString
()
<<
"
is added to Library"
;
vlmcDebug
()
<<
"Clip"
<<
media
->
baseClip
()
->
uuid
().
toString
()
<<
"is added to Library"
;
connect
(
media
.
data
(),
&
Media
::
subclipAdded
,
[
this
](
QSharedPointer
<
Clip
>
c
)
{
m_clips
[
c
->
uuid
()]
=
c
;
emit
clipAdded
(
c
->
uuid
().
toString
()
);
vlmcDebug
()
<<
"Clip
"
<<
c
->
uuid
().
toString
()
<<
"
is added to Library"
;
vlmcDebug
()
<<
"Clip"
<<
c
->
uuid
().
toString
()
<<
"is added to Library"
;
setCleanState
(
false
);
});
connect
(
media
.
data
(),
&
Media
::
subclipRemoved
,
[
this
](
const
QUuid
&
uuid
)
{
m_clips
.
remove
(
uuid
);
emit
clipRemoved
(
uuid
.
toString
()
);
vlmcDebug
()
<<
"Clip
"
<<
uuid
.
toString
()
<<
"
is removed in Library"
;
vlmcDebug
()
<<
"Clip"
<<
uuid
.
toString
()
<<
"is removed in Library"
;
// This seems wrong, for instance if we undo a clip splitting
setCleanState
(
false
);
}
);
...
...
src/Main/main.cpp
View file @
63718973
...
...
@@ -217,7 +217,7 @@ VLMCCoremain( int argc, char **argv )
{
vlmcCritical
()
<<
"Usage:"
<<
argv
[
0
]
#ifdef HAVE_GUI
<<
"--no-gui
"
<<
"--no-gui"
#endif
<<
"project.vlmc output_file"
;
return
1
;
...
...
src/Renderer/ConsoleRenderer.cpp
View file @
63718973
...
...
@@ -48,7 +48,7 @@ ConsoleRenderer::frameChanged( qint64 frame, qint64 length ) const
if
(
newPercent
!=
percent
)
{
percent
=
newPercent
;
vlmcDebug
()
<<
"ConsoleRenderer:
"
<<
percent
<<
"%"
;
vlmcDebug
()
<<
"ConsoleRenderer:"
<<
percent
<<
"%"
;
}
}
...
...
src/Services/YouTube/YouTubeAuthenticator.cpp
View file @
63718973
...
...
@@ -108,7 +108,7 @@ YouTubeAuthenticator::authFinished()
void
YouTubeAuthenticator
::
error
(
QString
&
e
)
{
vlmcDebug
()
<<
"[YouTube AUTH ERROR]:
"
<<
e
;
vlmcDebug
()
<<
"[YouTube AUTH ERROR]:"
<<
e
;
emit
authError
(
e
);
}
...
...
src/Services/YouTube/YouTubeService.cpp
View file @
63718973
...
...
@@ -151,7 +151,7 @@ YouTubeService::setVideoParameters( const QString& fileName, const VideoData& da
void
YouTubeService
::
authError
(
QString
e
)
{
vlmcDebug
()
<<
"[YT SERVICE]: AUTH ERROR
"
<<
e
;
vlmcDebug
()
<<
"[YT SERVICE]: AUTH ERROR"
<<
e
;
if
(
e
==
"BadAuthentication"
)
m_error
=
BadAuthentication
;
...
...
@@ -216,7 +216,7 @@ YouTubeService::networkError( QNetworkReply::NetworkError e )
m_error
=
UnknownError
;
}
vlmcDebug
()
<<
"[NETWORK ERROR]:
"
<<
e
<<
":
"
<<
errString
;
vlmcDebug
()
<<
"[NETWORK ERROR]:"
<<
e
<<
":"
<<
errString
;
emit
error
(
errString
);
/* Ignore Content and Abort errors */
...
...
src/Services/YouTube/YouTubeUploader.cpp
View file @
63718973
...
...
@@ -139,7 +139,7 @@ YouTubeUploader::uploadFinished()
QNetworkReply
*
reply
=
static_cast
<
QNetworkReply
*>
(
sender
()
);
const
QByteArray
data
=
reply
->
readAll
();
vlmcDebug
()
<<
"In YouTubeUploader::uploadFinished: data received =
"
<<
data
;
vlmcDebug
()
<<
"In YouTubeUploader::uploadFinished: data received ="
<<
data
;
m_service
->
m_state
=
UploadFinish
;
/* Feed parser called to parse the XML data received */
...
...
src/Settings/Settings.cpp
View file @
63718973
...
...
@@ -212,7 +212,7 @@ Settings::setValue( const QString &key, const QVariant &value )
(
*
it
)
->
set
(
value
);
return
true
;
}
vlmcCritical
()
<<
"setting value without a created variable:
"
<<
key
;
vlmcCritical
()
<<
"setting value without a created variable:"
<<
key
;
return
false
;
}
void
...
...
@@ -235,7 +235,7 @@ Settings::value( const QString &key )
SettingMap
::
iterator
it
=
m_settings
.
find
(
key
);
if
(
it
!=
m_settings
.
end
()
)
return
*
it
;
vlmcCritical
()
<<
"fetching value without a created variable"
<<
key
;
vlmcCritical
()
<<
"fetching value without a created variable
:
"
<<
key
;
return
nullptr
;
}
...
...
src/Workflow/MainWorkflow.cpp
View file @
63718973
...
...
@@ -209,7 +209,7 @@ MainWorkflow::clipInfo( const QString& uuid )
auto
clip
=
c
->
clip
;
auto
h
=
clip
->
toVariant
().
toHash
();
h
[
"uuid"
]
=
uuid
;
vlmcWarning
()
<<
"library UUID:
"
<<
h
[
"libraryUuid"
];
vlmcWarning
()
<<
"library UUID:"
<<
h
[
"libraryUuid"
];
h
[
"length"
]
=
(
qint64
)(
clip
->
input
()
->
length
()
);
h
[
"name"
]
=
clip
->
media
()
->
title
();
h
[
"audio"
]
=
c
->
isAudio
;
...
...
src/Workflow/SequenceWorkflow.cpp
View file @
63718973
...
...
@@ -87,7 +87,7 @@ SequenceWorkflow::moveClip( const QUuid& uuid, quint32 trackId, qint64 pos )
auto
it
=
m_clips
.
find
(
uuid
);
if
(
it
==
m_clips
.
end
()
)
{
vlmcCritical
()
<<
"Couldn't find a clip
"
<<
uuid
;
vlmcCritical
()
<<
"Couldn't find a clip
:
"
<<
uuid
;
return
false
;
}
auto
&
c
=
it
.
value
();
...
...
@@ -126,7 +126,7 @@ SequenceWorkflow::resizeClip( const QUuid& uuid, qint64 newBegin, qint64 newEnd,
auto
it
=
m_clips
.
find
(
uuid
);
if
(
it
==
m_clips
.
end
()
)
{
vlmcCritical
()
<<
"Couldn't find a clip
"
<<
uuid
;
vlmcCritical
()
<<
"Couldn't find a clip
:
"
<<
uuid
;
return
false
;
}
auto
&
c
=
it
.
value
();
...
...
@@ -156,7 +156,7 @@ SequenceWorkflow::removeClip( const QUuid& uuid )
auto
it
=
m_clips
.
find
(
uuid
);
if
(
it
==
m_clips
.
end
()
)
{
vlmcCritical
()
<<
"Couldn't find a sequence workflow clip
"
<<
uuid
;
vlmcCritical
()
<<
"Couldn't find a sequence workflow clip
:
"
<<
uuid
;
return
{};
}
auto
c
=
it
.
value
();
...
...
@@ -184,7 +184,7 @@ SequenceWorkflow::linkClips( const QUuid& uuidA, const QUuid& uuidB )
auto
clipB
=
clip
(
uuidB
);
if
(
!
clipA
||
!
clipB
)
{
vlmcCritical
()
<<
"Couldn't find clips:
"
<<
uuidA
<<
"
and
"
<<
uuidB
;
vlmcCritical
()
<<
"Couldn't find clips:"
<<
uuidA
<<
"and"
<<
uuidB
;
return
false
;
}
clipA
->
linkedClips
.
append
(
uuidB
);
...
...
@@ -201,7 +201,7 @@ SequenceWorkflow::unlinkClips( const QUuid& uuidA, const QUuid& uuidB )
auto
clipB
=
clip
(
uuidB
);
if
(
!
clipA
||
!
clipB
)
{
vlmcCritical
()
<<
"Couldn't find clips:
"
<<
uuidA
<<
"
and
"
<<
uuidB
;
vlmcCritical
()
<<
"Couldn't find clips:"
<<
uuidA
<<
"and"
<<
uuidB
;
return
false
;
}
bool
ret
=
true
;
...
...
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