Commit ebfaebb8 authored by Laurent Montel's avatar Laurent Montel

now we can use nullptr

parent 0f4fefe7
......@@ -120,7 +120,7 @@ int main(int argc, char **argv)
job->setLocale(locale);
}
job->start();
RenderJob *dualjob = Q_NULLPTR;
RenderJob *dualjob = nullptr;
if (dualpass) {
if (vprelist.size() > 1) {
args.replaceInStrings(QRegExp(QLatin1String("^vpre=.*")), QStringLiteral("vpre=%1").arg(vprelist.at(1)));
......
......@@ -42,8 +42,8 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString &rend
m_progress(0),
m_prog(renderer),
m_player(player),
m_jobUiserver(Q_NULLPTR),
m_kdenliveinterface(Q_NULLPTR),
m_jobUiserver(nullptr),
m_kdenliveinterface(nullptr),
m_usekuiserver(usekuiserver),
m_logfile(dest + ".txt"),
m_erase(erase),
......
......@@ -123,7 +123,7 @@ Bin *AbstractProjectItem::bin()
if (m_parent) {
return m_parent->bin();
}
return Q_NULLPTR;
return nullptr;
}
QPixmap AbstractProjectItem::roundedPixmap(const QPixmap &source)
......
......@@ -213,7 +213,7 @@ bool BinMessageWidget::event(QEvent *ev)
}
SmallJobLabel::SmallJobLabel(QWidget *parent) : QPushButton(parent)
, m_action(Q_NULLPTR)
, m_action(nullptr)
{
setFixedWidth(0);
setFlat(true);
......@@ -326,21 +326,21 @@ bool LineEventEater::eventFilter(QObject *obj, QEvent *event)
Bin::Bin(QWidget *parent) :
QWidget(parent)
, isLoading(false)
, m_itemModel(Q_NULLPTR)
, m_itemView(Q_NULLPTR)
, m_rootFolder(Q_NULLPTR)
, m_folderUp(Q_NULLPTR)
, m_jobManager(Q_NULLPTR)
, m_doc(Q_NULLPTR)
, m_extractAudioAction(Q_NULLPTR)
, m_transcodeAction(Q_NULLPTR)
, m_clipsActionsMenu(Q_NULLPTR)
, m_inTimelineAction(Q_NULLPTR)
, m_itemModel(nullptr)
, m_itemView(nullptr)
, m_rootFolder(nullptr)
, m_folderUp(nullptr)
, m_jobManager(nullptr)
, m_doc(nullptr)
, m_extractAudioAction(nullptr)
, m_transcodeAction(nullptr)
, m_clipsActionsMenu(nullptr)
, m_inTimelineAction(nullptr)
, m_listType((BinViewType) KdenliveSettings::binMode())
, m_iconSize(160, 90)
, m_propertiesPanel(Q_NULLPTR)
, m_propertiesPanel(nullptr)
, m_blankThumb()
, m_invalidClipDialog(Q_NULLPTR)
, m_invalidClipDialog(nullptr)
, m_gainedFocus(false)
, m_audioDuration(0)
, m_processedAudio(0)
......@@ -632,7 +632,7 @@ bool Bin::eventFilter(QObject *obj, QEvent *event)
QAbstractItemView *view = qobject_cast<QAbstractItemView *>(obj->parent());
if (view) {
QModelIndex idx = view->indexAt(mouseEvent->pos());
ClipController *ctl = Q_NULLPTR;
ClipController *ctl = nullptr;
if (idx.isValid()) {
AbstractProjectItem *item = static_cast<AbstractProjectItem *>(m_proxyModel->mapToSource(idx).internalPointer());
if (item) {
......@@ -772,7 +772,7 @@ void Bin::slotAddClip()
void Bin::deleteClip(const QString &id)
{
if (m_monitor->activeClipId() == id) {
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
}
ProjectClip *clip = m_rootFolder->clip(id);
if (!clip) {
......@@ -793,7 +793,7 @@ ProjectClip *Bin::getFirstSelectedClip()
{
QModelIndexList indexes = m_proxyModel->selectionModel()->selectedIndexes();
if (indexes.isEmpty()) {
return Q_NULLPTR;
return nullptr;
}
foreach (const QModelIndex &ix, indexes) {
AbstractProjectItem *item = static_cast<AbstractProjectItem *>(m_proxyModel->mapToSource(ix).internalPointer());
......@@ -802,7 +802,7 @@ ProjectClip *Bin::getFirstSelectedClip()
return clip;
}
}
return Q_NULLPTR;
return nullptr;
}
void Bin::slotDeleteClip()
......@@ -917,7 +917,7 @@ void Bin::slotReloadClip()
AbstractProjectItem *item = static_cast<AbstractProjectItem *>(m_proxyModel->mapToSource(ix).internalPointer());
ProjectClip *currentItem = qobject_cast<ProjectClip *>(item);
if (currentItem) {
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
if (currentItem->clipType() == Playlist) {
//Check if a clip inside playlist is missing
QString path = currentItem->url();
......@@ -1043,7 +1043,7 @@ void Bin::setDocument(KdenliveDoc *project)
{
// Remove clip from Bin's monitor
if (m_doc) {
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
}
m_infoMessage->hide();
blockSignals(true);
......@@ -1060,7 +1060,7 @@ void Bin::setDocument(KdenliveDoc *project)
}
delete m_rootFolder;
delete m_itemView;
m_itemView = Q_NULLPTR;
m_itemView = nullptr;
delete m_jobManager;
m_clipCounter = 1;
m_folderCounter = 1;
......@@ -1084,7 +1084,7 @@ void Bin::setDocument(KdenliveDoc *project)
//connect(m_itemModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), m_itemView
//connect(m_itemModel, SIGNAL(updateCurrentItem()), this, SLOT(autoSelect()));
slotInitView(Q_NULLPTR);
slotInitView(nullptr);
bool binEffectsDisabled = getDocumentProperty(QStringLiteral("disablebineffects")).toInt() == 1;
setBinEffectsDisabledStatus(binEffectsDisabled);
autoSelect();
......@@ -1279,7 +1279,7 @@ void Bin::slotLoadFolders(const QMap<QString, QString> &foldersData)
if (parentFolder == m_rootFolder) {
// parent folder not yet created, create unnamed placeholder
parentFolder = new ProjectFolder(parentId, QString(), parentFolder);
} else if (parentFolder == Q_NULLPTR) {
} else if (parentFolder == nullptr) {
// Parent folder not yet created in hierarchy
if (iterations > maxIterations) {
// Give up, place folder in root
......@@ -1480,11 +1480,11 @@ void Bin::selectProxyModel(const QModelIndex &id)
// No item selected in bin
m_openAction->setEnabled(false);
m_deleteAction->setEnabled(false);
showClipProperties(Q_NULLPTR);
showClipProperties(nullptr);
emit findInTimeline(QString());
emit masterClipSelected(Q_NULLPTR, m_monitor);
emit masterClipSelected(nullptr, m_monitor);
// Display black bg in clip monitor
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
}
}
......@@ -1539,7 +1539,7 @@ void Bin::slotInitView(QAction *action)
m_folderUp->parent()->removeChild(m_folderUp);
}
delete m_folderUp;
m_folderUp = Q_NULLPTR;
m_folderUp = nullptr;
}
}
m_listType = static_cast<BinViewType>(viewType);
......@@ -1551,7 +1551,7 @@ void Bin::slotInitView(QAction *action)
switch (m_listType) {
case BinIconView:
m_itemView = new MyListView(this);
m_folderUp = new ProjectFolderUp(Q_NULLPTR);
m_folderUp = new ProjectFolderUp(nullptr);
m_showDate->setEnabled(false);
m_showDesc->setEnabled(false);
break;
......@@ -1744,7 +1744,7 @@ void Bin::slotItemDoubleClicked(const QModelIndex &ix, const QPoint pos)
// We are entering a parent folder
m_folderUp->setParent(parentItem->parent());
} else {
m_folderUp->setParent(Q_NULLPTR);
m_folderUp->setParent(nullptr);
}
m_itemView->setRootIndex(m_proxyModel->mapFromSource(parent));
return;
......@@ -1817,12 +1817,12 @@ void Bin::slotSwitchClipProperties()
return;
}
}
slotSwitchClipProperties(Q_NULLPTR);
slotSwitchClipProperties(nullptr);
}
void Bin::slotSwitchClipProperties(ProjectClip *clip)
{
if (clip == Q_NULLPTR) {
if (clip == nullptr) {
m_propertiesPanel->setEnabled(false);
return;
}
......@@ -1935,7 +1935,7 @@ QStringList Bin::getBinFolderClipIds(const QString &id) const
ProjectClip *Bin::getBinClip(const QString &id)
{
ProjectClip *clip = Q_NULLPTR;
ProjectClip *clip = nullptr;
if (id.contains(QLatin1Char('_'))) {
clip = m_rootFolder->clip(id.section(QLatin1Char('_'), 0, 0));
} else if (!id.isEmpty()) {
......@@ -2008,7 +2008,7 @@ void Bin::slotProducerReady(const requestClipInfo &info, ClipController *control
}
}
} else if (currentClip == info.clipId) {
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
clip->setCurrent(true);
}
} else {
......@@ -2194,7 +2194,7 @@ void Bin::slotUpdateJobStatus(const QString &id, int jobType, int status, const
}
if (!actionName.isEmpty()) {
QAction *action = Q_NULLPTR;
QAction *action = nullptr;
QList< KActionCollection * > collections = KActionCollection::allCollections();
for (int i = 0; i < collections.count(); ++i) {
KActionCollection *coll = collections.at(i);
......@@ -3186,7 +3186,7 @@ void Bin::slotAddClipMarker(const QString &id, const QList<CommentedTime> &newMa
if (!clip) {
return;
}
if (groupCommand == Q_NULLPTR) {
if (groupCommand == nullptr) {
groupCommand = new QUndoCommand;
groupCommand->setText(i18np("Add marker", "Add markers", newMarkers.count()));
}
......@@ -3503,7 +3503,7 @@ void Bin::slotQueryRemoval(const QString &id, const QString &url, const QString
}
}
delete m_invalidClipDialog;
m_invalidClipDialog = Q_NULLPTR;
m_invalidClipDialog = nullptr;
}
void Bin::slotRefreshClipThumbnail(const QString &id)
......@@ -3684,7 +3684,7 @@ void Bin::slotSendAudioThumb(const QString &id)
bool Bin::isEmpty() const
{
// TODO: return true if we only have folders
if (m_clipCounter == 1 || m_rootFolder == Q_NULLPTR) {
if (m_clipCounter == 1 || m_rootFolder == nullptr) {
return true;
}
return m_rootFolder->isEmpty();
......@@ -3692,11 +3692,11 @@ bool Bin::isEmpty() const
void Bin::reloadAllProducers()
{
if (m_rootFolder == Q_NULLPTR || m_rootFolder->isEmpty() || !isEnabled()) {
if (m_rootFolder == nullptr || m_rootFolder->isEmpty() || !isEnabled()) {
return;
}
QList<ProjectClip *> clipList = m_rootFolder->childClips();
emit openClip(Q_NULLPTR);
emit openClip(nullptr);
foreach (ProjectClip *clip, clipList) {
QDomDocument doc;
QDomElement xml = clip->toXml(doc);
......
......@@ -37,10 +37,10 @@
Generators::Generators(Monitor *monitor, const QString &path, QWidget *parent) :
QDialog(parent)
, m_producer(Q_NULLPTR)
, m_timePos(Q_NULLPTR)
, m_container(Q_NULLPTR)
, m_preview(Q_NULLPTR)
, m_producer(nullptr)
, m_timePos(nullptr)
, m_container(nullptr)
, m_preview(nullptr)
{
QFile file(path);
QDomDocument doc;
......
......@@ -47,7 +47,7 @@ ProjectClip::ProjectClip(const QString &id, const QIcon &thumb, ClipController *
AbstractProjectItem(AbstractProjectItem::ClipItem, id, parent)
, m_abortAudioThumb(false)
, m_controller(controller)
, m_thumbsProducer(Q_NULLPTR)
, m_thumbsProducer(nullptr)
{
m_clipStatus = StatusReady;
m_name = m_controller->clipName();
......@@ -72,9 +72,9 @@ ProjectClip::ProjectClip(const QString &id, const QIcon &thumb, ClipController *
ProjectClip::ProjectClip(const QDomElement &description, const QIcon &thumb, ProjectFolder *parent) :
AbstractProjectItem(AbstractProjectItem::ClipItem, description, parent)
, m_abortAudioThumb(false)
, m_controller(Q_NULLPTR)
, m_controller(nullptr)
, m_type(Unknown)
, m_thumbsProducer(Q_NULLPTR)
, m_thumbsProducer(nullptr)
{
Q_ASSERT(description.hasAttribute("id"));
m_clipStatus = StatusWaiting;
......@@ -188,13 +188,13 @@ ProjectClip *ProjectClip::clip(const QString &id)
if (id == m_id) {
return this;
}
return Q_NULLPTR;
return nullptr;
}
ProjectFolder *ProjectClip::folder(const QString &id)
{
Q_UNUSED(id)
return Q_NULLPTR;
return nullptr;
}
void ProjectClip::disableEffects(bool disable)
......@@ -212,7 +212,7 @@ ProjectSubClip *ProjectClip::getSubClip(int in, int out)
return clip;
}
}
return Q_NULLPTR;
return nullptr;
}
QStringList ProjectClip::subClipIds() const
......@@ -232,7 +232,7 @@ ProjectClip *ProjectClip::clipAt(int ix)
if (ix == index()) {
return this;
}
return Q_NULLPTR;
return nullptr;
}
/*bool ProjectClip::isValid() const
......@@ -392,7 +392,7 @@ void ProjectClip::createAudioThumbs()
Mlt::Producer *ProjectClip::originalProducer()
{
if (!m_controller) {
return Q_NULLPTR;
return nullptr;
}
return &m_controller->originalProducer();
}
......@@ -404,11 +404,11 @@ Mlt::Producer *ProjectClip::thumbProducer()
return m_thumbsProducer;
}
if (!m_controller || m_controller->clipType() == Unknown) {
return Q_NULLPTR;
return nullptr;
}
Mlt::Producer prod = m_controller->originalProducer();
if (!prod.is_valid()) {
return Q_NULLPTR;
return nullptr;
}
Clip clip(prod);
if (KdenliveSettings::gpu_accel()) {
......@@ -430,7 +430,7 @@ ClipController *ProjectClip::controller()
bool ProjectClip::isReady() const
{
return m_controller != Q_NULLPTR && m_clipStatus == StatusReady;
return m_controller != nullptr && m_clipStatus == StatusReady;
}
/*void ProjectClip::setZone(const QPoint &zone)
......@@ -863,7 +863,7 @@ QVariant ProjectClip::data(DataType type) const
{
switch (type) {
case AbstractProjectItem::IconOverlay:
return m_controller != Q_NULLPTR ? (m_controller->hasEffects() ? QVariant("kdenlive-track_has_effect") : QVariant()) : QVariant();
return m_controller != nullptr ? (m_controller->hasEffects() ? QVariant("kdenlive-track_has_effect") : QVariant()) : QVariant();
break;
default:
break;
......@@ -888,7 +888,7 @@ void ProjectClip::slotQueryIntraThumbs(const QList<int> &frames)
void ProjectClip::doExtractIntra()
{
Mlt::Producer *prod = thumbProducer();
if (prod == Q_NULLPTR || !prod->is_valid()) {
if (prod == nullptr || !prod->is_valid()) {
return;
}
int fullWidth = 150 * prod->profile()->dar() + 0.5;
......@@ -937,7 +937,7 @@ void ProjectClip::slotExtractImage(const QList<int> &frames)
void ProjectClip::doExtractImage()
{
Mlt::Producer *prod = thumbProducer();
if (prod == Q_NULLPTR || !prod->is_valid()) {
if (prod == nullptr || !prod->is_valid()) {
return;
}
int frameWidth = 150 * prod->profile()->dar() + 0.5;
......@@ -1000,7 +1000,7 @@ void ProjectClip::discardAudioThumb()
const QString ProjectClip::getAudioThumbPath(AudioStreamInfo *audioInfo)
{
if (audioInfo == Q_NULLPTR) {
if (audioInfo == nullptr) {
return QString();
}
int audioStream = audioInfo->ffmpeg_audio_index();
......@@ -1372,7 +1372,7 @@ const QString ProjectClip::geometryWithOffset(const QString &data, int offset)
}
Mlt::Profile *profile = m_controller->profile();
Mlt::Geometry geometry(data.toUtf8().data(), duration().frames(profile->fps()), profile->width(), profile->height());
Mlt::Geometry newgeometry(Q_NULLPTR, duration().frames(profile->fps()), profile->width(), profile->height());
Mlt::Geometry newgeometry(nullptr, duration().frames(profile->fps()), profile->width(), profile->height());
Mlt::GeometryItem item;
int pos = 0;
while (!geometry.next_key(&item, pos)) {
......
......@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
ProjectFolder::ProjectFolder(const QString &id, const QString &name, ProjectFolder *parent) :
AbstractProjectItem(AbstractProjectItem::FolderItem, id, parent)
, m_bin(Q_NULLPTR)
, m_bin(nullptr)
{
m_name = name;
m_clipStatus = StatusReady;
......@@ -43,7 +43,7 @@ ProjectFolder::ProjectFolder(Bin *bin) :
, m_bin(bin)
{
m_name = QStringLiteral("root");
setParent(Q_NULLPTR);
setParent(nullptr);
}
ProjectFolder::~ProjectFolder()
......@@ -54,7 +54,7 @@ void ProjectFolder::setCurrent(bool current, bool notify)
{
Q_UNUSED(notify)
if (current) {
bin()->openProducer(Q_NULLPTR);
bin()->openProducer(nullptr);
}
}
......@@ -66,7 +66,7 @@ ProjectClip *ProjectFolder::clip(const QString &id)
return clip;
}
}
return Q_NULLPTR;
return nullptr;
}
QList<ProjectClip *> ProjectFolder::childClips()
......@@ -99,13 +99,13 @@ ProjectFolder *ProjectFolder::folder(const QString &id)
return folderItem;
}
}
return Q_NULLPTR;
return nullptr;
}
ProjectClip *ProjectFolder::clipAt(int index)
{
if (isEmpty()) {
return Q_NULLPTR;
return nullptr;
}
for (int i = 0; i < count(); ++i) {
ProjectClip *clip = at(i)->clipAt(index);
......@@ -113,7 +113,7 @@ ProjectClip *ProjectFolder::clipAt(int index)
return clip;
}
}
return Q_NULLPTR;
return nullptr;
}
void ProjectFolder::disableEffects(bool disable)
......
......@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
ProjectFolderUp::ProjectFolderUp(AbstractProjectItem *parent) :
AbstractProjectItem(AbstractProjectItem::FolderUpItem, QString(), parent)
, m_bin(Q_NULLPTR)
, m_bin(nullptr)
{
m_thumbnail = KoIconUtils::themedIcon(QStringLiteral("go-previous"));
m_name = i18n("Back");
......@@ -49,7 +49,7 @@ void ProjectFolderUp::setCurrent(bool current, bool notify)
ProjectClip *ProjectFolderUp::clip(const QString &id)
{
Q_UNUSED(id)
return Q_NULLPTR;
return nullptr;
}
QString ProjectFolderUp::getToolTip() const
......@@ -60,13 +60,13 @@ QString ProjectFolderUp::getToolTip() const
ProjectFolder *ProjectFolderUp::folder(const QString &id)
{
Q_UNUSED(id)
return Q_NULLPTR;
return nullptr;
}
ProjectClip *ProjectFolderUp::clipAt(int index)
{
Q_UNUSED(index)
return Q_NULLPTR;
return nullptr;
}
void ProjectFolderUp::disableEffects(bool)
......
......@@ -289,7 +289,7 @@ QMimeData *ProjectItemModel::mimeData(const QModelIndexList &indices) const
void ProjectItemModel::onAboutToAddItem(AbstractProjectItem *item)
{
AbstractProjectItem *parentItem = item->parent();
if (parentItem == Q_NULLPTR) {
if (parentItem == nullptr) {
return;
}
QModelIndex parentIndex;
......@@ -308,7 +308,7 @@ void ProjectItemModel::onItemAdded(AbstractProjectItem *item)
void ProjectItemModel::onAboutToRemoveItem(AbstractProjectItem *item)
{
AbstractProjectItem *parentItem = item->parent();
if (parentItem == Q_NULLPTR) {
if (parentItem == nullptr) {
return;
}
QModelIndex parentIndex;
......@@ -331,7 +331,7 @@ void ProjectItemModel::onItemUpdated(AbstractProjectItem *item)
return;
}
AbstractProjectItem *parentItem = item->parent();
if (parentItem == Q_NULLPTR) {
if (parentItem == nullptr) {
return;
}
QModelIndex parentIndex;
......
......@@ -78,13 +78,13 @@ QString ProjectSubClip::getToolTip() const
ProjectClip *ProjectSubClip::clip(const QString &id)
{
Q_UNUSED(id)
return Q_NULLPTR;
return nullptr;
}
ProjectFolder *ProjectSubClip::folder(const QString &id)
{
Q_UNUSED(id)
return Q_NULLPTR;
return nullptr;
}
void ProjectSubClip::disableEffects(bool)
......@@ -105,7 +105,7 @@ QPoint ProjectSubClip::zone() const
ProjectClip *ProjectSubClip::clipAt(int ix)
{
Q_UNUSED(ix)
return Q_NULLPTR;
return nullptr;
}
QDomElement ProjectSubClip::toXml(QDomDocument &document, bool)
......@@ -122,7 +122,7 @@ ProjectSubClip *ProjectSubClip::subClip(int in, int out)
if (m_in == in && m_out == out) {
return this;
}
return Q_NULLPTR;
return nullptr;
}
void ProjectSubClip::setCurrent(bool current, bool notify)
......
......@@ -116,7 +116,7 @@ void ManageCapturesDialog::slotDeleteCurrent()
qCDebug(KDENLIVE_LOG) << "// ERRor removing file " << item->data(0, Qt::UserRole).toString();
}
delete item;
item = Q_NULLPTR;
item = nullptr;
}
void ManageCapturesDialog::slotToggle()
......
......@@ -42,10 +42,10 @@ MltDeviceCapture::MltDeviceCapture(QString profile, /*VideoSurface *surface, */Q
AbstractRender(Kdenlive::RecordMonitor, parent),
doCapture(0),
processingImage(false),
m_mltConsumer(Q_NULLPTR),
m_mltProducer(Q_NULLPTR),
m_mltProfile(Q_NULLPTR),
m_showFrameEvent(Q_NULLPTR),
m_mltConsumer(nullptr),
m_mltProducer(nullptr),
m_mltProfile(nullptr),
m_showFrameEvent(nullptr),
m_droppedFrames(0),
m_livePreview(KdenliveSettings::enable_recording_preview())
{
......@@ -121,7 +121,7 @@ bool MltDeviceCapture::buildConsumer(const QString &profileName)
//m_mltConsumer->set("real_time", 0);
if (!m_mltConsumer->is_valid()) {
delete m_mltConsumer;
m_mltConsumer = Q_NULLPTR;
m_mltConsumer = nullptr;
return false;
}
return true;
......@@ -144,7 +144,7 @@ void MltDeviceCapture::stop()
//m_captureDisplayWidget->stop();
delete m_showFrameEvent;
m_showFrameEvent = Q_NULLPTR;
m_showFrameEvent = nullptr;
if (m_mltConsumer) {
m_mltConsumer->set("refresh", 0);
......@@ -171,7 +171,7 @@ void MltDeviceCapture::stop()
nextservicetodisconnect = nextservice;
nextservice = mlt_service_producer(nextservice);
mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
if (nextservice == Q_NULLPTR) {
if (nextservice == nullptr) {
break;
}
properties = MLT_SERVICE_PROPERTIES(nextservice);
......@@ -179,17 +179,17 @@ void MltDeviceCapture::stop()
resource = mlt_properties_get(properties, "mlt_service");
}
delete field;
field = Q_NULLPTR;
field = nullptr;
}
mlt_service_unlock(service.get_service());
delete m_mltProducer;
m_mltProducer = Q_NULLPTR;
m_mltProducer = nullptr;
}
// For some reason, the consumer seems to be deleted by previous stuff when in playlist mode
if (!isPlaylist && m_mltConsumer) {
delete m_mltConsumer;
}
m_mltConsumer = Q_NULLPTR;
m_mltConsumer = nullptr;
}
void MltDeviceCapture::emitFrameUpdated(Mlt::Frame &frame)
......@@ -257,7 +257,7 @@ void MltDeviceCapture::showAudio(Mlt::Frame &frame)
bool MltDeviceCapture::slotStartPreview(const QString &producer, bool xmlFormat)
{
if (m_mltConsumer == Q_NULLPTR) {
if (m_mltConsumer == nullptr) {
if (!buildConsumer()) {
return false;
}
......@@ -270,10 +270,10 @@ bool MltDeviceCapture::slotStartPreview(const QString &producer, bool xmlFormat)
}
delete[] tmp;
if (m_mltProducer == Q_NULLPTR || !m_mltProducer->is_valid()) {
if (m_mltProducer == nullptr || !m_mltProducer->is_valid()) {
if (m_mltProducer) {
delete m_mltProducer;
m_mltProducer = Q_NULLPTR;
m_mltProducer = nullptr;
}
//qCDebug(KDENLIVE_LOG)<<"//// ERROR CREATRING PROD";
return false;
......@@ -281,7 +281,7 @@ bool MltDeviceCapture::slotStartPreview(const QString &producer, bool xmlFormat)
m_mltConsumer->connect(*m_mltProducer);
if (m_mltConsumer->start() == -1) {
delete m_mltConsumer;
m_mltConsumer = Q_NULLPTR;
m_mltConsumer = nullptr;
return false;
}
m_droppedFramesTimer.start();
......@@ -322,7 +322,7 @@ void MltDeviceCapture::saveFrame(Mlt::Frame &frame)
void MltDeviceCapture::captureFrame(const QString &path)
{
if (m_mltProducer == Q_NULLPTR || !m_mltProducer->is_valid()) {
if (m_mltProducer == nullptr || !m_mltProducer->is_valid()) {
return;
}
......@@ -351,9 +351,9 @@ bool MltDeviceCapture::slotStartCapture(const QString &params, const QString &pa
delete[] tmp;
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "multi");
if (m_mltConsumer == Q_NULLPTR || !m_mltConsumer->is_valid()) {
if (m_mltConsumer == nullptr || !m_mltConsumer->is_valid()) {
delete m_mltConsumer;
m_mltConsumer = Q_NULLPTR;
m_mltConsumer = nullptr;
return false;
}
......@@ -379,7 +379,7 @@ bool MltDeviceCapture::slotStartCapture(const QString &params, const QString &pa
delete[] tmp2;
}
mlt_properties consumerProperties = m_mltConsumer->get_properties();
mlt_properties_set_data(consumerProperties, "0", renderProps->get_properties(), 0, (mlt_destructor) mlt_properties_close, Q_NULLPTR);