Commit 5c895249 authored by Clement CHAVANCE's avatar Clement CHAVANCE
Browse files

Vlmc compile with the change made for the preferences window

parent 9faeaa35
......@@ -36,16 +36,13 @@
#include "About.h"
#include "Transcode.h"
#include "FileBrowser.h"
<<<<<<< HEAD:src/GUI/MainWindow.cpp
#include "WorkflowRenderer.h"
#include "ClipRenderer.h"
#include "UndoStack.h"
#include "ClipProperty.h"
=======
#include "PreviewWidget.h"
#include "PreferenceWidget.h"
#include "ProjectPreferences.h"
>>>>>>> kinder_preferences:src/gui/MainWindow.cpp
MainWindow::MainWindow( QWidget *parent ) :
QMainWindow( parent ), m_renderer( NULL )
......
......@@ -33,7 +33,7 @@ static bool catchVLCException( libvlc_exception_t *ex )
{
if ( libvlc_exception_raised( ex ) )
{
qDebug() << libvlc_errmsg();
qDebug() << libvlc_exception_get_message( ex );
libvlc_exception_clear( ex );
return (true);
}
......
uuuu/*****************************************************************************
/*****************************************************************************
* VLCException.cpp: Binding for libvlc_exception
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
......
......@@ -50,10 +50,10 @@ SOURCES += src/main.cpp \
src/Metadata/MetaDataManager.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/GUI/Settings.cpp \
src/GUI/Panel.cpp \
src/GUI/PreferenceWidget.cpp \
src/GUI/ProjectPreferences.cpp
HEADERS += src/GUI/MainWindow.h \
src/GUI/DockWidgetManager.h \
src/GUI/LibraryWidget.h \
......@@ -102,7 +102,9 @@ HEADERS += src/GUI/MainWindow.h \
src/Commands/Commands.hpp \
src/Tools/QSingleton.hpp \
src/GUI/ClipProperty.h \
src/GUI/WorkflowFileRendererDialog.h
src/GUI/WorkflowFileRendererDialog.h \
src/GUI/Settings.h \
src/GUI/Panel.h
FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/PreviewWidget.ui \
src/GUI/ui/LanguagePreferences.ui \
......@@ -113,7 +115,7 @@ FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/FileBrowser.ui \
src/GUI/ui/WorkflowFileRendererDialog.ui \
src/GUI/ui/ClipProperty.ui \
src/gui/ui/ProjectPreferences.ui
src/GUI/ui/ProjectPreferences.ui
TRANSLATIONS = ts/vlmc_es.ts \
ts/vlmc_fr.ts \
ts/vlmc_sv.ts
......
Supports Markdown
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