connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
- connect(m_trackview, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotTransitionItemSelected(Transition*)));
+ connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool)));
slotChangeZoom(m_doc->zoom());
}
}
int TrackView::tracksNumber() const {
- return m_projectTracks;
+ return m_projectTracks - 1;
}
int TrackView::inPoint() const {
m_ruler->setZone(p);
}
-void TrackView::slotTransitionItemSelected(Transition *t) {
- emit transitionItemSelected(t);
+void TrackView::slotTransitionItemSelected(Transition *t, bool update) {
+ emit transitionItemSelected(t, update);
}
void TrackView::setDuration(int dur) {
int cursorPos = 0;
m_documentErrors = QString();
// kDebug() << "//// DOCUMENT: " << doc.toString();
- QDomNode props = doc.elementsByTagName("properties").item(0);
+ /*QDomNode props = doc.elementsByTagName("properties").item(0);
if (!props.isNull()) {
cursorPos = props.toElement().attribute("timeline_position").toInt();
- }
+ }*/
// parse project tracks
QDomNodeList tracks = doc.elementsByTagName("track");
int trackduration = 0;
QDomElement e;
QDomElement p;
- bool videotrack;
int pos = m_projectTracks - 1;
p = playlists.item(j).toElement();
if (p.attribute("id") == playlist_name) break;
}
- videotrack = (e.attribute("hide") != "video");
- trackduration = slotAddProjectTrack(pos, p, videotrack);
+ if (e.attribute("hide") == "video") {
+ m_doc->switchTrackVideo(i - 1, true);
+ } else if (e.attribute("hide") == "audio") {
+ m_doc->switchTrackAudio(i - 1, true);
+ } else if (e.attribute("hide") == "both") {
+ m_doc->switchTrackVideo(i - 1, true);
+ m_doc->switchTrackAudio(i - 1, true);
+ }
+ trackduration = slotAddProjectTrack(pos, p);
pos--;
//kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
if (trackduration > duration) duration = trackduration;
int a_track = 0;
int b_track = 0;
bool isAutomatic = false;
+ bool forceTrack = false;
QString mlt_geometry;
QString mlt_service;
for (int k = 0; k < transitionparams.count(); k++) {
//kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)";
//break;
} else if (paramName == "a_track") a_track = p.text().toInt();
- else if (paramName == "b_track") b_track = m_projectTracks - 1 - p.text().toInt();
+ else if (paramName == "b_track") b_track = p.text().toInt();
else if (paramName == "mlt_service") mlt_service = p.text();
else if (paramName == "geometry") mlt_geometry = p.text();
- else if (paramName == "automatic" && p.text() == "1") isAutomatic = true;;
+ else if (paramName == "automatic" && p.text() == "1") isAutomatic = true;
+ else if (paramName == "force_track" && p.text() == "1") forceTrack = true;
}
}
if (transitionAdd || mlt_service != "mix") {
kDebug() << "/////// TRANSITION XML: "<< doc.toString();*/
transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps());
- transitionInfo.endPos = GenTime(e.attribute("out").toInt(), m_doc->fps());
- transitionInfo.track = b_track;
+ transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps());
+ transitionInfo.track = m_projectTracks - 1 - b_track;
//kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks;
Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic);
+ if (forceTrack) tr->setForcedTrack(true, a_track);
m_scene->addItem(tr);
}
}
}
void TrackView::slotRebuildTrackHeaders() {
- QList <TrackInfo> list = m_trackview->tracksList();
+ QList <TrackInfo> list = m_doc->tracksList();
QList<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
for (int i = 0; i < widgets.count(); i++)
delete widgets.at(i);
HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this);
connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int)));
- /*
+
//TODO: re-enable when add / remove track is implemented
- connect(header, SIGNAL(deleteTrack(int)), m_trackview, SLOT(slotDeleteTrack(int)));
- connect(header, SIGNAL(insertTrack(int)), m_trackview, SLOT(slotInsertTrack(int)));*/
+ connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
+ connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
m_headersLayout->addWidget(header);
}
view->headers_container->adjustSize();
}
-int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) {
- TrackInfo info;
-
- if (videotrack) {
- info.type = VIDEOTRACK;
- info.isMute = false;
- info.isBlind = false;
- } else {
- info.type = AUDIOTRACK;
- info.isMute = false;
- info.isBlind = false;
- }
-
- m_trackview->addTrack(info);
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
int trackTop = KdenliveSettings::trackheight() * ix;
// parse track
int position = 0;