Commit 667ced01 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

Setting default output fps to 30 to match ugly define.

This is temporary and should be banned in a few days...
parent d1e6facc
...@@ -45,7 +45,7 @@ void ProjectSettingsDefault::loadAudioDefaults( const QString& part ) ...@@ -45,7 +45,7 @@ void ProjectSettingsDefault::loadAudioDefaults( const QString& part )
void ProjectSettingsDefault::loadVideoDefaults( const QString& part ) void ProjectSettingsDefault::loadVideoDefaults( const QString& part )
{ {
SettingsManager* settingsMan = SettingsManager::getInstance(); SettingsManager* settingsMan = SettingsManager::getInstance();
QVariant defaultProjectFPS = 25; QVariant defaultProjectFPS = 30;
QVariant defaultProjectHeight = 800; QVariant defaultProjectHeight = 800;
QVariant defaultProjectWidth = 600; QVariant defaultProjectWidth = 600;
......
...@@ -37,8 +37,8 @@ void VLMCSettingsDefault::load( const QString& part ) ...@@ -37,8 +37,8 @@ void VLMCSettingsDefault::load( const QString& part )
void VLMCSettingsDefault::loadVLMCDefaults( const QString& part ) void VLMCSettingsDefault::loadVLMCDefaults( const QString& part )
{ {
SettingsManager* settingsMan = SettingsManager::getInstance(); SettingsManager* settingsMan = SettingsManager::getInstance();
QVariant defaultOutputPFS = "25"; QVariant defaultOutputPFS = "30";
QVariant defaultPreviewFPS = "25"; QVariant defaultPreviewFPS = "30";
QVariant defaultTrackNb = "64"; QVariant defaultTrackNb = "64";
settingsMan->setValue( part, settingsMan->setValue( part,
......
...@@ -207,6 +207,7 @@ void MainWorkflow::moveClip( const QUuid& clipUuid, unsigned int oldTr ...@@ -207,6 +207,7 @@ void MainWorkflow::moveClip( const QUuid& clipUuid, unsigned int oldTr
{ {
m_tracks[trackType]->moveClip( clipUuid, oldTrack, newTrack, startingFrame ); m_tracks[trackType]->moveClip( clipUuid, oldTrack, newTrack, startingFrame );
computeLength(); computeLength();
if ( undoRedoCommand == true ) if ( undoRedoCommand == true )
{ {
emit clipMoved( clipUuid, newTrack, startingFrame, trackType ); emit clipMoved( clipUuid, newTrack, startingFrame, trackType );
......
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