X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=7477b95d611c3bdd828e4a0415a010cdcb2aa025;hb=6d5fb455eb4d6d89c24f5f4e77addcc86b491c4d;hp=88a942233e5284abd6003914ba9128704b56d95e;hpb=c42a026234a44a2d766e57bc64a6ac7bbd094000;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 88a94223..7477b95d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -50,6 +50,7 @@ #include "clipitem.h" #include "interfaces.h" #include "kdenlive-config.h" +#include "cliptranscode.h" #include #include @@ -69,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -88,12 +90,7 @@ static const char version[] = VERSION; -static const int ID_STATUS_MSG = 1; -static const int ID_EDITMODE_MSG = 2; -static const int ID_TIMELINE_MSG = 3; -static const int ID_TIMELINE_BUTTONS = 5; -static const int ID_TIMELINE_POS = 6; -static const int ID_TIMELINE_FORMAT = 7; +static const int ID_TIMELINE_POS = 0; namespace Mlt { @@ -105,13 +102,15 @@ EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; -MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) - : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), +MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) : + KXmlGuiWindow(parent), + m_activeDocument(NULL), + m_activeTimeline(NULL), + m_renderWidget(NULL), #ifndef NO_JOGSHUTTLE m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ - m_findActivated(false), m_initialized(false) + m_findActivated(false) { // Create DBus interface @@ -138,72 +137,75 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout())); m_findTimer.setSingleShot(true); + // FIXME: the next call returns a newly allocated object, which leaks initEffects::parseEffectFiles(); //initEffects::parseCustomEffectsFile(); m_monitorManager = new MonitorManager(); - projectListDock = new QDockWidget(i18n("Project Tree"), this); - projectListDock->setObjectName("project_tree"); + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); + m_projectListDock->setObjectName("project_tree"); m_projectList = new ProjectList(this); - projectListDock->setWidget(m_projectList); - addDockWidget(Qt::TopDockWidgetArea, projectListDock); + m_projectListDock->setWidget(m_projectList); + addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - effectListDock = new QDockWidget(i18n("Effect List"), this); - effectListDock->setObjectName("effect_list"); + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); m_effectList = new EffectsListView(); //m_effectList = new KListWidget(this); - effectListDock->setWidget(m_effectList); - addDockWidget(Qt::TopDockWidgetArea, effectListDock); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - effectStackDock = new QDockWidget(i18n("Effect Stack"), this); - effectStackDock->setObjectName("effect_stack"); - effectStack = new EffectStackView(this); - effectStackDock->setWidget(effectStack); - addDockWidget(Qt::TopDockWidgetArea, effectStackDock); + m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); + m_effectStackDock->setObjectName("effect_stack"); + m_effectStack = new EffectStackView(this); + m_effectStackDock->setWidget(m_effectStack); + addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock); - transitionConfigDock = new QDockWidget(i18n("Transition"), this); - transitionConfigDock->setObjectName("transition"); - transitionConfig = new TransitionSettings(this); - transitionConfigDock->setWidget(transitionConfig); - addDockWidget(Qt::TopDockWidgetArea, transitionConfigDock); + m_transitionConfigDock = new QDockWidget(i18n("Transition"), this); + m_transitionConfigDock->setObjectName("transition"); + m_transitionConfig = new TransitionSettings(this); + m_transitionConfigDock->setWidget(m_transitionConfig); + addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); readOptions(); - clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); - clipMonitorDock->setObjectName("clip_monitor"); + slotDetectAudioDriver(); + + m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); + m_clipMonitorDock->setObjectName("clip_monitor"); m_clipMonitor = new Monitor("clip", m_monitorManager, this); - clipMonitorDock->setWidget(m_clipMonitor); - addDockWidget(Qt::TopDockWidgetArea, clipMonitorDock); + m_clipMonitorDock->setWidget(m_clipMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); //m_clipMonitor->stop(); - projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); - projectMonitorDock->setObjectName("project_monitor"); + m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); + m_projectMonitorDock->setObjectName("project_monitor"); m_projectMonitor = new Monitor("project", m_monitorManager, this); - projectMonitorDock->setWidget(m_projectMonitor); - addDockWidget(Qt::TopDockWidgetArea, projectMonitorDock); + m_projectMonitorDock->setWidget(m_projectMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock); - recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); - recMonitorDock->setObjectName("record_monitor"); + m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); + m_recMonitorDock->setObjectName("record_monitor"); m_recMonitor = new RecMonitor("record", this); - recMonitorDock->setWidget(m_recMonitor); - addDockWidget(Qt::TopDockWidgetArea, recMonitorDock); + m_recMonitorDock->setWidget(m_recMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_recMonitorDock); connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int))); - undoViewDock = new QDockWidget(i18n("Undo History"), this); - undoViewDock->setObjectName("undo_history"); + m_undoViewDock = new QDockWidget(i18n("Undo History"), this); + m_undoViewDock->setObjectName("undo_history"); m_undoView = new QUndoView(this); m_undoView->setCleanIcon(KIcon("edit-clear")); m_undoView->setEmptyLabel(i18n("Clean")); - undoViewDock->setWidget(m_undoView); + m_undoViewDock->setWidget(m_undoView); m_undoView->setGroup(m_commandStack); - addDockWidget(Qt::TopDockWidgetArea, undoViewDock); + addDockWidget(Qt::TopDockWidgetArea, m_undoViewDock); //overviewDock = new QDockWidget(i18n("Project Overview"), this); //overviewDock->setObjectName("project_overview"); @@ -213,13 +215,13 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent setupActions(); //tabifyDockWidget(projectListDock, effectListDock); - tabifyDockWidget(projectListDock, effectStackDock); - tabifyDockWidget(projectListDock, transitionConfigDock); + tabifyDockWidget(m_projectListDock, m_effectStackDock); + tabifyDockWidget(m_projectListDock, m_transitionConfigDock); //tabifyDockWidget(projectListDock, undoViewDock); - tabifyDockWidget(clipMonitorDock, projectMonitorDock); - tabifyDockWidget(clipMonitorDock, recMonitorDock); + tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); + tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); setCentralWidget(m_timelineArea); @@ -228,11 +230,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent guiFactory()->addClient(sp);*/ loadPlugins(); + loadTranscoders(); //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); - m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this))); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), static_cast(factory()->container("transcoders", this))); // build effects menus QAction *action; @@ -287,7 +290,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent newEffect->addMenu(videoEffectsMenu); newEffect->addMenu(audioEffectsMenu); newEffect->addMenu(m_customEffectsMenu); - effectStack->setMenu(newEffect); + m_effectStack->setMenu(newEffect); QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); @@ -344,8 +347,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); - connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); - connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); + connect(m_projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); + connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors())); connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool))); connect(m_effectList, SIGNAL(addEffect(QDomElement)), this, SLOT(slotAddEffect(QDomElement))); @@ -371,13 +374,16 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ - projectListDock->raise(); + m_projectListDock->raise(); } void MainWindow::queryQuit() { kDebug() << "----- SAVING CONFUIG"; - if (queryClose()) kapp->quit(); + if (queryClose()) { + Mlt::Factory::close(); + kapp->quit(); + } } //virtual @@ -386,11 +392,13 @@ bool MainWindow::queryClose() saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); if (m_activeDocument && m_activeDocument->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) { + switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; return saveFile(); case KMessageBox::No : + // User does not want to save the changes, clear recovery files + m_activeDocument->m_autosave->resize(0); return true; default: // cancel return false; @@ -429,7 +437,7 @@ void MainWindow::populateMenus(QObject *plugin) QMenu *addMenu = static_cast(factory()->container("generators", this)); ClipGenerator *iGenerator = qobject_cast(plugin); if (iGenerator) - addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()), + addToMenu(plugin, iGenerator->generators(KdenliveSettings::producerslist()), addMenu, SLOT(generateClip()), NULL); } @@ -503,7 +511,7 @@ void MainWindow::slotReloadEffects() #ifndef NO_JOGSHUTTLE void MainWindow::activateShuttleDevice() { - if (m_jogProcess) delete m_jogProcess; + delete m_jogProcess; m_jogProcess = NULL; if (KdenliveSettings::enableshuttle() == false) return; m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice()); @@ -568,33 +576,32 @@ void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) kDebug() << "--- ERROR, TRYING TO APPEND NULL EFFECT"; return; } - TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget(); - currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track); + m_activeTimeline->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track); } void MainWindow::slotRaiseMonitor(bool clipMonitor) { - if (clipMonitor) clipMonitorDock->raise(); - else projectMonitorDock->raise(); + if (clipMonitor) m_clipMonitorDock->raise(); + else m_projectMonitorDock->raise(); } -void MainWindow::slotSetClipDuration(const QString &id, int duration) +void MainWindow::slotUpdateClip(const QString &id) { if (!m_activeDocument) return; - m_activeDocument->setProducerDuration(id, duration); + m_activeTimeline->projectView()->slotUpdateClip(id); } void MainWindow::slotConnectMonitors() { m_projectList->setRenderer(m_projectMonitor->render); - connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int))); + connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &, bool))); connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &))); connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool))); - connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &))); + connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool))); connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &))); @@ -607,15 +614,15 @@ void MainWindow::slotConnectMonitors() void MainWindow::slotAdjustClipMonitor() { - clipMonitorDock->updateGeometry(); - clipMonitorDock->adjustSize(); + m_clipMonitorDock->updateGeometry(); + m_clipMonitorDock->adjustSize(); m_clipMonitor->resetSize(); } void MainWindow::slotAdjustProjectMonitor() { - projectMonitorDock->updateGeometry(); - projectMonitorDock->adjustSize(); + m_projectMonitorDock->updateGeometry(); + m_projectMonitorDock->adjustSize(); m_projectMonitor->resetSize(); } @@ -627,11 +634,11 @@ void MainWindow::setupActions() m_timecodeFormat->addItem(i18n("hh:mm:ss::ff")); m_timecodeFormat->addItem(i18n("Frames")); - statusProgressBar = new QProgressBar(this); - statusProgressBar->setMinimum(0); - statusProgressBar->setMaximum(100); - statusProgressBar->setMaximumWidth(150); - statusProgressBar->setVisible(false); + m_statusProgressBar = new QProgressBar(this); + m_statusProgressBar->setMinimum(0); + m_statusProgressBar->setMaximum(100); + m_statusProgressBar->setMaximumWidth(150); + m_statusProgressBar->setVisible(false); QWidget *w = new QWidget; @@ -669,15 +676,15 @@ void MainWindow::setupActions() QWidget * actionWidget; actionWidget = toolbar->widgetForAction(m_buttonSelectTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonRazorTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonSpacerTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); toolbar->setStyleSheet(style1); connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); @@ -690,7 +697,7 @@ void MainWindow::setupActions() actionWidget = toolbar->widgetForAction(m_buttonFitZoom); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setMaximum(13); @@ -740,28 +747,28 @@ void MainWindow::setupActions() actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonShowMarkers); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonSnap); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); m_messageLabel = new StatusBarMessageLabel(this); m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); statusBar()->addWidget(m_messageLabel, 10); - statusBar()->addWidget(statusProgressBar, 0); - statusBar()->insertPermanentWidget(ID_TIMELINE_BUTTONS, w); + statusBar()->addWidget(m_statusProgressBar, 0); + statusBar()->addPermanentWidget(w); statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS); - statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat); + statusBar()->addPermanentWidget(m_timecodeFormat); statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4); m_messageLabel->hide(); @@ -800,7 +807,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"); @@ -841,6 +848,10 @@ void MainWindow::setupActions() collection->addAction("dvd_wizard", dvdWizard); connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); + KAction *transcodeClip = new KAction(KIcon("edit-copy"), i18n("Transcode Clip"), this); + collection->addAction("transcode_clip", transcodeClip); + connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip())); + KAction *markIn = collection->addAction("mark_in"); markIn->setText(i18n("Set In Point")); markIn->setShortcut(Qt::Key_I); @@ -964,11 +975,25 @@ void MainWindow::setupActions() KAction* audioOnly = new KAction(KIcon("document-new"), i18n("Audio Only"), this); collection->addAction("clip_audio_only", audioOnly); - connect(audioOnly, SIGNAL(triggered(bool)), this, SLOT(slotAudioOnly())); + audioOnly->setData("clip_audio_only"); + audioOnly->setCheckable(true); KAction* videoOnly = new KAction(KIcon("document-new"), i18n("Video Only"), this); collection->addAction("clip_video_only", videoOnly); - connect(videoOnly, SIGNAL(triggered(bool)), this, SLOT(slotVideoOnly())); + videoOnly->setData("clip_video_only"); + videoOnly->setCheckable(true); + + KAction* audioAndVideo = new KAction(KIcon("document-new"), i18n("Audio and Video"), this); + collection->addAction("clip_audio_and_video", audioAndVideo); + audioAndVideo->setData("clip_audio_and_video"); + audioAndVideo->setCheckable(true); + + m_clipTypeGroup = new QActionGroup(this); + m_clipTypeGroup->addAction(audioOnly); + m_clipTypeGroup->addAction(videoOnly); + m_clipTypeGroup->addAction(audioAndVideo); + connect(m_clipTypeGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotUpdateClipType(QAction *))); + m_clipTypeGroup->setEnabled(false); KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this); collection->addAction("insert_space", insertSpace); @@ -1054,8 +1079,10 @@ void MainWindow::setupActions() KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); + /* + //TODO: Add status tooltip to actions ? connect(collection, SIGNAL(actionHovered(QAction*)), - this, SLOT(slotDisplayActionMessage(QAction*))); + this, SLOT(slotDisplayActionMessage(QAction*)));*/ QAction *addClip = new KAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"), this); @@ -1148,7 +1175,7 @@ void MainWindow::readOptions() //Add new settings from 0.7.1 if (KdenliveSettings::defaultprojectfolder().isEmpty()) { QString path = QDir::homePath() + "/kdenlive"; - if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path; + if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path; KdenliveSettings::setDefaultprojectfolder(path); } } @@ -1174,7 +1201,7 @@ void MainWindow::readOptions() void MainWindow::slotRunWizard() { - Wizard *w = new Wizard(this); + Wizard *w = new Wizard(false, this); if (w->exec() == QDialog::Accepted && w->isOk()) { w->adjustSettings(); } @@ -1189,6 +1216,7 @@ void MainWindow::newFile(bool showProjectSettings) 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; @@ -1233,13 +1261,14 @@ void MainWindow::closeCurrentDocument() TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); if (docToClose && docToClose->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) { + switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; if (saveFile() == false) return; break; case KMessageBox::Cancel : return; + break; default: break; } @@ -1249,13 +1278,16 @@ void MainWindow::closeCurrentDocument() m_timelineArea->setTabBarHidden(true); m_closeAction->setEnabled(false); } - delete docToClose; - delete w; - if (m_timelineArea->count() == 0) { + if (docToClose == m_activeDocument) { + delete m_activeDocument; m_activeDocument = NULL; - effectStack->clear(); - transitionConfig->slotTransitionItemSelected(NULL, false); - } + m_effectStack->clear(); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + } else delete docToClose; + if (w == m_activeTimeline) { + delete m_activeTimeline; + m_activeTimeline = NULL; + } else delete w; } bool MainWindow::saveFileAs(const QString &outputFileName) @@ -1296,7 +1328,7 @@ bool MainWindow::saveFileAs() QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype); if (outputFile.isEmpty()) return false; if (QFile::exists(outputFile)) { - if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return false; + if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false; } return saveFileAs(outputFile); } @@ -1330,7 +1362,7 @@ void MainWindow::openLastFile() { KSharedConfigPtr config = KGlobal::config(); KUrl::List urls = m_fileOpenRecent->urls(); - //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction ? + //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction? if (urls.isEmpty()) newFile(false); else openFile(urls.last()); } @@ -1377,7 +1409,7 @@ 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); + 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; @@ -1412,7 +1444,7 @@ void MainWindow::recoverFiles(QList staleFiles) continue; }*/ kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path(); - // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ? + // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile? if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale); else KIO::NetAccess::del(KUrl(stale->fileName()), this); } @@ -1421,29 +1453,29 @@ void MainWindow::recoverFiles(QList staleFiles) void MainWindow::parseProfiles(const QString &mltPath) { - //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <exec() == QDialog::Rejected) { ::exit(0); } @@ -1478,7 +1510,7 @@ void MainWindow::parseProfiles(const QString &mltPath) KdenliveSettings::setRendererpath(rendererPath.path()); } - kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); + kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); // Parse MLT profiles to build a list of available video formats if (profilesList.isEmpty()) parseProfiles(); @@ -1495,6 +1527,31 @@ void MainWindow::slotEditProfiles() delete w; } +void MainWindow::slotDetectAudioDriver() +{ + //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(); @@ -1506,6 +1563,7 @@ void MainWindow::slotEditProjectSettings() if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path()); if (m_activeDocument->profilePath() != profile) { // Profile was changed + double dar = m_activeDocument->dar(); m_activeDocument->setProfilePath(profile); KdenliveSettings::setCurrent_profile(profile); KdenliveSettings::setProject_fps(m_activeDocument->fps()); @@ -1514,7 +1572,7 @@ void MainWindow::slotEditProjectSettings() 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(); // We need to desactivate & reactivate monitors to get a refresh m_monitorManager->switchMonitors(); } @@ -1527,7 +1585,7 @@ void MainWindow::slotRenderProject() if (!m_renderWidget) { QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); - connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &))); + connect(m_renderWidget, SIGNAL(doRender(const QStringList&, const QStringList&)), this, SLOT(slotDoRender(const QStringList&, const QStringList&))); 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) { @@ -1541,30 +1599,41 @@ void MainWindow::slotRenderProject() m_renderWidget->show(); } -void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile, const QString &scriptExport) +void MainWindow::slotDoRender(const QStringList args, const QStringList overlay_args) { - kDebug() << "// SCRIPT EXPORT: " << scriptExport; + 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; - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab && zoneOnly) { - in = currentTab->inPoint(); - out = currentTab->outPoint(); + + if (m_activeTimeline && zoneOnly) { + in = m_activeTimeline->inPoint(); + out = m_activeTimeline->outPoint(); } + KTemporaryFile temp; temp.setAutoRemove(false); - temp.setSuffix(".westley"); + 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 + ".westley"); + 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 + ".westley"); + if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt"); else m_projectMonitor->saveSceneList(temp.fileName()); } @@ -1582,7 +1651,7 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const 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 inigo program required for rendering (part of Mlt)")); + KMessageBox::sorry(this, i18n("Cannot find the melt program required for rendering (part of Mlt)")); setRenderingProgress(dest, -3); return; } @@ -1619,11 +1688,11 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const return; } - QTextStream out(&file); - out << "#! /bin/sh" << "\n" << "\n"; - out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n"; - out << "TARGET=" << "\"" + dest + "\"" << "\n"; - out << renderer << " " << args.join(" ") << "\n" << "\n"; + 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(); @@ -1632,6 +1701,51 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const 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(); + } + } + } } } @@ -1684,7 +1798,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha { //m_projectMonitor->stop(); m_closeAction->setEnabled(m_timelineArea->count() > 1); - kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; + kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; if (m_activeTimeline) { @@ -1692,6 +1806,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint))); disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int))); disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified())); + disconnect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), m_activeDocument, SLOT(checkProjectClips())); disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); @@ -1701,10 +1816,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &))); - disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + 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*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, 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))); @@ -1713,18 +1828,18 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); - disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); - disconnect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); - disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); - disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); - disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); - disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); - disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); - disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); + disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); + disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); + disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); + disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); + disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); - effectStack->clear(); + m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); @@ -1734,8 +1849,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha KdenliveSettings::setProject_fps(doc->fps()); m_monitorManager->resetProfiles(doc->timecode()); m_projectList->setDocument(doc); - transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); - effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); + 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(projectModified()), doc, SLOT(setModified())); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); @@ -1749,6 +1864,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int))); + connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips())); connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); @@ -1760,10 +1876,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + 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*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); - connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); + 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()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); @@ -1773,20 +1889,20 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); - connect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); - connect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); - connect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); - connect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); - connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); - connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); - connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); - connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); + connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); + connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); + connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); + connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); - trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup); m_activeTimeline = trackView; if (m_renderWidget) { m_renderWidget->setProfile(doc->mltProfile()); @@ -1837,6 +1953,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())); @@ -1864,6 +1981,9 @@ void MainWindow::updateConfiguration() } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + + // Update list of transcoding profiles + loadTranscoders(); #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ @@ -1909,7 +2029,7 @@ void MainWindow::slotSwitchSnap() void MainWindow::slotDeleteTimelineClip() { - if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip(); + if (QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) m_projectList->slotRemoveClip(); else if (m_activeTimeline) { m_activeTimeline->projectView()->deleteSelectedClips(); } @@ -2185,13 +2305,13 @@ void MainWindow::slotFitZoom() void MainWindow::slotGotProgressInfo(const QString &message, int progress) { - statusProgressBar->setValue(progress); + m_statusProgressBar->setValue(progress); if (progress >= 0) { if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); - statusProgressBar->setVisible(true); + m_statusProgressBar->setVisible(true); } else { m_messageLabel->setMessage(QString(), DefaultMessage); - statusProgressBar->setVisible(false); + m_statusProgressBar->setVisible(false); } } @@ -2211,6 +2331,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); + newprops.insert("frame_size", QString::number(pix.width()) + 'x' + QString::number(pix.height())); EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); m_clipMonitor->refreshMonitor(true); @@ -2239,17 +2360,17 @@ void MainWindow::customEvent(QEvent* e) { if (e->type() == QEvent::User) { // The timeline playing position changed... - kDebug() << "RECEIVED JOG EVEMNT!!!"; + kDebug() << "RECEIVED JOG EVEMNT!!!"; } } void MainWindow::slotActivateEffectStackView() { - effectStack->raiseWindow(effectStackDock); + m_effectStack->raiseWindow(m_effectStackDock); } void MainWindow::slotActivateTransitionView(Transition *t) { - if (t) transitionConfig->raiseWindow(transitionConfigDock); + if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock); } void MainWindow::slotSnapRewind() @@ -2332,7 +2453,7 @@ void MainWindow::slotFind() void MainWindow::slotFindNext() { if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { - statusBar()->showMessage(i18n("Found : %1", m_findString)); + statusBar()->showMessage(i18n("Found: %1", m_findString)); } else { statusBar()->showMessage(i18n("Reached end of project")); } @@ -2343,10 +2464,10 @@ void MainWindow::findAhead() { if (m_activeTimeline && m_activeTimeline->projectView()->findString(m_findString)) { m_projectSearchNext->setEnabled(true); - statusBar()->showMessage(i18n("Found : %1", m_findString)); + statusBar()->showMessage(i18n("Found: %1", m_findString)); } else { m_projectSearchNext->setEnabled(false); - statusBar()->showMessage(i18n("Not found : %1", m_findString)); + statusBar()->showMessage(i18n("Not found: %1", m_findString)); } } @@ -2432,7 +2553,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this); QString path = m_activeDocument->projectFolder().path(); path.append("/"); - path.append("untitled.westley"); + path.append("untitled.mlt"); KUrlRequester *url = new KUrlRequester(KUrl(path), this); url->setFilter("video/mlt-playlist"); QLabel *label2 = new QLabel(i18n("Description:"), this); @@ -2475,6 +2596,7 @@ void MainWindow::slotGetNewLumaStuff() } qDeleteAll(entries); initEffects::refreshLumas(); + m_activeTimeline->projectView()->reloadTransitionLumas(); } void MainWindow::slotGetNewRenderStuff() @@ -2534,14 +2656,13 @@ void MainWindow::slotSplitAudio() if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio(); } -void MainWindow::slotAudioOnly() +void MainWindow::slotUpdateClipType(QAction *action) { - if (m_activeTimeline) m_activeTimeline->projectView()->audioOnly(); -} - -void MainWindow::slotVideoOnly() -{ - if (m_activeTimeline) m_activeTimeline->projectView()->videoOnly(); + if (m_activeTimeline) { + if (action->data().toString() == "clip_audio_only") m_activeTimeline->projectView()->setAudioOnly(); + else if (action->data().toString() == "clip_video_only") m_activeTimeline->projectView()->setVideoOnly(); + else m_activeTimeline->projectView()->setAudioAndVideo(); + } } void MainWindow::slotDvdWizard(const QString &url, const QString &profile) @@ -2561,9 +2682,9 @@ void MainWindow::slotShowTimeline(bool show) } } -void MainWindow::slotMaximizeCurrent(bool show) +void MainWindow::slotMaximizeCurrent(bool /*show*/) { - //TODO: is there a way to maximize current widget? + //TODO: is there a way to maximize current widget? //if (show == true) { m_timelineState = saveState(); @@ -2579,4 +2700,44 @@ void MainWindow::slotMaximizeCurrent(bool show) }*/ } +void MainWindow::loadTranscoders() +{ + QMenu *transMenu = static_cast(factory()->container("transcoders", this)); + transMenu->clear(); + + KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc"); + KConfigGroup transConfig(config, "Transcoding"); + // read the entries + QMap< QString, QString > profiles = transConfig.entryMap(); + QMapIterator i(profiles); + while (i.hasNext()) { + i.next(); + QAction *a = transMenu->addAction(i.key()); + a->setData(i.value()); + connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); + } +} + +void MainWindow::slotTranscode(KUrl::List urls) +{ + QString params; + if (urls.isEmpty()) { + urls.append(m_projectList->currentClipUrl()); + QAction *action = qobject_cast(sender()); + params = action->data().toString(); + } + if (urls.isEmpty()) return; + ClipTranscode *d = new ClipTranscode(urls, params); + connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + d->show(); + //QProcess::startDetached("ffmpeg", parameters); +} + +void MainWindow::slotTranscodeClip() +{ + KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///projectfolder")); + if (urls.isEmpty()) return; + slotTranscode(urls); +} + #include "mainwindow.moc"