Commit 3c009857 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Merge branch 'master' into chouquette_sound_workflow

parents e82a8149 7ea27bd3
#INPUT
HEADERS += ActionStack.h \
StackedAction.hpp
SOURCES += ActionStack.cpp
HEADERS += Commands.h
SOURCES += Commands.cpp
HEADERS += ProjectSettingsDefault.h \
SettingsManager.h \
VLMCSettingsDefault.h
SOURCES += ProjectSettingsDefault.cpp \
SettingsManager.cpp \
VLMCSettingsDefault.cpp
HEADERS += EffectsEngine.h \
GenericEffect.h \
GreenFilterEffect.h \
LightVideoFrame.h \
MixerEffect.h
SOURCES += EffectsEngine.cpp \
GenericEffect.cpp \
GreenFilterEffect.cpp \
LightVideoFrame.cpp \
MixerEffect.cpp
FORMS += ui/About.ui \
ui/ClipProperty.ui \
ui/FileBrowser.ui \
ui/Import.ui \
ui/LibraryWidget.ui \
ui/LoadPage.ui \
ui/MainWindow.ui \
ui/PreviewWidget.ui \
ui/TagWidget.ui \
ui/Timeline.ui \
ui/transcode.ui \
ui/WorkflowFileRendererDialog.ui
HEADERS += About.h \
AbstractGraphicsMediaItem.h \
ClickableLabel.h \
ClipProperty.h \
DockWidgetManager.h \
FileBrowser.h \
FileInfoListModel.h \
GraphicsAudioItem.h \
GraphicsCursorItem.h \
GraphicsMovieItem.h \
GraphicsTrack.hpp \
ImportMediaCellView.h \
ImportMediaListController.h \
LanguagePreferences.h \
LCDTimecode.h \
LibraryWidget.h \
ListViewMediaItem.h \
MainWindow.h \
MediaListWidget.h \
PreviewRuler.h \
PreviewWidget.h \
TagWidget.h \
Timeline.h \
TracksControls.h \
TracksRuler.h \
TracksScene.h \
TracksView.h \
UndoStack.h \
WorkflowFileRendererDialog.h
SOURCES += About.cpp \
AbstractGraphicsMediaItem.cpp \
ClickableLabel.cpp \
ClipProperty.cpp \
DockWidgetManager.cpp \
FileBrowser.cpp \
FileInfoListModel.cpp \
GraphicsAudioItem.cpp \
GraphicsCursorItem.cpp \
GraphicsMovieItem.cpp \
ImportMediaCellView.cpp \
ImportMediaListController.cpp \
LanguagePreferences.cpp \
LCDTimecode.cpp \
LibraryWidget.cpp \
ListViewMediaItem.cpp \
MainWindow.cpp \
MediaListWidget.cpp \
PreviewRuler.cpp \
PreviewWidget.cpp \
TagWidget.cpp \
Timeline.cpp \
TracksControls.cpp \
TracksRuler.cpp \
TracksScene.cpp \
TracksView.cpp \
UndoStack.cpp \
WorkflowFileRendererDialog.cpp
FORMS += ui/ImportController.ui
HEADERS += ImportController.h \
ImportModel.h
SOURCES += ImportController.cpp \
ImportModel.cpp
FORMS += ui/StackViewNavController.ui \
ui/MediaCellView.ui \
ui/StackViewNavController.ui
HEADERS += ListViewController.h \
MediaCellView.h \
MediaLibraryWidget.h \
MediaListViewController.h \
StackViewController.h \
StackViewNavController.h \
ViewController.h
SOURCES += ListViewController.cpp \
MediaCellView.cpp \
MediaLibraryWidget.cpp \
MediaListViewController.cpp \
StackViewController.cpp \
StackViewNavController.cpp
#Input
FORMS += ui/AudioProjectPreferences.ui \
ui/LanguagePreferences.ui \
ui/ProjectPreferences.ui \
ui/VLMCPreferences.ui \
ui/VideoProjectPreferences.ui
HEADERS += AudioProjectPreferences.h \
Panel.h \
PreferenceWidget.h \
ProjectPreferences.h \
Settings.h \
VLMCPreferences.h \
VideoProjectPreferences.h
SOURCES += AudioProjectPreferences.cpp \
Panel.cpp \
PreferenceWidget.cpp \
ProjectPreferences.cpp \
Settings.cpp \
VLMCPreferences.cpp \
VideoProjectPreferences.cpp
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>loadPage</class>
<widget class="QWidget" name="loadPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QPushButton" name="open_button">
<property name="text">
<string>Open Existing Project</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
FORMS += TrackControls.ui
HEADERS += TrackControls.h
SOURCES += TrackControls.cpp
HEADERS += CustomWizardPage.h \
LoadPage.h \
PageFactory.h \
ProjectWizard.h
SOURCES += CustomWizardPage.cpp \
LoadPage.cpp \
ProjectWizard.cpp
HEADERS += VLCException.h \
VLCInstance.h \
VLCMedia.h \
VLCMediaPlayer.h \
VLCpp.hpp
SOURCES += VLCException.cpp \
VLCInstance.cpp \
VLCMedia.cpp \
VLCMediaPlayer.cpp
HEADERS += Library.h
SOURCES += Library.cpp
HEADERS += Clip.h \
Media.h
SOURCES += Clip.cpp \
Media.cpp
HEADERS += MetaDataManager.h \
MetaDataWorker.h
SOURCES += MetaDataManager.cpp \
MetaDataWorker.cpp
#INPUT
HEADERS += ProjectManager.h
SOURCES += ProjectManager.cpp
HEADERS += ClipRenderer.h \
GenericRenderer.h \
WorkflowFileRenderer.h \
WorkflowRenderer.h
SOURCES += ClipRenderer.cpp \
WorkflowFileRenderer.cpp \
WorkflowRenderer.cpp
HEADERS += Pool.hpp \
QSingleton.hpp \
Singleton.hpp \
Toggleable.hpp \
WaitCondition.hpp
HEADERS += AudioClipWorkflow.h \
ClipWorkflow.h \
MainWorkflow.h \
TrackHandler.h \
TrackWorkflow.h \
VideoClipWorkflow.h
SOURCES += AudioClipWorkflow.cpp \
ClipWorkflow.cpp \
MainWorkflow.cpp \
TrackHandler.cpp \
TrackWorkflow.cpp \
VideoClipWorkflow.cpp
HEADERS += vlmc.h
SOURCES += main.cpp
include(src/Actions/actions.pri)
include(src/Commands/commands.pri)
include(src/Configuration/configuration.pri)
include(src/EffectsEngine/EffectsEngine.pri)
include(src/GUI/GUI.pri)
include(src/GUI/import/import.pri)
include(src/GUI/library/library.pri)
include(src/GUI/settings/settings.pri)
include(src/GUI/widgets/widgets.pri)
include(src/GUI/wizard/wizard.pri)
include(src/LibVLCpp/LibVLCpp.pri)
include(src/Library/Library.pri)
include(src/Media/Media.pri)
include(src/Metadata/Metadata.pri)
include(src/Project/projectManager.pri)
include(src/Renderer/Renderer.pri)
include(src/Tools/Tools.pri)
include(src/Workflow/Workflow.pri)
DEPENDPATH += src/LibVLCpp \
src/GUI \
src/GUI/import \
src/GUI/library \
src/GUI/settings \
src/GUI/widgets \
src/GUI/wizard \
src/Tools \
src/Renderer \
src/Metadata \
src/Commands \
src/Workflow \
src/Library \
src/Media \
src/Project \
src/EffectsEngine \
src/Configuration \
src/EffectsEngine \
src/Actions \
src
INCLUDEPATH += src/LibVLCpp \
src/GUI \
src/GUI/widgets \
src/GUI/library \
src/GUI/import \
src/GUI/settings \
src/GUI/wizard \
src/Tools \
src/Renderer \
src/Metadata \
src/Commands \
src/Workflow \
src/Library \
src/Media \
src/Project \
src/EffectsEngine \
src/Configuration \
src/EffectsEngine \
src/Actions \
src
......@@ -15,211 +15,15 @@ QT += gui \
network \
svg \
xml
SOURCES += src/main.cpp \
src/GUI/MainWindow.cpp \
src/GUI/LibraryWidget.cpp \
src/GUI/DockWidgetManager.cpp \
src/LibVLCpp/VLCException.cpp \
src/LibVLCpp/VLCInstance.cpp \
src/GUI/Timeline.cpp \
src/LibVLCpp/VLCMediaPlayer.cpp \
src/LibVLCpp/VLCMedia.cpp \
src/GUI/TracksView.cpp \
src/GUI/TracksScene.cpp \
src/Renderer/ClipRenderer.cpp \
src/GUI/TracksRuler.cpp \
src/GUI/LanguagePreferences.cpp \
src/GUI/ListViewMediaItem.cpp \
src/GUI/MediaListWidget.cpp \
src/Media/Clip.cpp \
src/GUI/About.cpp \
src/Metadata/MetaDataWorker.cpp \
src/Metadata/MetaDataManager.cpp \
src/Library/Library.cpp \
src/GUI/GraphicsMovieItem.cpp \
src/GUI/GraphicsAudioItem.cpp \
src/GUI/AbstractGraphicsMediaItem.cpp \
src/Media/Media.cpp \
src/GUI/FileBrowser.cpp \
src/GUI/GraphicsCursorItem.cpp \
src/Workflow/ClipWorkflow.cpp \
src/Workflow/TrackWorkflow.cpp \
src/Workflow/MainWorkflow.cpp \
src/GUI/PreviewWidget.cpp \
src/GUI/PreviewRuler.cpp \
src/Renderer/WorkflowRenderer.cpp \
src/Renderer/WorkflowFileRenderer.cpp \
src/GUI/UndoStack.cpp \
src/GUI/ClipProperty.cpp \
src/GUI/WorkflowFileRendererDialog.cpp \
src/GUI/Settings.cpp \
src/GUI/Panel.cpp \
src/GUI/PreferenceWidget.cpp \
src/GUI/ProjectPreferences.cpp \
src/Commands/Commands.cpp \
src/GUI/AudioProjectPreferences.cpp \
src/GUI/VLMCPreferences.cpp \
src/GUI/VideoProjectPreferences.cpp \
src/Project/ProjectManager.cpp \
src/Configuration/SettingsManager.cpp \
src/GUI/TagWidget.cpp \
src/GUI/Library/StackViewController.cpp \
src/GUI/Library/StackViewNavController.cpp \
src/GUI/Library/ListViewController.cpp \
src/GUI/Library/MediaCellView.cpp \
src/GUI/Library/MediaLibraryWidget.cpp \
src/GUI/Library/MediaListViewController.cpp \
src/GUI/ImportMediaListController.cpp \
src/GUI/ImportMediaCellView.cpp \
src/GUI/ClickableLabel.cpp \
src/GUI/Import/ImportModel.cpp \
src/GUI/Import/ImportController.cpp \
src/Workflow/VideoClipWorkflow.cpp \
src/Workflow/TrackHandler.cpp \
src/Workflow/AudioClipWorkflow.cpp \
src/EffectsEngine/EffectsEngine.cpp \
src/EffectsEngine/LightVideoFrame.cpp \
src/EffectsEngine/GenericEffect.cpp \
src/EffectsEngine/GreenFilterEffect.cpp \
src/EffectsEngine/MixerEffect.cpp \
src/GUI/LCDTimecode.cpp \
src/Configuration/VLMCSettingsDefault.cpp \
src/Configuration/ProjectSettingsDefault.cpp \
src/GUI/TracksControls.cpp \
src/GUI/widgets/TrackControls.cpp \
src/GUI/wizard/ProjectWizard.cpp \
src/GUI/wizard/CustomWizardPage.cpp \
src/GUI/wizard/LoadPage.cpp \
src/Actions/ActionStack.cpp
HEADERS += src/GUI/MainWindow.h \
src/GUI/DockWidgetManager.h \
src/GUI/LibraryWidget.h \
src/LibVLCpp/VLCpp.hpp \
src/LibVLCpp/VLCException.h \
src/LibVLCpp/VLCInstance.h \
src/GUI/Timeline.h \
src/LibVLCpp/VLCMediaPlayer.h \
src/LibVLCpp/VLCMedia.h \
src/GUI/TracksView.h \
src/GUI/TracksScene.h \
src/Renderer/ClipRenderer.h \
src/GUI/TracksRuler.h \
src/GUI/LanguagePreferences.h \
src/GUI/ListViewMediaItem.h \
src/Media/Clip.h \
src/GUI/MediaListWidget.h \
src/GUI/About.h \
src/Metadata/MetaDataWorker.h \
src/Metadata/MetaDataManager.h \
src/Tools/Singleton.hpp \
src/Library/Library.h \
src/GUI/AbstractGraphicsMediaItem.h \
src/GUI/GraphicsMovieItem.h \
src/GUI/GraphicsAudioItem.h \
src/Media/Media.h \
src/GUI/FileBrowser.h \
src/GUI/GraphicsCursorItem.h \
src/Workflow/ClipWorkflow.h \
src/Workflow/TrackWorkflow.h \
src/Workflow/MainWorkflow.h \
src/GUI/PreviewWidget.h \
src/GUI/PreviewRuler.h \
src/Renderer/WorkflowRenderer.h \
src/Renderer/GenericRenderer.h \
src/Tools/Toggleable.hpp \
src/Renderer/WorkflowFileRenderer.h \
src/vlmc.h \
src/Tools/Pool.hpp \
src/GUI/UndoStack.h \
src/Tools/WaitCondition.hpp \
src/Tools/QSingleton.hpp \
src/GUI/ClipProperty.h \
src/GUI/WorkflowFileRendererDialog.h \
src/GUI/Settings.h \
src/GUI/Panel.h \
src/GUI/GraphicsTrack.hpp \
src/Commands/Commands.h \
src/GUI/VLMCPreferences.h \
src/GUI/AudioProjectPreferences.h \
src/GUI/VideoProjectPreferences.h \
src/Project/ProjectManager.h \
src/Configuration/SettingsManager.h \
src/GUI/TagWidget.h \
src/GUI/Library/StackViewController.h \
src/GUI/Library/StackViewNavController.h \
src/GUI/Library/ListViewController.h \
src/GUI/Library/MediaCellView.h \
src/GUI/Library/MediaLibraryWidget.h \
src/GUI/Library/MediaListViewController.h \
src/GUI/Library/ViewController.h \
src/GUI/ImportMediaListController.h \
src/GUI/ImportMediaCellView.h \
src/GUI/ClickableLabel.h \
src/GUI/Import/ImportModel.h \
src/GUI/Import/ImportController.h \
src/Workflow/VideoClipWorkflow.h \
src/Workflow/TrackHandler.h \
src/Workflow/AudioClipWorkflow.h \
src/EffectsEngine/EffectsEngine.h \
src/EffectsEngine/InSlot.hpp \
src/EffectsEngine/OutSlot.hpp \
src/EffectsEngine/LightVideoFrame.h \
src/EffectsEngine/GenericEffect.h \
src/EffectsEngine/GreenFilterEffect.h \
src/EffectsEngine/MixerEffect.h \
src/GUI/LCDTimecode.h \
src/Configuration/VLMCSettingsDefault.h \
src/Configuration/ProjectSettingsDefault.h \
src/GUI/PreferenceWidget.h \
src/GUI/TracksControls.h \
src/GUI/widgets/TrackControls.h \
src/GUI/wizard/ProjectWizard.h \
src/GUI/wizard/PageFactory.h \
src/GUI/wizard/CustomWizardPage.h \
src/GUI/wizard/LoadPage.h \
src/Actions/StackedAction.hpp \
src/Actions/ActionStack.h
FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/PreviewWidget.ui \
src/GUI/ui/LanguagePreferences.ui \
src/GUI/ui/Timeline.ui \
src/GUI/ui/LibraryWidget.ui \
src/GUI/ui/About.ui \
src/GUI/ui/FileBrowser.ui \
src/GUI/ui/WorkflowFileRendererDialog.ui \
src/GUI/ui/ClipProperty.ui \
src/GUI/ui/ProjectPreferences.ui \
src/GUI/ui/VLMCPreferences.ui \
src/GUI/ui/VideoProjectPreferences.ui \
src/GUI/ui/AudioProjectPreferences.ui \
src/GUI/ui/TagWidget.ui \
src/GUI/Library/ui/StackViewNavController.ui \
src/GUI/Library/ui/MediaCellView.ui \
src/GUI/Import/ui/ImportController.ui \
src/GUI/widgets/TrackControls.ui
TRANSLATIONS = ts/vlmc_es.ts \
ts/vlmc_fr.ts \
ts/vlmc_sv.ts
RESOURCES += ressources.qrc
INCLUDEPATH += src/LibVLCpp \
src/GUI \
src/GUI/widgets \
src/GUI/Library \
src/GUI/Import \
src/GUI/wizard \
src/Tools \
src/Renderer \
src/Metadata \
src/Commands \
src/Workflow \
src/Library \
src/Media \
src/Project \
src/EffectsEngine \
src/Configuration \
src/EffectsEngine \
src/Actions \
src
DEPENDPATH += src
INCLUDEPATH += src
# Pri files include
include(src/src.pri)
# QMAKE_CFLAGS+=-pg
# QMAKE_CXXFLAGS+=-pg
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment