Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Remove some debug, fix black track on project opening, don't try to draw audio thumbs when disabled

parent 0e90a4b9
......@@ -105,7 +105,6 @@ QVector<QPair<QString, QString>> ProfileRepository::getAllProfiles() const
std::unique_ptr<ProfileModel> &ProfileRepository::getProfile(const QString &path)
{
QReadLocker locker(&m_mutex);
qDebug() << "// GET PROFILE: " << path;
if (m_profiles.count(path) == 0) {
qCWarning(KDENLIVE_LOG) << "//// WARNING: profile not found: " << path << ". Returning default profile instead.";
QString default_profile = KdenliveSettings::default_profile();
......
......@@ -136,9 +136,10 @@ bool constructTimelineFromMelt(const std::shared_ptr<TimelineItemModel> &timelin
qDebug() << "Inserted composition in track " << t->get_b_track() << ", position" << t->get_in()<<"/"<< t->get_out();
}
}
// build internal track compositing
timeline->buildTrackCompositing();
timeline->updateDuration();
if (!ok) {
// TODO log error
......
......@@ -68,6 +68,7 @@ TimelineModel::TimelineModel(Mlt::Profile *profile, std::weak_ptr<DocUndoStack>
m_blackClip->set("mlt_type", "producer");
m_blackClip->set("aspect_ratio", 1);
m_blackClip->set("set.test_audio", 0);
m_blackClip->set("length", INT_MAX);
m_blackClip->set_in_and_out(0, 10);
m_tractor->insert_track(*m_blackClip, 0);
......
......@@ -123,9 +123,11 @@ Rectangle {
onClipDurationChanged: {
width = clipDuration * timeScale;
}
onModelStartChanged: {
x = modelStart * timeScale;
}
onReloadThumbChanged: {
if (mltService === 'color') {
var newColor = getColor()
......@@ -376,8 +378,7 @@ Rectangle {
TimelineWaveform {
width: Math.min(waveform.innerWidth, waveform.maxWidth)
height: waveform.height
showItem: (index * waveform.maxWidth) < waveform.scrollEnd && (index * waveform.maxWidth + width) > waveform.scrollStart
fillColor: 'red'
showItem: visible && (index * waveform.maxWidth) < waveform.scrollEnd && (index * waveform.maxWidth + width) > waveform.scrollStart
format: timeline.audioThumbFormat
property int channels: 2
inPoint: Math.round((clipRoot.inPoint + index * waveform.maxWidth / timeScale) * speed) * channels
......@@ -770,7 +771,7 @@ Rectangle {
onExited: parent.opacity = 0
}
}
/*MenuItem {
id: mergeItem
text: i18n('Merge with next clip')
......
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