#include "clipitem.h"
#include "interfaces.h"
#include "kdenlive-config.h"
+#include "cliptranscode.h"
#include <KApplication>
#include <KAction>
#include <kstandarddirs.h>
#include <KUrlRequesterDialog>
#include <KTemporaryFile>
+#include <KProcess>
#include <KActionMenu>
#include <KMenu>
#include <locale.h>
actionCollection());
readOptions();
+ slotDetectAudioDriver();
+
m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
m_clipMonitorDock->setObjectName("clip_monitor");
m_clipMonitor = new Monitor("clip", m_monitorManager, this);
guiFactory()->addClient(sp);*/
loadPlugins();
+ loadTranscoders();
//kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone);
m_clipMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast<QMenu*>(factory()->container("marker_menu", this)));
- m_projectList->setupGeneratorMenu(static_cast<QMenu*>(factory()->container("generators", this)));
+ m_projectList->setupGeneratorMenu(static_cast<QMenu*>(factory()->container("generators", this)), static_cast<QMenu*>(factory()->container("transcoders", this)));
// build effects menus
QAction *action;
void MainWindow::queryQuit()
{
kDebug() << "----- SAVING CONFUIG";
- if (queryClose()) kapp->quit();
+ if (queryClose()) {
+ Mlt::Factory::close();
+ kapp->quit();
+ }
}
//virtual
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");
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);
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()));
addClips->addAction(addColorClip);
addClips->addAction(addSlideClip);
addClips->addAction(addTitleClip);
+ addClips->addAction(addTitleTemplateClip);
addClips->addAction(addFolderButton);
addClips->addAction(reloadClip);
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;
break;
case KMessageBox::Cancel :
return;
+ break;
default:
break;
}
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;
m_effectStack->clear();
- m_transitionConfig->slotTransitionItemSelected(NULL, false);
- }
+ 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)
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;
void MainWindow::parseProfiles(const QString &mltPath)
{
- //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
+ // kDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
//KdenliveSettings::setDefaulttmpfolder();
if (!mltPath.isEmpty()) {
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();
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());
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();
}
QTextStream outStream(&file);
outStream << "#! /bin/sh" << "\n" << "\n";
- outStream << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n";
+ outStream << "SOURCE=" << "\"" + scriptExport + ".mlt\"" << "\n";
outStream << "TARGET=" << "\"" + dest + "\"" << "\n";
outStream << renderer << " " << args.join(" ") << "\n" << "\n";
if (file.error() != QFile::NoError) {
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*, bool)), m_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)));
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)), m_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()));
// 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()));
}
m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+
+ // Update list of transcoding profiles
+ loadTranscoders();
#ifndef NO_JOGSHUTTLE
activateShuttleDevice();
#endif /* NO_JOGSHUTTLE */
{
if (clip->clipType() == TEXT) {
QString titlepath = m_activeDocument->projectFolder().path() + "/titles/";
+ if (!clip->getProperty("xmltemplate").isEmpty()) {
+ // template text clip
+ KUrl path = KUrlRequesterDialog::getUrl(clip->getProperty("xmltemplate"), this, i18n("Change template path"));
+ if (!path.isEmpty() && (path.path() != clip->getProperty("xmltemplate"))) {
+ // Clip template modified, update
+ m_projectList->regenerateTemplate(clip->getId());
+ }
+ return;
+ }
QString path = clip->getProperty("resource");
TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this);
QDomDocument doc;
//m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString());
QMap <QString, QString> 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);
}
qDeleteAll(entries);
initEffects::refreshLumas();
+ m_activeTimeline->projectView()->reloadTransitionLumas();
}
void MainWindow::slotGetNewRenderStuff()
}
}
-void MainWindow::slotMaximizeCurrent(bool show)
+void MainWindow::slotMaximizeCurrent(bool /*show*/)
{
//TODO: is there a way to maximize current widget?
//if (show == true)
}*/
}
+void MainWindow::loadTranscoders()
+{
+ QMenu *transMenu = static_cast<QMenu*>(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<QString, QString> 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<QAction *>(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"
projects / kdenlive / blobdiff