svn path=/trunk/kdenlive/; revision=5811
{
int track = m_document->tracksCount() - clip->track();
GenTime pos = clip->startPos();
{
int track = m_document->tracksCount() - clip->track();
GenTime pos = clip->startPos();
- if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) {
+ if (!m_document->renderer()->mltRemoveEffect(track, pos, -1, false, false)) {
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
QString index = effect.attribute("kdenlive_ix");
if (pos < GenTime()) {
// Delete track effect
QString index = effect.attribute("kdenlive_ix");
if (pos < GenTime()) {
// Delete track effect
- if (m_document->renderer()->mltRemoveTrackEffect(track, index, true)) {
+ if (m_document->renderer()->mltRemoveTrackEffect(track, index.toInt(), true)) {
m_document->removeTrackEffect(track - 1, effect);
}
else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
m_document->removeTrackEffect(track - 1, effect);
}
else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
clip->deleteEffect(index);
emit clipItemSelected(clip);
doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
clip->deleteEffect(index);
emit clipItemSelected(clip);
- m_document->renderer()->mltRemoveEffect(track, pos, index, true);
+ m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true);
- if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) {
+ if (!m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true)) {
kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable");
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable");
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
-bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
+bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex)
{
Mlt::Service service(m_mltProducer->parent().get_service());
bool success = false;
{
Mlt::Service service(m_mltProducer->parent().get_service());
bool success = false;
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {
+ if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) {
if (clipService.detach(*filter) == 0) success = true;
} else if (updateIndex) {
// Adjust the other effects index
if (clipService.detach(*filter) == 0) success = true;
} else if (updateIndex) {
// Adjust the other effects index
- if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+ if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
ct++;
} else ct++;
filter = clipService.filter(ct);
ct++;
} else ct++;
filter = clipService.filter(ct);
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
+bool Render::mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh)
{
if (position < GenTime()) {
// Remove track effect
{
if (position < GenTime()) {
// Remove track effect
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) {
+ if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
if (clipService.detach(*filter) == 0) success = true;
//kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
} else if (updateIndex) {
// Adjust the other effects index
if (clipService.detach(*filter) == 0) success = true;
//kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
} else if (updateIndex) {
// Adjust the other effects index
- if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+ if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
ct++;
} else ct++;
filter = clipService.filter(ct);
ct++;
} else ct++;
filter = clipService.filter(ct);
bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
{
bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
{
- QString index = params.paramValue("kdenlive_ix");
+ int index = params.paramValue("kdenlive_ix").toInt();
QString tag = params.paramValue("tag");
if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
QString tag = params.paramValue("tag");
if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
Mlt::Filter *filter = clip->filter(ct);
while (filter) {
Mlt::Filter *filter = clip->filter(ct);
while (filter) {
- if (filter->get_int("kdenlive_ix") == index.toInt()) {
+ if (filter->get_int("kdenlive_ix") == index) {
bool mltRemoveClip(int track, GenTime position);
/** @brief Deletes an effect from a clip in MLT's playlist. */
bool mltRemoveClip(int track, GenTime position);
/** @brief Deletes an effect from a clip in MLT's playlist. */
- bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true);
- bool mltRemoveTrackEffect(int track, QString index, bool updateIndex);
+ bool mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh = true);
+ bool mltRemoveTrackEffect(int track, int index, bool updateIndex);
/** @brief Adds an effect to a clip in MLT's playlist. */
bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);
/** @brief Adds an effect to a clip in MLT's playlist. */
bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);