oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed gcc compile issues

Browse Source
This commit is contained in:
itsmattkc
2020-01-19 20:39:48 +11:00
parent 1101b58ee8
commit 4697b98980
30 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/export/exportaudiotab.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
channel_layout_combobox_ = new QComboBox();
channel_layouts_ = Core::SupportedChannelLayouts();
foreach (const uint64_t& layout, channel_layouts_) {
channel_layout_combobox_->addItem(Core::ChannelLayoutToString(layout), layout);
channel_layout_combobox_->addItem(Core::ChannelLayoutToString(layout), QVariant::fromValue(layout));
}
layout->addWidget(channel_layout_combobox_, row, 1);
app/dialog/preferences/tabs/preferencesgeneraltab.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ void PreferencesGeneralTab::Accept()
Config::Current()["DefaultSequenceHeight"] = default_sequence_.video_params().height();;
Config::Current()["DefaultSequenceFrameRate"] = QVariant::fromValue(default_sequence_.video_params().time_base());
Config::Current()["DefaultSequenceAudioFrequency"] = default_sequence_.audio_params().sample_rate();
Config::Current()["DefaultSequenceAudioLayout"] = default_sequence_.audio_params().channel_layout();
Config::Current()["DefaultSequenceAudioLayout"] = QVariant::fromValue(default_sequence_.audio_params().channel_layout());
Config::Current()["Autoscroll"] = autoscroll_method_->currentData();
}
app/dialog/sequence/sequence.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) :
// Set up available channel layouts
QList<uint64_t> channel_layouts = Core::SupportedChannelLayouts();
foreach (const uint64_t& layout, channel_layouts) {
audio_channels_field_->addItem(Core::ChannelLayoutToString(layout), layout);
audio_channels_field_->addItem(Core::ChannelLayoutToString(layout), QVariant::fromValue(layout));
}
// Set values based on input sequence