X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=488975e9079595698f7b17a6e5be87f367c7a665;hb=000c8e2337fe448a6e35896f3ef1a95dedbb39c7;hp=0c862d07d69b19ecdc7c52ae0eed465937b431c6;hpb=e1984120c805806cba78941ec08839285c3b2591;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0c862d07..488975e9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -51,6 +51,7 @@ #include "interfaces.h" #include "kdenlive-config.h" #include "cliptranscode.h" +#include "ui_templateclip_ui.h" #include #include @@ -70,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +86,7 @@ #include #include #include +#include #include @@ -173,6 +176,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent actionCollection()); readOptions(); + //slotDetectAudioDriver(); + m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); m_clipMonitor = new Monitor("clip", m_monitorManager, this); @@ -323,7 +328,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); - m_timelineContextClipMenu->addAction(actionCollection()->action("change_clip_speed")); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); @@ -376,13 +380,41 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent void MainWindow::queryQuit() { - kDebug() << "----- SAVING CONFUIG"; - if (queryClose()) kapp->quit(); + delete m_effectStack; + delete m_activeTimeline; + delete m_projectMonitor; + kDebug() << "// DEL MON 1 done"; + delete m_clipMonitor; + kDebug() << "// DEL MON 2 done"; + delete m_activeDocument; + Mlt::Factory::close(); + qApp->quit(); + /* + if (queryClose()) { + Mlt::Factory::close(); + kapp->quit(); + }*/ } //virtual bool MainWindow::queryClose() { + if (m_renderWidget) { + int waitingJobs = m_renderWidget->waitingJobsCount(); + if (waitingJobs > 0) { + switch (KMessageBox::warningYesNoCancel(this, i18n("You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) { + case KMessageBox::Yes : + // create script with waiting jobs and start it + if (m_renderWidget->startWaitingRenderJobs() == false) return false; + break; + case KMessageBox::No : + // Don't do anything, jobs will be deleted + break; + default: + return false; + } + } + } saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); if (m_activeDocument && m_activeDocument->isModified()) { @@ -471,17 +503,19 @@ void MainWindow::generateClip() } } -void MainWindow::saveProperties(KConfig*) +void MainWindow::saveProperties(KConfigGroup &config) { // save properties here,used by session management saveFile(); + KMainWindow::saveProperties(config); } -void MainWindow::readProperties(KConfig *config) +void MainWindow::readProperties(const KConfigGroup &config) { // read properties here,used by session management - QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); + KMainWindow::readProperties(config); + QString Lastproject = config.group("Recent Files").readPathEntry("File1", QString()); openFile(KUrl(Lastproject)); } @@ -764,7 +798,6 @@ void MainWindow::setupActions() statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS); statusBar()->addPermanentWidget(m_timecodeFormat); statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4); - m_messageLabel->hide(); collection->addAction("select_tool", m_buttonSelectTool); collection->addAction("razor_tool", m_buttonRazorTool); @@ -801,7 +834,7 @@ void MainWindow::setupActions() collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + KNS::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); @@ -921,10 +954,10 @@ void MainWindow::setupActions() collection->addAction("delete_timeline_clip", deleteTimelineClip); connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip())); - KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this); + /*KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this); collection->addAction("change_clip_speed", editTimelineClipSpeed); editTimelineClipSpeed->setData("change_speed"); - connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed())); + connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));*/ KAction *stickTransition = collection->addAction("auto_transition"); stickTransition->setData(QString("auto")); @@ -934,11 +967,13 @@ void MainWindow::setupActions() connect(stickTransition, SIGNAL(triggered(bool)), this, SLOT(slotAutoTransition())); KAction* groupClip = new KAction(KIcon("object-group"), i18n("Group Clips"), this); + groupClip->setShortcut(Qt::CTRL + Qt::Key_G); collection->addAction("group_clip", groupClip); connect(groupClip, SIGNAL(triggered(bool)), this, SLOT(slotGroupClips())); KAction* ungroupClip = new KAction(KIcon("object-ungroup"), i18n("Ungroup Clips"), this); collection->addAction("ungroup_clip", ungroupClip); + ungroupClip->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G); ungroupClip->setData("ungroup_clip"); connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips())); @@ -1095,6 +1130,10 @@ void MainWindow::setupActions() collection->addAction("add_text_clip", addTitleClip); connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip())); + QAction *addTitleTemplateClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Template Title"), this); + collection->addAction("add_text_template_clip", addTitleTemplateClip); + connect(addTitleTemplateClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleTemplateClip())); + QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this); collection->addAction("add_folder", addFolderButton); connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder())); @@ -1128,6 +1167,7 @@ void MainWindow::setupActions() addClips->addAction(addColorClip); addClips->addAction(addSlideClip); addClips->addAction(addTitleClip); + addClips->addAction(addTitleTemplateClip); addClips->addAction(addFolderButton); addClips->addAction(reloadClip); @@ -1204,12 +1244,14 @@ void MainWindow::slotRunWizard() void MainWindow::newFile(bool showProjectSettings) { + if (!m_timelineArea->isEnabled()) return; QString profileName; KUrl projectFolder; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); if (!showProjectSettings && m_timelineArea->count() == 0) { if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = KdenliveSettings::default_profile(); + projectFolder = KdenliveSettings::defaultprojectfolder(); } else { ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this); if (w->exec() != QDialog::Accepted) return; @@ -1225,8 +1267,17 @@ void MainWindow::newFile(bool showProjectSettings) } KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); - TrackView *trackView = new TrackView(doc, this); + bool ok; + TrackView *trackView = new TrackView(doc, &ok, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); + if (!ok) { + // MLT is broken + m_timelineArea->setEnabled(false); + m_projectList->setEnabled(false); + m_monitorManager->slotBlockMonitors(); + slotPreferences(6); + return; + } if (m_timelineArea->count() == 1) { connectDocumentInfo(doc); connectDocument(trackView, doc); @@ -1236,7 +1287,7 @@ void MainWindow::newFile(bool showProjectSettings) void MainWindow::activateDocument() { - if (m_timelineArea->currentWidget() == NULL) return; + if (m_timelineArea->currentWidget() == NULL || !m_timelineArea->isEnabled()) return; TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); KdenliveDoc *currentDoc = currentTab->document(); connectDocumentInfo(currentDoc); @@ -1275,7 +1326,7 @@ void MainWindow::closeCurrentDocument() delete m_activeDocument; m_activeDocument = NULL; m_effectStack->clear(); - m_transitionConfig->slotTransitionItemSelected(NULL, QPoint(), false); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); } else delete docToClose; if (w == m_activeTimeline) { delete m_activeTimeline; @@ -1402,7 +1453,8 @@ void MainWindow::openFile(const KUrl &url) void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { - KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); + if (!m_timelineArea->isEnabled()) return; + KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1413,8 +1465,16 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) stale->setParent(doc); } connectDocumentInfo(doc); - TrackView *trackView = new TrackView(doc, this); + bool ok; + TrackView *trackView = new TrackView(doc, &ok, this); m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); + if (!ok) { + m_timelineArea->setEnabled(false); + m_projectList->setEnabled(false); + m_monitorManager->slotBlockMonitors(); + slotPreferences(6); + return; + } m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); trackView->setDuration(trackView->duration()); trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); @@ -1486,7 +1546,7 @@ void MainWindow::parseProfiles(const QString &mltPath) KUrl mltPath = getUrl->selectedUrl(); delete getUrl; if (mltPath.isEmpty()) ::exit(0); - KdenliveSettings::setMltpath(mltPath.path()); + KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash)); QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } } @@ -1520,6 +1580,34 @@ void MainWindow::slotEditProfiles() delete w; } +void MainWindow::slotDetectAudioDriver() +{ + /* WARNING: do not use this method because sometimes detects wrong driver (pulse instead of alsa), + leading to no audio output, see bug #934 */ + + //decide which audio driver is really best, in some cases SDL is wrong + if (KdenliveSettings::audiodrivername().isEmpty()) { + QString driver; + KProcess readProcess; + //PulseAudio needs to be selected if it exists, the ALSA pulse pcm device is not fast enough. + if (!KStandardDirs::findExe("pactl").isEmpty()) { + readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel); + readProcess.setProgram("pactl", QStringList() << "stat"); + readProcess.execute(2000); // Kill it after 2 seconds + + QString result = QString(readProcess.readAllStandardOutput()); + kDebug() << "// / / / / / READING PACTL: "; + kDebug() << result; + if (!result.isEmpty()) { + driver = "pulse"; + kDebug() << "// / / / / PULSEAUDIO DETECTED"; + } + } + //put others here + KdenliveSettings::setAutoaudiodrivername(driver); + } +} + void MainWindow::slotEditProjectSettings() { QPoint p = m_activeDocument->getTracksCount(); @@ -1528,19 +1616,27 @@ void MainWindow::slotEditProjectSettings() if (w->exec() == QDialog::Accepted) { QString profile = w->selectedProfile(); m_activeDocument->setProjectFolder(w->selectedFolder()); - if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path()); + if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); if (m_activeDocument->profilePath() != profile) { // Profile was changed double dar = m_activeDocument->dar(); + + // Deselect current effect / transition + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + m_activeDocument->setProfilePath(profile); KdenliveSettings::setCurrent_profile(profile); KdenliveSettings::setProject_fps(m_activeDocument->fps()); setCaption(m_activeDocument->description(), m_activeDocument->isModified()); m_monitorManager->resetProfiles(m_activeDocument->timecode()); + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeTimeline->tracksNumber()); + m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode()); if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails(); + m_activeTimeline->updateProjectFps(); // We need to desactivate & reactivate monitors to get a refresh m_monitorManager->switchMonitors(); } @@ -1551,170 +1647,24 @@ void MainWindow::slotEditProjectSettings() void MainWindow::slotRenderProject() { if (!m_renderWidget) { - QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder(); + QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); - connect(m_renderWidget, SIGNAL(doRender(const QStringList&, const QStringList&)), this, SLOT(slotDoRender(const QStringList&, const QStringList&))); + connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString&))); + connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&))); connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &))); connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &))); if (m_activeDocument) { m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); + m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); } } /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); if (currentTab) m_renderWidget->setTimeline(currentTab); m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); -} - -void MainWindow::slotDoRender(const QStringList args, const QStringList overlay_args) -{ - QString dest = args.at(0); - QString render = args.at(1); - QStringList avformat_args = args.at(2).split(' '); - bool zoneOnly = args.at(3).toInt(); - bool playAfter = args.at(4).toInt(); - double guideStart = args.at(5).toDouble(); - double guideEnd = args.at(6).toDouble(); - bool resizeProfile = args.at(7).toInt(); - QString scriptExport = args.at(8); - bool createChapterFile = args.at(9).toInt(); - - if (dest.isEmpty()) return; - int in = 0; - int out = 0; - - if (m_activeTimeline && zoneOnly) { - in = m_activeTimeline->inPoint(); - out = m_activeTimeline->outPoint(); - } - - KTemporaryFile temp; - temp.setAutoRemove(false); - temp.setSuffix(".mlt"); - if (!scriptExport.isEmpty() || temp.open()) { - if (KdenliveSettings::dropbframes()) { - KdenliveSettings::setDropbframes(false); - m_activeDocument->clipManager()->updatePreviewSettings(); - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt"); - else m_projectMonitor->saveSceneList(temp.fileName()); - KdenliveSettings::setDropbframes(true); - m_activeDocument->clipManager()->updatePreviewSettings(); - } else { - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt"); - else m_projectMonitor->saveSceneList(temp.fileName()); - } - - QStringList args; - if (scriptExport.isEmpty()) args << "-erase"; - if (KdenliveSettings::usekuiserver()) args << "-kuiserver"; - if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out); - else if (guideStart != -1) { - args << "in=" + QString::number(GenTime(guideStart).frames(m_activeDocument->fps())) << "out=" + QString::number(GenTime(guideEnd).frames(m_activeDocument->fps())); - } - if (!overlay_args.isEmpty()) args << "preargs=" + overlay_args.join(" "); - QString videoPlayer = "-"; - if (playAfter) { - videoPlayer = KdenliveSettings::defaultplayerapp(); - if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog.")); - } - if (!QFile::exists(KdenliveSettings::rendererpath())) { - KMessageBox::sorry(this, i18n("Cannot find the melt program required for rendering (part of Mlt)")); - setRenderingProgress(dest, -3); - return; - } - args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer; - - for (int i = 0; i < avformat_args.count(); i++) { - if (avformat_args.at(i).startsWith("profile=")) { - if (avformat_args.at(i).section('=', 1) != m_activeDocument->profilePath()) resizeProfile = true; - break; - } - } - - if (resizeProfile) { - // The rendering profile is different from project profile, so use MLT's special producer_consumer - if (scriptExport.isEmpty()) args << "consumer:" + temp.fileName(); - else args << "consumer:$SOURCE"; - } else { - if (scriptExport.isEmpty()) args << temp.fileName(); - else args << "$SOURCE"; - } - if (scriptExport.isEmpty()) args << dest; - else args << "$TARGET"; - args << avformat_args; - QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); - if (!QFile::exists(renderer)) renderer = "kdenlive_render"; - if (scriptExport.isEmpty()) { - QProcess::startDetached(renderer, args); - KNotification::event("RenderStarted", i18n("Rendering %1 started", dest), QPixmap(), this); - } else { - // Generate script file - QFile file(scriptExport); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport)); - return; - } - - QTextStream outStream(&file); - outStream << "#! /bin/sh" << "\n" << "\n"; - outStream << "SOURCE=" << "\"" + scriptExport + ".mlt\"" << "\n"; - outStream << "TARGET=" << "\"" + dest + "\"" << "\n"; - outStream << renderer << " " << args.join(" ") << "\n" << "\n"; - if (file.error() != QFile::NoError) { - KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport)); - file.close(); - return; - } - file.close(); - QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser); - } - - if (createChapterFile) { - QDomDocument doc; - QDomElement chapters = doc.createElement("chapters"); - chapters.setAttribute("fps", m_activeDocument->fps()); - doc.appendChild(chapters); - - QDomElement guidesxml = m_activeDocument->guidesXml(); - if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps()); - - QDomNodeList nodes = guidesxml.elementsByTagName("guide"); - for (int i = 0; i < nodes.count(); i++) { - QDomElement e = nodes.item(i).toElement(); - if (!e.isNull()) { - QString comment = e.attribute("comment"); - int time = (int) GenTime(e.attribute("time").toDouble()).frames(m_activeDocument->fps()); - if (time >= in && time < out) { - if (zoneOnly) time = time - in; - QDomElement chapter = doc.createElement("chapter"); - chapters.appendChild(chapter); - chapter.setAttribute("title", comment); - chapter.setAttribute("time", time); - } - } - } - if (chapters.childNodes().count() > 0) { - if (m_activeTimeline->projectView()->hasGuide(out, 0) == -1) { - // Always insert a guide in pos 0 - QDomElement chapter = doc.createElement("chapter"); - chapters.insertBefore(chapter, QDomNode()); - chapter.setAttribute("title", i18n("Start")); - chapter.setAttribute("time", "0"); - } - // save chapters file - QFile file(dest + ".dvdchapter"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter"; - } else { - file.write(doc.toString().toUtf8()); - if (file.error() != QFile::NoError) - kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter"; - file.close(); - } - } - } - } + m_renderWidget->showNormal(); } void MainWindow::setRenderingProgress(const QString &url, int progress) @@ -1786,8 +1736,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, QPoint, bool))); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); + disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); + disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); @@ -1811,6 +1761,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha } //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + disconnect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); m_clipMonitor->stop(); } KdenliveSettings::setCurrent_profile(doc->profilePath()); @@ -1820,6 +1771,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); @@ -1846,9 +1798,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - connect(trackView, SIGNAL(transitionItemSelected(Transition*, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, QPoint, bool))); - connect(trackView, SIGNAL(transitionItemSelected(Transition*, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); - m_zoomSlider->setValue(doc->zoom()); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); + m_zoomSlider->setValue(doc->zoom().x()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); @@ -1874,7 +1826,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_activeTimeline = trackView; if (m_renderWidget) { m_renderWidget->setProfile(doc->mltProfile()); - m_renderWidget->setDocumentPath(doc->projectFolder().path()); + m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration()); + m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash)); + m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); @@ -1889,6 +1843,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; + m_activeTimeline->updateProjectFps(); if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); // set tool to select tool @@ -1921,6 +1876,7 @@ void MainWindow::slotPreferences(int page, int option) // create it : KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); + //connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder())); @@ -2002,13 +1958,6 @@ void MainWindow::slotDeleteTimelineClip() } } -void MainWindow::slotChangeClipSpeed() -{ - if (m_activeTimeline) { - m_activeTimeline->projectView()->changeClipSpeed(); - } -} - void MainWindow::slotAddClipMarker() { DocClipBase *clip = NULL; @@ -2017,7 +1966,7 @@ void MainWindow::slotAddClipMarker() if (m_activeTimeline) { ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); if (item) { - pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -2046,7 +1995,7 @@ void MainWindow::slotDeleteClipMarker() if (m_activeTimeline) { ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); if (item) { - pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -2099,7 +2048,7 @@ void MainWindow::slotEditClipMarker() if (m_activeTimeline) { ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); if (item) { - pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -2285,22 +2234,76 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress) void MainWindow::slotShowClipProperties(DocClipBase *clip) { if (clip->clipType() == TEXT) { - QString titlepath = m_activeDocument->projectFolder().path() + "/titles/"; + QString titlepath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; + if (!clip->getProperty("xmltemplate").isEmpty()) { + // template text clip + + // Get the list of existing templates + QStringList filter; + filter << "*.kdenlivetitle"; + QStringList templateFiles = QDir(titlepath).entryList(filter, QDir::Files); + + QDialog *dia = new QDialog(this); + Ui::TemplateClip_UI dia_ui; + dia_ui.setupUi(dia); + int ix = -1; + const QString templatePath = clip->getProperty("xmltemplate"); + for (int i = 0; i < templateFiles.size(); ++i) { + dia_ui.template_list->comboBox()->addItem(templateFiles.at(i), titlepath + templateFiles.at(i)); + if (templatePath == KUrl(titlepath + templateFiles.at(i)).path()) ix = i; + } + if (ix != -1) dia_ui.template_list->comboBox()->setCurrentIndex(ix); + else dia_ui.template_list->comboBox()->insertItem(0, templatePath); + dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle"); + //warning: setting base directory doesn't work?? + KUrl startDir(titlepath); + dia_ui.template_list->fileDialog()->setUrl(startDir); + dia_ui.description->setText(clip->getProperty("description")); + dia_ui.clone_clip->setChecked(true); + if (dia->exec() == QDialog::Accepted) { + QString textTemplate = dia_ui.template_list->comboBox()->itemData(dia_ui.template_list->comboBox()->currentIndex()).toString(); + if (textTemplate.isEmpty()) textTemplate = dia_ui.template_list->comboBox()->currentText(); + + QMap newprops; + + if (KUrl(textTemplate).path() != templatePath) { + // The template was changed + newprops.insert("xmltemplate", textTemplate); + } + + if (dia_ui.description->toPlainText() != clip->getProperty("description")) { + newprops.insert("description", dia_ui.description->toPlainText()); + } + + QString newtemplate = newprops.value("xmltemplate"); + if (newtemplate.isEmpty()) newtemplate = templatePath; + + // template modified we need to update xmldata + QString description = newprops.value("description"); + if (description.isEmpty()) description = clip->getProperty("description"); + newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString()); + if (dia_ui.normal_clip->isChecked()) { + // Switch clip to normal clip + newprops.insert("xmltemplate", QString()); + } + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + m_activeDocument->commandStack()->push(command); + } + return; + } QString path = clip->getProperty("resource"); - TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this); + TitleWidget *dia_ui = new TitleWidget(KUrl(), m_activeDocument->timecode(), titlepath, m_projectMonitor->render, this); QDomDocument doc; doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { - QImage pix = dia_ui->renderedPixmap(); - pix.save(path); - //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); - //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); + QRect rect = dia_ui->renderedRect(); QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); + newprops.insert("out", QString::number(dia_ui->duration())); + newprops.insert("frame_size", QString::number(rect.width()) + 'x' + QString::number(rect.height())); EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); - m_clipMonitor->refreshMonitor(true); m_activeDocument->setModified(true); } delete dia_ui; @@ -2325,8 +2328,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) void MainWindow::customEvent(QEvent* e) { if (e->type() == QEvent::User) { - // The timeline playing position changed... - kDebug() << "RECEIVED JOG EVEMNT!!!"; + m_messageLabel->setMessage(static_cast (e)->message(), MltError); } } void MainWindow::slotActivateEffectStackView() @@ -2506,6 +2508,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) } } + void MainWindow::slotSaveZone(Render *render, QPoint zone) { KDialog *dialog = new KDialog(this); @@ -2562,6 +2565,7 @@ void MainWindow::slotGetNewLumaStuff() } qDeleteAll(entries); initEffects::refreshLumas(); + m_activeTimeline->projectView()->reloadTransitionLumas(); } void MainWindow::slotGetNewRenderStuff() @@ -2705,4 +2709,95 @@ void MainWindow::slotTranscodeClip() slotTranscode(urls); } +void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &name, const QString &file) +{ + if (m_activeDocument == NULL) return; + m_activeDocument->setDocumentProperty("renderdestination", dest); + m_activeDocument->setDocumentProperty("renderprofile", name); + m_activeDocument->setDocumentProperty("renderurl", file); + m_activeDocument->setModified(true); +} + + +void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QString &chapterFile) +{ + if (m_activeDocument == NULL || m_renderWidget == NULL) return; + QString scriptPath; + QString playlistPath; + if (scriptExport) { + bool ok; + QString scriptsFolder = m_activeDocument->projectFolder().path() + "/scripts/"; + QString path = m_renderWidget->getFreeScriptName(); + scriptPath = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok); + if (!ok || scriptPath.isEmpty()) return; + scriptPath.prepend(scriptsFolder); + QFile f(scriptPath); + if (f.exists()) { + if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it?")) != KMessageBox::Yes) + return; + } + playlistPath = scriptPath + ".mlt"; + m_projectMonitor->saveSceneList(playlistPath); + } else { + KTemporaryFile temp; + temp.setAutoRemove(false); + temp.setSuffix(".mlt"); + temp.open(); + playlistPath = temp.fileName(); + m_projectMonitor->saveSceneList(playlistPath); + } + + if (!chapterFile.isEmpty()) { + int in = 0; + int out; + if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps()); + else { + in = m_activeTimeline->inPoint(); + out = m_activeTimeline->outPoint(); + } + QDomDocument doc; + QDomElement chapters = doc.createElement("chapters"); + chapters.setAttribute("fps", m_activeDocument->fps()); + doc.appendChild(chapters); + + QDomElement guidesxml = m_activeDocument->guidesXml(); + QDomNodeList nodes = guidesxml.elementsByTagName("guide"); + for (int i = 0; i < nodes.count(); i++) { + QDomElement e = nodes.item(i).toElement(); + if (!e.isNull()) { + QString comment = e.attribute("comment"); + int time = (int) GenTime(e.attribute("time").toDouble()).frames(m_activeDocument->fps()); + if (time >= in && time < out) { + if (zoneOnly) time = time - in; + QDomElement chapter = doc.createElement("chapter"); + chapters.appendChild(chapter); + chapter.setAttribute("title", comment); + chapter.setAttribute("time", time); + } + } + } + if (chapters.childNodes().count() > 0) { + if (m_activeTimeline->projectView()->hasGuide(out, 0) == -1) { + // Always insert a guide in pos 0 + QDomElement chapter = doc.createElement("chapter"); + chapters.insertBefore(chapter, QDomNode()); + chapter.setAttribute("title", i18n("Start")); + chapter.setAttribute("time", "0"); + } + // save chapters file + QFile file(chapterFile); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + kWarning() << "////// ERROR writing DVD CHAPTER file: " << chapterFile; + } else { + file.write(doc.toString().toUtf8()); + if (file.error() != QFile::NoError) + kWarning() << "////// ERROR writing DVD CHAPTER file: " << chapterFile; + file.close(); + } + } + } + + m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath); +} + #include "mainwindow.moc"