Commit 9501a130 authored by Vincent Carrubba's avatar Vincent Carrubba

disabling the effects engine thru the effect menu is now possible

parent 5d6b048a
......@@ -390,3 +390,15 @@ void MainWindow::toolButtonClicked( int id )
{
emit toolChanged( (ToolButtons)id );
}
void MainWindow::on_actionBypass_effects_engine_toggled(bool toggled)
{
EffectsEngine* ee;
ee = MainWorkflow::getInstance()->getEffectsEngine();
if (toggled)
ee->enable();
else
ee->disable();
return ;
}
......@@ -39,6 +39,8 @@
#include "PreviewWidget.h"
#include "ListViewMediaItem.h"
#include "Settings.h"
#include "EffectsEngine.h"
#include "MainWorkflow.h"
class MainWindow : public QMainWindow
{
......@@ -76,6 +78,7 @@ private:
Settings* m_projectPreferences;
private slots:
void on_actionBypass_effects_engine_toggled(bool );
void on_actionFullscreen_triggered( bool checked );
void on_actionQuit_triggered();
void on_actionAbout_triggered();
......
......@@ -27,7 +27,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>21</height>
<height>26</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
......@@ -54,11 +54,12 @@
</widget>
<widget class="QMenu" name="menuEffets">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="title">
<string>Effects</string>
</property>
<addaction name="actionBypass_effects_engine"/>
</widget>
<widget class="QMenu" name="menuTools">
<property name="title">
......@@ -177,6 +178,17 @@
<string>Save</string>
</property>
</action>
<action name="actionBypass_effects_engine">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Enable effects engine</string>
</property>
</action>
</widget>
<resources>
<include location="../../../ressources.qrc"/>
......
......@@ -57,9 +57,6 @@ MainWorkflow::MainWorkflow( int trackCount ) :
m_synchroneRenderWaitCondition = new QWaitCondition;
m_synchroneRenderWaitConditionMutex = new QMutex;
m_effectEngine = new EffectsEngine;
m_effectEngine->disable();
m_nbTracksToRenderMutex = new QMutex;
}
......@@ -81,6 +78,11 @@ MainWorkflow::~MainWorkflow()
delete blackOutput;
}
EffectsEngine* MainWorkflow::getEffectsEngine(void)
{
return ( m_effectEngine );
}
void MainWorkflow::addClip( Clip* clip, unsigned int trackId, qint64 start )
{
Q_ASSERT_X( trackId < m_trackCount, "MainWorkflow::addClip",
......
......@@ -43,6 +43,7 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
MainWorkflow( int trackCount );
~MainWorkflow();
EffectsEngine* getEffectsEngine( void );
void addClip( Clip* clip, unsigned int trackId, qint64 start );
void startRender();
void getOutput();
......
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