Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
bd0edcc0
Commit
bd0edcc0
authored
Feb 08, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace qDebug & friends with a vlmc wrapper.
Loglines now contain thread ID, time, and a severity level marker
parent
d037215a
Changes
63
Hide whitespace changes
Inline
Side-by-side
Showing
63 changed files
with
176 additions
and
171 deletions
+176
-171
src/CMakeLists.txt
src/CMakeLists.txt
+1
-0
src/Commands/Commands.cpp
src/Commands/Commands.cpp
+0
-2
src/Commands/KeyboardShortcutHelper.cpp
src/Commands/KeyboardShortcutHelper.cpp
+0
-1
src/EffectsEngine/Effect.cpp
src/EffectsEngine/Effect.cpp
+4
-4
src/EffectsEngine/EffectInstance.cpp
src/EffectsEngine/EffectInstance.cpp
+0
-2
src/EffectsEngine/EffectSettingValue.cpp
src/EffectsEngine/EffectSettingValue.cpp
+4
-4
src/EffectsEngine/EffectUser.cpp
src/EffectsEngine/EffectUser.cpp
+8
-8
src/EffectsEngine/EffectsEngine.cpp
src/EffectsEngine/EffectsEngine.cpp
+7
-7
src/Gui/DockWidgetManager.cpp
src/Gui/DockWidgetManager.cpp
+0
-1
src/Gui/MainWindow.cpp
src/Gui/MainWindow.cpp
+2
-2
src/Gui/effectsengine/EffectInstanceListModel.cpp
src/Gui/effectsengine/EffectInstanceListModel.cpp
+0
-2
src/Gui/effectsengine/EffectInstanceWidget.cpp
src/Gui/effectsengine/EffectInstanceWidget.cpp
+0
-2
src/Gui/effectsengine/EffectsListView.cpp
src/Gui/effectsengine/EffectsListView.cpp
+0
-2
src/Gui/export/ShareOnInternet.cpp
src/Gui/export/ShareOnInternet.cpp
+7
-8
src/Gui/import/ImportController.cpp
src/Gui/import/ImportController.cpp
+3
-4
src/Gui/library/MediaLibrary.cpp
src/Gui/library/MediaLibrary.cpp
+2
-2
src/Gui/preview/PreviewRuler.cpp
src/Gui/preview/PreviewRuler.cpp
+0
-1
src/Gui/preview/PreviewWidget.cpp
src/Gui/preview/PreviewWidget.cpp
+0
-1
src/Gui/project/GuiProjectManager.cpp
src/Gui/project/GuiProjectManager.cpp
+0
-2
src/Gui/settings/KeyboardShortcutInput.cpp
src/Gui/settings/KeyboardShortcutInput.cpp
+0
-1
src/Gui/settings/LanguageWidget.cpp
src/Gui/settings/LanguageWidget.cpp
+3
-3
src/Gui/settings/PreferenceWidget.cpp
src/Gui/settings/PreferenceWidget.cpp
+0
-1
src/Gui/settings/Settings.cpp
src/Gui/settings/Settings.cpp
+0
-2
src/Gui/timeline/AbstractGraphicsItem.cpp
src/Gui/timeline/AbstractGraphicsItem.cpp
+0
-2
src/Gui/timeline/AbstractGraphicsMediaItem.cpp
src/Gui/timeline/AbstractGraphicsMediaItem.cpp
+0
-1
src/Gui/timeline/GraphicsCursorItem.cpp
src/Gui/timeline/GraphicsCursorItem.cpp
+0
-1
src/Gui/timeline/GraphicsEffectItem.cpp
src/Gui/timeline/GraphicsEffectItem.cpp
+0
-2
src/Gui/timeline/GraphicsMovieItem.cpp
src/Gui/timeline/GraphicsMovieItem.cpp
+0
-1
src/Gui/timeline/GraphicsTrack.cpp
src/Gui/timeline/GraphicsTrack.cpp
+0
-2
src/Gui/timeline/Timeline.cpp
src/Gui/timeline/Timeline.cpp
+3
-4
src/Gui/timeline/TracksView.cpp
src/Gui/timeline/TracksView.cpp
+3
-4
src/Gui/wizard/OpenPage.cpp
src/Gui/wizard/OpenPage.cpp
+0
-1
src/Gui/wizard/ProjectWizard.cpp
src/Gui/wizard/ProjectWizard.cpp
+0
-2
src/Gui/wizard/WelcomePage.cpp
src/Gui/wizard/WelcomePage.cpp
+0
-1
src/LibVLCpp/VLCMediaPlayer.cpp
src/LibVLCpp/VLCMediaPlayer.cpp
+8
-8
src/Library/Library.cpp
src/Library/Library.cpp
+2
-2
src/Library/MediaContainer.cpp
src/Library/MediaContainer.cpp
+3
-4
src/Main/vlmc.cpp
src/Main/vlmc.cpp
+1
-2
src/Media/Clip.cpp
src/Media/Clip.cpp
+0
-2
src/Media/Media.cpp
src/Media/Media.cpp
+2
-2
src/Metadata/MetaDataManager.cpp
src/Metadata/MetaDataManager.cpp
+0
-1
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+4
-5
src/Project/ProjectManager.cpp
src/Project/ProjectManager.cpp
+2
-2
src/Project/Workspace.cpp
src/Project/Workspace.cpp
+2
-3
src/Project/WorkspaceWorker.cpp
src/Project/WorkspaceWorker.cpp
+4
-5
src/Renderer/ClipRenderer.cpp
src/Renderer/ClipRenderer.cpp
+0
-1
src/Renderer/WorkflowRenderer.cpp
src/Renderer/WorkflowRenderer.cpp
+4
-4
src/Services/YouTube/YouTubeAuthenticator.cpp
src/Services/YouTube/YouTubeAuthenticator.cpp
+3
-3
src/Services/YouTube/YouTubeFeedParser.cpp
src/Services/YouTube/YouTubeFeedParser.cpp
+0
-1
src/Services/YouTube/YouTubeService.cpp
src/Services/YouTube/YouTubeService.cpp
+5
-5
src/Services/YouTube/YouTubeUploader.cpp
src/Services/YouTube/YouTubeUploader.cpp
+5
-6
src/Settings/SettingValue.cpp
src/Settings/SettingValue.cpp
+0
-1
src/Settings/SettingsManager.cpp
src/Settings/SettingsManager.cpp
+6
-7
src/Tools/Toggleable.hpp
src/Tools/Toggleable.hpp
+0
-2
src/Tools/VlmcDebug.h
src/Tools/VlmcDebug.h
+63
-0
src/Tools/VlmcLogger.cpp
src/Tools/VlmcLogger.cpp
+2
-1
src/Tools/VlmcLogger.h
src/Tools/VlmcLogger.h
+0
-2
src/Workflow/AudioClipWorkflow.cpp
src/Workflow/AudioClipWorkflow.cpp
+3
-3
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+0
-1
src/Workflow/ImageClipWorkflow.cpp
src/Workflow/ImageClipWorkflow.cpp
+1
-2
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+4
-5
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+5
-6
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+0
-2
No files found.
src/CMakeLists.txt
View file @
bd0edcc0
...
...
@@ -41,6 +41,7 @@ SET(VLMC_SRCS
Tools/QSingleton.hpp
Tools/Singleton.hpp
Tools/Toggleable.hpp
Tools/VlmcDebug.h
Tools/VlmcLogger.cpp
Workflow/AudioClipWorkflow.cpp
Workflow/ClipWorkflow.cpp
...
...
src/Commands/Commands.cpp
View file @
bd0edcc0
...
...
@@ -34,8 +34,6 @@
#ifdef WITH_GUI
# include "UndoStack.h"
#include <QtDebug>
void
Commands
::
trigger
(
QUndoCommand
*
command
)
{
...
...
src/Commands/KeyboardShortcutHelper.cpp
View file @
bd0edcc0
...
...
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QtDebug>
#include <QAction>
#include "SettingValue.h"
...
...
src/EffectsEngine/Effect.cpp
View file @
bd0edcc0
...
...
@@ -23,7 +23,7 @@
#include "Effect.h"
#include "EffectInstance.h"
#include
<Qt
Debug
>
#include
"Vlmc
Debug
.h"
Effect
::
Effect
(
const
QString
&
fileName
)
:
QLibrary
(
fileName
),
...
...
@@ -53,7 +53,7 @@ dest = reinterpret_cast<typeof( dest )>( resolve( symbolName ) )
#define LOAD_FREI0R_SYMBOL_CHECKED( dest, symbolName ) \
if ( ( LOAD_FREI0R_SYMBOL( dest, symbolName ) ) == NULL ) \
{ \
q
Critical() << "Failed to load symbol:" << symbolName; \
vlmc
Critical() << "Failed to load symbol:" << symbolName; \
return false; \
}
...
...
@@ -87,12 +87,12 @@ Effect::load()
m_author
=
infos
.
author
;
if
(
m_type
==
Filter
&&
m_f0r_update
==
NULL
)
{
q
Critical
()
<<
"Failed to load symbol f0r_update. Dropping module"
<<
fileName
();
vlmc
Critical
()
<<
"Failed to load symbol f0r_update. Dropping module"
<<
fileName
();
return
false
;
}
if
(
(
m_type
==
Mixer2
||
m_type
==
Mixer3
)
&&
m_f0r_update2
==
NULL
)
{
q
Critical
()
<<
"Failed to load symbol f0r_update2. Dropping module"
<<
fileName
();
vlmc
Critical
()
<<
"Failed to load symbol f0r_update2. Dropping module"
<<
fileName
();
return
false
;
}
for
(
qint32
i
=
0
;
i
<
m_nbParams
;
++
i
)
...
...
src/EffectsEngine/EffectInstance.cpp
View file @
bd0edcc0
...
...
@@ -25,8 +25,6 @@
#include "Effect.h"
#include <QtDebug>
EffectInstance
::
EffectInstance
(
Effect
*
effect
)
:
m_effect
(
effect
),
m_width
(
0
),
...
...
src/EffectsEngine/EffectSettingValue.cpp
View file @
bd0edcc0
...
...
@@ -23,10 +23,10 @@
#include "Effect.h"
#include "EffectSettingValue.h"
#include "EffectInstance.h"
#include "VlmcDebug.h"
#include <QColor>
#include <QPoint>
#include <QtDebug>
EffectSettingValue
::
EffectSettingValue
(
Type
type
,
EffectInstance
*
instance
,
quint32
index
,
const
char
*
name
,
const
char
*
desc
,
Flags
flags
)
:
...
...
@@ -91,7 +91,7 @@ EffectSettingValue::set( const QVariant &val )
break
;
}
default:
q
Critical
()
<<
"Setting type"
<<
m_type
<<
"is not handled by the effects engine"
;
vlmc
Critical
()
<<
"Setting type"
<<
m_type
<<
"is not handled by the effects engine"
;
break
;
}
apply
();
...
...
@@ -151,7 +151,7 @@ EffectSettingValue::get()
break
;
}
default:
q
Critical
()
<<
"Setting type"
<<
m_type
<<
"is not handled by the effects engine"
;
vlmc
Critical
()
<<
"Setting type"
<<
m_type
<<
"is not handled by the effects engine"
;
m_val
=
QVariant
();
}
return
m_val
;
...
...
@@ -179,7 +179,7 @@ EffectSettingValue::frei0rToVlmc( int type )
case
F0R_PARAM_STRING
:
return
String
;
default:
q
Critical
()
<<
"Invalid effect setting type ! Undefined behaviour"
;
vlmc
Critical
()
<<
"Invalid effect setting type ! Undefined behaviour"
;
}
//Keeping compiler happy.
return
Double
;
...
...
src/EffectsEngine/EffectUser.cpp
View file @
bd0edcc0
...
...
@@ -25,10 +25,10 @@
#include "EffectHelper.h"
#include "EffectInstance.h"
#include "Types.h"
#include "VlmcDebug.h"
#include <QDomElement>
#include <QReadWriteLock>
#include <QtDebug>
EffectUser
::
EffectUser
()
:
m_isRendering
(
false
),
...
...
@@ -192,10 +192,10 @@ EffectUser::loadEffects( const QDomElement &parent )
EffectHelper
*
helper
=
addEffect
(
e
,
effect
.
attribute
(
"start"
).
toLongLong
(),
effect
.
attribute
(
"end"
).
toLongLong
()
);
if
(
helper
==
NULL
)
q
Critical
()
<<
"Can't load effect"
<<
effect
.
attribute
(
"name"
);
vlmc
Critical
()
<<
"Can't load effect"
<<
effect
.
attribute
(
"name"
);
}
else
q
Critical
()
<<
"Can't load effect"
<<
effect
.
attribute
(
"name"
);
vlmc
Critical
()
<<
"Can't load effect"
<<
effect
.
attribute
(
"name"
);
}
effect
=
effect
.
nextSiblingElement
();
}
...
...
@@ -229,7 +229,7 @@ EffectUser::effects( Effect::Type type ) const
if
(
type
==
Effect
::
Filter
)
return
m_filters
;
if
(
type
!=
Effect
::
Mixer2
)
q
Critical
()
<<
"Only Filters and Mixer2 are handled. This is going to be nasty !"
;
vlmc
Critical
()
<<
"Only Filters and Mixer2 are handled. This is going to be nasty !"
;
return
m_mixers
;
}
...
...
@@ -259,7 +259,7 @@ EffectUser::removeEffect( Effect::Type type, qint32 idx )
}
}
else
q
Critical
()
<<
"Unhandled effect type"
;
vlmc
Critical
()
<<
"Unhandled effect type"
;
}
void
...
...
@@ -281,7 +281,7 @@ EffectUser::removeEffect(EffectHelper *helper)
}
++
it
;
}
q
Warning
()
<<
"Can't find EffectHelper"
<<
helper
->
uuid
()
<<
"for removal."
;
vlmc
Warning
()
<<
"Can't find EffectHelper"
<<
helper
->
uuid
()
<<
"for removal."
;
}
void
...
...
@@ -305,7 +305,7 @@ EffectUser::count( Effect::Type type ) const
return
m_filters
.
count
();
if
(
type
==
Effect
::
Mixer2
)
return
m_mixers
.
count
();
q
Critical
()
<<
"Unhandled effect type"
;
vlmc
Critical
()
<<
"Unhandled effect type"
;
return
0
;
}
...
...
@@ -324,7 +324,7 @@ EffectUser::moveEffect( EffectHelper *helper, qint64 newPos )
return
;
}
}
q
Warning
()
<<
this
<<
"Can't find effect"
<<
helper
->
uuid
();
vlmc
Warning
()
<<
this
<<
"Can't find effect"
<<
helper
->
uuid
();
}
void
...
...
src/EffectsEngine/EffectsEngine.cpp
View file @
bd0edcc0
...
...
@@ -26,6 +26,8 @@
#include "EffectInstance.h"
#include "Types.h"
#include "VlmcDebug.h"
#include <QApplication>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
...
...
@@ -39,8 +41,6 @@
#include <QSettings>
#include <QXmlStreamWriter>
#include <QtDebug>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
...
...
@@ -89,7 +89,7 @@ EffectsEngine::loadEffect( const QString &fileName )
name
=
m_cache
->
value
(
fileName
+
"/name"
).
toString
();
int
typeInt
=
m_cache
->
value
(
fileName
+
"/type"
).
toInt
();
if
(
typeInt
<
Effect
::
Unknown
||
typeInt
>
Effect
::
Mixer3
)
q
Warning
()
<<
"Invalid plugin type."
;
vlmc
Warning
()
<<
"Invalid plugin type."
;
else
{
type
=
static_cast
<
Effect
::
Type
>
(
typeInt
);
...
...
@@ -158,7 +158,7 @@ EffectsEngine::loadEffects()
TCHAR
*
pos
=
strrchr
(
appDir
,
'\\'
);
if
(
pos
==
NULL
)
{
q
Warning
()
<<
"Can't use ModuleFileName:"
<<
appDir
;
vlmc
Warning
()
<<
"Can't use ModuleFileName:"
<<
appDir
;
return
;
}
*
pos
=
0
;
...
...
@@ -166,16 +166,16 @@ EffectsEngine::loadEffects()
}
else
{
q
Warning
()
<<
"Failed to get application directory. Using current path."
;
vlmc
Warning
()
<<
"Failed to get application directory. Using current path."
;
pathList
<<
QDir
::
currentPath
()
+
"/effects/"
;
}
#endif
q
Debug
()
<<
"Loading effects from:"
<<
pathList
;
vlmc
Debug
()
<<
"Loading effects from:"
<<
pathList
;
foreach
(
const
QString
&
path
,
pathList
)
{
if
(
QFile
::
exists
(
path
)
==
true
)
{
q
Debug
()
<<
"
\t
Scanning"
<<
path
<<
"for effects"
;
vlmc
Debug
()
<<
"
\t
Scanning"
<<
path
<<
"for effects"
;
browseDirectory
(
path
);
}
}
...
...
src/Gui/DockWidgetManager.cpp
View file @
bd0edcc0
...
...
@@ -19,7 +19,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QtDebug>
#include <QApplication>
#include <QMap>
#include <QMapIterator>
...
...
src/Gui/MainWindow.cpp
View file @
bd0edcc0
...
...
@@ -30,12 +30,12 @@
#include <QUrl>
#include <QNetworkProxy>
#include <QSettings>
#include <QDebug>
#include "MainWindow.h"
#include "config.h"
#include "Library.h"
#include "About.h"
#include "VlmcDebug.h"
#include "VlmcLogger.h"
#include "EffectsEngine/EffectsEngine.h"
...
...
@@ -755,7 +755,7 @@ MainWindow::toolButtonClicked( QAction *action )
else
if
(
action
==
m_ui
.
actionCut_mode
)
emit
toolChanged
(
TOOL_CUT
);
else
q
Critical
()
<<
"Unknown tool. This should not happen !"
;
vlmc
Critical
()
<<
"Unknown tool. This should not happen !"
;
}
void
...
...
src/Gui/effectsengine/EffectInstanceListModel.cpp
View file @
bd0edcc0
...
...
@@ -29,8 +29,6 @@
#include <QApplication>
#include <QFontMetrics>
#include <QtDebug>
EffectInstanceListModel
::
EffectInstanceListModel
(
EffectUser
*
user
)
:
m_user
(
user
)
{
...
...
src/Gui/effectsengine/EffectInstanceWidget.cpp
View file @
bd0edcc0
...
...
@@ -34,8 +34,6 @@
#include <QLabel>
#include <QVBoxLayout>
#include <QtDebug>
EffectInstanceWidget
::
EffectInstanceWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
),
m_ui
(
new
Ui
::
EffectSettingWidget
)
...
...
src/Gui/effectsengine/EffectsListView.cpp
View file @
bd0edcc0
...
...
@@ -32,8 +32,6 @@
#include <QMimeData>
#include <QDrag>
#include <QtDebug>
EffectsListView
::
EffectsListView
(
QWidget
*
parent
)
:
QListView
(
parent
)
{
...
...
src/Gui/export/ShareOnInternet.cpp
View file @
bd0edcc0
...
...
@@ -23,14 +23,13 @@
#include "AbstractSharingService.h"
#include "SettingsManager.h"
#include "ShareOnInternet.h"
#include "VlmcDebug.h"
#include "YouTube/YouTubeService.h"
#include <QDesktopServices>
#include <QClipboard>
#include <QMessageBox>
#include <QDebug>
ShareOnInternet
::
ShareOnInternet
(
QWidget
*
parent
)
:
QDialog
(
parent
,
Qt
::
Sheet
|
Qt
::
Dialog
)
{
...
...
@@ -94,11 +93,11 @@ ShareOnInternet::publish()
switch
(
m_serviceProvider
)
{
case
VIMEO
:
/* TODO: Implement services for Vimeo */
q
Debug
()
<<
"[SHARE ON INTERNET]: VIMEO"
;
break
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: VIMEO"
;
break
;
case
YOUTUBE
:
default:
m_service
=
new
YouTubeService
(
m_devKey
,
getUsername
(),
getPassword
()
);
q
Debug
()
<<
"[SHARE ON INTERNET]: YOUTUBE"
;
break
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: YOUTUBE"
;
break
;
}
}
else
...
...
@@ -114,7 +113,7 @@ ShareOnInternet::publish()
void
ShareOnInternet
::
authFinished
()
{
q
Debug
()
<<
"[SHARE ON INTERNET]: AUTH FINISHED"
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: AUTH FINISHED"
;
/*On Finish, extract out the auth token and upload a test video */
disconnect
(
m_service
,
SIGNAL
(
authOver
()),
this
,
SLOT
(
authFinished
())
);
...
...
@@ -136,7 +135,7 @@ ShareOnInternet::authFinished()
this
,
SLOT
(
uploadProgress
(
qint64
,
qint64
))
);
disconnect
(
m_service
,
SIGNAL
(
error
(
QString
)),
this
,
SLOT
(
serviceError
(
QString
))
);
q
Debug
()
<<
"[SHARE ON INTERNET]: AUTH Failed"
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: AUTH Failed"
;
return
;
}
...
...
@@ -145,13 +144,13 @@ ShareOnInternet::authFinished()
m_ui
.
progressBar
->
setVisible
(
true
);
m_ui
.
mainPanel
->
setEnabled
(
false
);
q
Debug
()
<<
"[SHARE ON INTERNET]: UPLOAD STARTED"
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: UPLOAD STARTED"
;
}
void
ShareOnInternet
::
uploadFinished
(
QString
result
)
{
q
Debug
()
<<
"[SHARE ON INTERNET]: UPLOAD FINISHED"
;
vlmc
Debug
()
<<
"[SHARE ON INTERNET]: UPLOAD FINISHED"
;
/* Add code here to abort stuff */
m_ui
.
progressBar
->
setEnabled
(
false
);
...
...
src/Gui/import/ImportController.cpp
View file @
bd0edcc0
...
...
@@ -36,6 +36,7 @@
#include "PreviewWidget.h"
#include "TagWidget.h"
#include "Transcoder.h"
#include "VlmcDebug.h"
#include <QFileSystemModel>
#include <QHeaderView>
...
...
@@ -45,8 +46,6 @@
#include <QTime>
#include <QTimer>
#include <QtDebug>
ImportController
::
ImportController
(
QWidget
*
parent
)
:
QDialog
(
parent
),
m_ui
(
new
Ui
::
ImportController
),
...
...
@@ -152,7 +151,7 @@ ImportController::clipSelection( Clip* clip )
void
ImportController
::
importMedia
(
const
QString
&
filePath
)
{
q
Debug
()
<<
"Importing"
<<
filePath
;
vlmc
Debug
()
<<
"Importing"
<<
filePath
;
if
(
Library
::
getInstance
()
->
mediaAlreadyLoaded
(
filePath
)
==
true
||
m_temporaryMedias
->
mediaAlreadyLoaded
(
filePath
)
==
true
)
return
;
...
...
@@ -162,7 +161,7 @@ ImportController::importMedia( const QString &filePath )
media
->
computeMetadata
();
if
(
media
==
NULL
)
{
q
Critical
()
<<
"An error occurred while loading media:"
<<
filePath
;
vlmc
Critical
()
<<
"An error occurred while loading media:"
<<
filePath
;
return
;
}
Clip
*
clip
=
new
Clip
(
media
);
...
...
src/Gui/library/MediaLibrary.cpp
View file @
bd0edcc0
...
...
@@ -29,8 +29,8 @@
#include "MediaListView.h"
#include "StackViewController.h"
#include "ViewController.h"
#include "VlmcDebug.h"
#include <QDebug>
#include <QUrl>
#include <QMimeData>
...
...
@@ -184,7 +184,7 @@ MediaLibrary::dropEvent( QDropEvent *event )
event
->
accept
();
}
else
q
Critical
()
<<
"Clip already present in library or an error occurred while loading media:"
<<
fileName
;
vlmc
Critical
()
<<
"Clip already present in library or an error occurred while loading media:"
<<
fileName
;
}
event
->
accept
();
}
src/Gui/preview/PreviewRuler.cpp
View file @
bd0edcc0
...
...
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QDebug>
#include <QPainter>
#include <QPolygon>
#include <QBrush>
...
...
src/Gui/preview/PreviewWidget.cpp
View file @
bd0edcc0
...
...
@@ -29,7 +29,6 @@
#include "Clip.h"
#include <QMessageBox>
#include <QDebug>
PreviewWidget
::
PreviewWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
),
...
...
src/Gui/project/GuiProjectManager.cpp
View file @
bd0edcc0
...
...
@@ -33,8 +33,6 @@
#include <QMessageBox>
#include <QTimer>
#include <QtDebug>
GUIProjectManager
::
GUIProjectManager
()
{
connect
(
this
,
SIGNAL
(
projectClosed
()
),
Library
::
getInstance
(),
SLOT
(
clear
()
)
);
...
...
src/Gui/settings/KeyboardShortcutInput.cpp
View file @
bd0edcc0
...
...
@@ -23,7 +23,6 @@
#include <QKeyEvent>
#include <QKeySequence>
#include <QTimer>
#include <QtDebug>
#include "SettingsManager.h"
#include "KeyboardShortcutInput.h"
...
...
src/Gui/settings/LanguageWidget.cpp
View file @
bd0edcc0
...
...
@@ -24,12 +24,12 @@
#include "LanguageWidget.h"
#include "SettingsManager.h"
#include "SettingValue.h"
#include "VlmcDebug.h"
#include <QApplication>
#include <QComboBox>
#include <QDir>
#include <QTranslator>
#include <QtDebug>
#define TS_PREFIX "vlmc_"
...
...
@@ -47,7 +47,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) :
if
(
localePos
<
0
||
extPos
<
0
||
localePos
>
extPos
)
{
q
Warning
()
<<
"Invalid translation file:"
<<
tsFileName
;
vlmc
Warning
()
<<
"Invalid translation file:"
<<
tsFileName
;
continue
;
}
...
...
@@ -58,7 +58,7 @@ LanguageWidget::LanguageWidget( SettingValue *s, QWidget *parent /*= NULL*/ ) :
// Check if the country code is valid ISO 639
if
(
locale
.
language
()
==
QLocale
::
C
)
{
q
Warning
()
<<
"Invalid locale for file:"
<<
tsFileName
;
vlmc
Warning
()
<<
"Invalid locale for file:"
<<
tsFileName
;
continue
;
}
...
...
src/Gui/settings/PreferenceWidget.cpp
View file @
bd0edcc0
...
...
@@ -35,7 +35,6 @@
#include "StringWidget.h"
#include <QFormLayout>
#include <QtDebug>
#include <QWidget>
#include <QLabel>
#include <QHash>
...
...
src/Gui/settings/Settings.cpp
View file @
bd0edcc0
...
...
@@ -37,8 +37,6 @@
#include <QScrollArea>
#include <QStackedLayout>
#include <QtDebug>
Settings
::
Settings
(
SettingsManager
::
Type
type
,
QWidget
*
parent
)
:
QDialog
(
parent
),
m_type
(
type
)
...
...
src/Gui/timeline/AbstractGraphicsItem.cpp
View file @
bd0edcc0
...
...
@@ -29,8 +29,6 @@
#include <QGraphicsSceneEvent>
#include <QtDebug>
AbstractGraphicsItem
::
AbstractGraphicsItem
()
:
m_tracksView
(
NULL
),
m_oldTrack
(
NULL
),
...
...
src/Gui/timeline/AbstractGraphicsMediaItem.cpp
View file @
bd0edcc0
...
...
@@ -36,7 +36,6 @@
#include <QGraphicsSceneContextMenuEvent>
#include <QCoreApplication>
#include <QtDebug>
AbstractGraphicsMediaItem
::
AbstractGraphicsMediaItem
(
Clip
*
clip
)
:
m_muted
(
false
)
...
...
src/Gui/timeline/GraphicsCursorItem.cpp
View file @
bd0edcc0
...
...
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QtDebug>
#include <QGraphicsScene>
#include <QGraphicsItem>
#include <QGraphicsSceneMouseEvent>
...
...
src/Gui/timeline/GraphicsEffectItem.cpp
View file @
bd0edcc0
...
...
@@ -38,8 +38,6 @@
#include <QMenu>
#include <QPainter>
#include <QtDebug>
GraphicsEffectItem
::
GraphicsEffectItem
(
Effect
*
effect
)
:
m_effect
(
effect
),
m_effectHelper
(
NULL
),
...
...
src/Gui/timeline/GraphicsMovieItem.cpp
View file @
bd0edcc0
...
...
@@ -29,7 +29,6 @@
#include <QPainter>
#include <QLinearGradient>
#include <QDebug>
#include <QTime>
#include <QFontMetrics>
#include <QGraphicsSceneMouseEvent>
...
...
src/Gui/timeline/GraphicsTrack.cpp
View file @
bd0edcc0
...
...
@@ -25,8 +25,6 @@
#include "GraphicsTrack.h"
#include "MainWorkflow.h"
#include <QtDebug>
GraphicsTrack
::
GraphicsTrack
(
Workflow
::
TrackType
type
,
quint32
trackNumber
,
QGraphicsItem
*
parent
)
:
QGraphicsWidget
(
parent
),
...
...
src/Gui/timeline/Timeline.cpp
View file @
bd0edcc0
...
...
@@ -28,14 +28,13 @@
#include "TracksScene.h"
#include "TracksControls.h"
#include "TracksRuler.h"
#include "VlmcDebug.h"
#include "WorkflowRenderer.h"
#include <QHBoxLayout>
#include <QDomElement>
#include <QScrollBar>
#include <QtDebug>
Timeline
*
Timeline
::
m_instance
=
NULL
;
Timeline
::
Timeline
(
WorkflowRenderer
*
renderer
,
QWidget
*
parent
)
:
...
...
@@ -193,7 +192,7 @@ Timeline::load( const QDomElement &root )
QDomElement
project
=
root
.
firstChildElement
(
"timeline"
);
if
(
project
.
isNull
()
==
true
)
{
q
Critical
()
<<
"No timeline node in the project file"
;
vlmc
Critical
()
<<
"No timeline node in the project file"
;
return
;
}
...
...
@@ -225,7 +224,7 @@ Timeline::load( const QDomElement &root )
}
}
else
q
Warning
()
<<
"No such timeline item:"
<<
uuid
;
vlmc
Warning
()
<<
"No such timeline item:"
<<
uuid
;
elem
=
elem
.
nextSiblingElement
();
}
}
src/Gui/timeline/TracksView.cpp
View file @
bd0edcc0
...
...
@@ -37,9 +37,10 @@
//Ugly part {
#include "Timeline.h"
#include "TracksRuler.h"
//} this should be fixed, it br
oke
s the design
//} this should be fixed, it br
eak
s the design
#include "TrackWorkflow.h"
#include "UndoStack.h"
#include "VlmcDebug.h"
#include "WorkflowRenderer.h"
#include <QGraphicsLinearLayout>
...
...
@@ -50,8 +51,6 @@
#include <QWheelEvent>
#include <QMimeData>
#include <QtDebug>
TracksView
::
TracksView
(
QGraphicsScene
*
scene
,
MainWorkflow
*
mainWorkflow
,
WorkflowRenderer
*
renderer
,
QWidget
*
parent
)
:
QGraphicsView
(
scene
,
parent
),
...
...
@@ -367,7 +366,7 @@ TracksView::effectDragEnterEvent( QDragEnterEvent *event )
m_dragEffectItem
->
m_tracksView
=
this
;
}
else