implemented default sequence settings
This commit is contained in:
+6
-13
@@ -65,13 +65,6 @@ extern "C" {
|
||||
#include "global/debug.h"
|
||||
#include "ui/menu.h"
|
||||
|
||||
// TODO make these configurable
|
||||
const int kDefaultSequenceWidth = 1920;
|
||||
const int kDefaultSequenceHeight = 1080;
|
||||
const double kDefaultSequenceFrameRate = 29.97;
|
||||
const int kDefaultSequenceFrequency = 48000;
|
||||
const int kDefaultSequenceChannelLayout = 3;
|
||||
|
||||
#define MAXIMUM_RECENT_PROJECTS 10 // FIXME: should be configurable
|
||||
|
||||
QString autorecovery_filename;
|
||||
@@ -261,12 +254,12 @@ SequencePtr create_sequence_from_media(QVector<olive::timeline::MediaImportData>
|
||||
|
||||
s->name = panel_project->get_next_sequence_name();
|
||||
|
||||
// shitty hardcoded default values
|
||||
s->width = kDefaultSequenceWidth;
|
||||
s->height = kDefaultSequenceHeight;
|
||||
s->frame_rate = kDefaultSequenceFrameRate;
|
||||
s->audio_frequency = kDefaultSequenceFrequency;
|
||||
s->audio_layout = kDefaultSequenceChannelLayout;
|
||||
// Retrieve default Sequence settings from Config
|
||||
s->width = olive::CurrentConfig.default_sequence_width;
|
||||
s->height = olive::CurrentConfig.default_sequence_height;
|
||||
s->frame_rate = olive::CurrentConfig.default_sequence_framerate;
|
||||
s->audio_frequency = olive::CurrentConfig.default_sequence_audio_frequency;
|
||||
s->audio_layout = olive::CurrentConfig.default_sequence_audio_channel_layout;
|
||||
|
||||
bool got_video_values = false;
|
||||
bool got_audio_values = false;
|
||||
|
||||
+4
-7
@@ -802,8 +802,7 @@ void Viewer::set_media(Media* m) {
|
||||
new_sequence->workarea_out = footage->out;
|
||||
}
|
||||
|
||||
// FIXME: Move this magic number to Config
|
||||
new_sequence->frame_rate = 30;
|
||||
new_sequence->frame_rate = olive::CurrentConfig.default_sequence_framerate;
|
||||
|
||||
if (footage->video_tracks.size() > 0) {
|
||||
const FootageStream& video_stream = footage->video_tracks.at(0);
|
||||
@@ -826,9 +825,8 @@ void Viewer::set_media(Media* m) {
|
||||
c->refresh();
|
||||
new_sequence->clips.append(c);
|
||||
} else {
|
||||
// FIXME: Move this magic number to Config
|
||||
new_sequence->width = 1920;
|
||||
new_sequence->height = 1080;
|
||||
new_sequence->width = olive::CurrentConfig.default_sequence_width;
|
||||
new_sequence->height = olive::CurrentConfig.default_sequence_height;
|
||||
}
|
||||
|
||||
if (footage->audio_tracks.size() > 0) {
|
||||
@@ -851,8 +849,7 @@ void Viewer::set_media(Media* m) {
|
||||
viewer_widget->frame_update();
|
||||
}
|
||||
} else {
|
||||
// FIXME: Move this magic number to Config
|
||||
new_sequence->audio_frequency = 48000;
|
||||
new_sequence->audio_frequency = olive::CurrentConfig.default_sequence_audio_frequency;
|
||||
}
|
||||
|
||||
new_sequence->audio_layout = AV_CH_LAYOUT_STEREO;
|
||||
|
||||
Reference in New Issue
Block a user