Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) :
QObject(parent),
- m_isBlocked(true),
+ m_isBlocked(0),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
Render::~Render()
{
+ m_isBlocked = 1;
closeMlt();
}
}
QString audioDriver = KdenliveSettings::audiodrivername();
+ if (audioDriver.isEmpty())
+ audioDriver = KdenliveSettings::autoaudiodrivername();
if (!audioDriver.isEmpty()) {
tmp = decodedString(audioDriver);
m_mltConsumer->set("audio_driver", tmp);
{
if (!m_mltProducer)
return;
- m_isBlocked = false;
+ m_isBlocked = 0;
m_mltProducer->seek((int)(time.frames(m_fps)));
refresh();
}
//kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
if (m_mltConsumer == NULL) {
- kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER";
+ kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER";
m_isBlocked = false;
return;
}
}*/
m_fps = m_mltProducer->get_fps();
- kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
- connectPlaylist();
- fillSlowMotionProducers();
if (position != 0) {
- //TODO: seek to correct place after opening project.
- // Needs to be done from another place since it crashes here.
+ // Seek to correct place after opening project.
m_mltProducer->seek(position);
}
+
+ kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+ connectPlaylist();
+ fillSlowMotionProducers();
+
m_isBlocked = false;
blockSignals(false);
emit refreshDocumentProducers();
void Render::askForRefresh()
{
// Use a Timer so that we don't refresh too much
- m_refreshTimer->start(200);
+ m_refreshTimer->start(300);
}
void Render::doRefresh()
}
}
+void Render::setDropFrames(bool show)
+{
+ if (m_mltConsumer) {
+ int dropFrames = 1;
+ if (show == false) dropFrames = 0;
+ m_mltConsumer->stop();
+ m_mltConsumer->set("play.real_time", dropFrames);
+ m_mltConsumer->start();
+ }
+}
+
double Render::playSpeed()
{
if (m_mltProducer) return m_mltProducer->get_speed();
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
+ if (info.track > tractor.count() - 1) {
+ kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25);
+ return;
+ }
mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
if (trackPlaylist.is_blank(i)) blk = "(blank)";
kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
if (trackPlaylist.is_blank(clipIndex)) {
- kDebug() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << position.frames(25);
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
return false;
}
m_isBlocked = true;
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
/*if (QString(clip.parent().get("transparency")).toInt() == 1)
if (trackPlaylist.is_blank(i)) blk = "(blank)";
kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
+ mlt_service_unlock(service.get_service());
if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength();
m_isBlocked = false;
return true;
int clipIndex = trackPlaylist.get_clip_index_at(startPos);
int clipLength = trackPlaylist.clip_length(clipIndex);
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- if (!clip.is_valid() || clip.is_blank()) {
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL) {
+ return -1;
+ }
+ if (!clip->is_valid() || clip->is_blank()) {
// invalid clip
+ delete clip;
return -1;
}
- Mlt::Producer clipparent = clip.parent();
+ Mlt::Producer clipparent = clip->parent();
if (!clipparent.is_valid() || clipparent.is_blank()) {
// invalid clip
+ delete clip;
return -1;
}
+ delete clip;
QString serv = clipparent.get("mlt_service");
QString id = clipparent.get("id");
//kDebug() << "CLIP SERVICE: " << serv;
bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
{
m_isBlocked = true;
-
Mlt::Service service(m_mltProducer->parent().get_service());
-
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
m_isBlocked = false;
return false;
}
+ mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
//kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
int previousStart = clip->get_in();
int newDuration = (int) clipDuration.frames(m_fps) - 1;
- int diff = newDuration - trackPlaylist.clip_length(clipIndex) - 1;
+ int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
if (newDuration > clip->get_length()) {
clip->parent().set("length", newDuration + 1);
clip->set("length", newDuration + 1);
}
+ if (newDuration > clip->get_out()) {
+ clip->parent().set_in_and_out(0, newDuration + 1);
+ clip->set_in_and_out(0, newDuration + 1);
+ }
+ delete clip;
trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
trackPlaylist.consolidate_blanks(0);
// skip to next clip
}
}
} else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
-
trackPlaylist.consolidate_blanks(0);
-
+ mlt_service_unlock(service.get_service());
if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength();
/*if (QString(clip->parent().get("transparency")).toInt() == 1) {
return false;
}
int previousStart = clip->get_in();
+ delete clip;
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
return false;
}
int previousStart = clip->get_in();
+ delete clip;
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
m_isBlocked = true;
kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
return;
}
kDebug() << "NEW PROD ID: " << prod->get("id");
- m_mltConsumer->set("refresh", 0);
+ m_isBlocked++;
kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track;
mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
if (clipProducer.is_blank()) {
kDebug() << "// ERROR UPDATING CLIP PROD";
mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ m_isBlocked--;
return;
}
Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
trackPlaylist.insert_at(pos, clip, 1);
mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ m_isBlocked--;
}
bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod)
{
- m_isBlocked = true;
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(startTrack));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1);
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
} else {
trackPlaylist.consolidate_blanks(0);
Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
if (!destTrackPlaylist.is_blank_at(moveEnd)) {
// error, destination is not empty
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
} else {
Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
// error, destination is not empty
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
}
trackPlaylist.consolidate_blanks(0);
else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
}
}
-
+ mlt_service_unlock(service.get_service());
if (checkLength) mltCheckLength();
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ //askForRefresh();
+ //m_mltConsumer->set("refresh", 1);
return true;
}
int new_out = (int)newOut.frames(m_fps) - 1;
if (new_in >= new_out) return false;
- Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(service);
+ mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked++;
+ mlt_service_lock(serv);
+ //m_mltConsumer->set("refresh", 0);
- mlt_service_lock(service.get_service());
- m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
- mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString mlt_type = mlt_properties_get(properties, "mlt_type");
if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
mlt_transition_set_in_and_out(tr, new_in, new_out);
if (newTrack - startTrack != 0) {
- kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack;
+ //kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack;
mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
mlt_properties_set_int(properties, "a_track", newTransitionTrack);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
- mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
return true;
}
void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
{
- // kDebug() << "update transition" << tag << " at pos " << in.frames(25);
if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
else {
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
{
- m_isBlocked = true;
- Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(service);
-
- //m_mltConsumer->set("refresh", 0);
mlt_service serv = m_mltProducer->parent().get_service();
+ mlt_service_lock(serv);
+ m_isBlocked++;
+
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/)
{
- Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked++;
+ mlt_service_lock(serv);
+
+ Mlt::Service service(serv);
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
//if (do_refresh) m_mltConsumer->set("refresh", 0);
- mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString resource = mlt_properties_get(properties, "mlt_service");
const int old_pos = (int)((in + out).frames(m_fps) / 2);
+ kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25);
while (mlt_type == "transition") {
mlt_transition tr = (mlt_transition) nextservice;
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- //if (do_refresh) m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
+ m_isBlocked--;
mlt_service_unlock(service.get_service());
m_mltConsumer->set("refresh", 1);
}
QString key;
if (xml.attribute("automatic") == "1") transition->set("automatic", 1);
//kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count();
+ if (xml.hasAttribute("id"))
+ transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
for (it = args.begin(); it != args.end(); ++it) {
key = it.key();
char *value = decodedString(it.value());
if (it.value().isEmpty() == false) transition->set(name, value);
//kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
- //filter->set("kdenlive_id", id);
delete[] name;
delete[] value;
}
void Render::mltInsertTrack(int ix, bool videoTrack)
{
blockSignals(true);
- m_isBlocked = true;
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
Mlt::Tractor tractor(service);
// Add audio mix transition to last track
Mlt::Field *field = tractor.field();
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
- //transition->set("mlt_service", "mix");
transition->set("a_track", 1);
transition->set("b_track", ct);
transition->set("always_active", 1);
transition->set("internal_added", 237);
transition->set("combine", 1);
field->plant_transition(*transition, 1, ct);
-
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ //mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
+ //tractor.multitrack()->refresh();
+ //tractor.refresh();
+ m_isBlocked--;
blockSignals(false);
}
}
if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) {
tractor.removeChild(transitions.at(i));
- } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) {
+ i--;
+ } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) {
// Transition needs to be moved
int a_track = mappedProps.value("a_track").toInt();
int b_track = mappedProps.value("b_track").toInt();
- if (a_track > 0) a_track --;
- if (b_track > 0) b_track --;
+ if (a_track > 0 && a_track >= ix) a_track --;
+ if (b_track > 0 && b_track >= ix) b_track --;
for (int j = 0; j < props.count(); j++) {
QDomElement f = props.at(j).toElement();
if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track));
}
}
tractor.removeChild(track);
+ //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
setSceneList(doc.toString(), m_framePosition);
mltCheckLength();
}
projects / kdenlive / blobdiff